chrome/browser/payments: Use BUILDFLAG for OS checking
Use BUILDFLAG(IS_XXX) instead of defined(OS_XXX).
Generated by `os_buildflag_migration.py` (https://crrev.com/c/3311983).
[email protected]
Bug: 1234043
Test: No functionality change
Change-Id: Ie53fd1d3a867557986f3be5f2c23781dccc6a895
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3392807
Commit-Queue: Xiaohan Wang <[email protected]>
Reviewed-by: Nico Weber <[email protected]>
Commit-Queue: Nico Weber <[email protected]>
Cr-Commit-Position: refs/heads/main@{#959749}
diff --git a/chrome/browser/payments/abort_payment_handler_browsertest.cc b/chrome/browser/payments/abort_payment_handler_browsertest.cc
index a6c8104..a602293 100644
--- a/chrome/browser/payments/abort_payment_handler_browsertest.cc
+++ b/chrome/browser/payments/abort_payment_handler_browsertest.cc
@@ -16,7 +16,7 @@
class AbortPaymentHandlerTest : public PaymentRequestPlatformBrowserTestBase {};
// TODO(crbug.com/1129578): fix flakiness and reenable
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
#define MAYBE_CanAbortInvokedInstalledPaymentHandler \
DISABLED_CanAbortInvokedInstalledPaymentHandler
#else
diff --git a/chrome/browser/payments/expandable_payment_handler_browsertest.cc b/chrome/browser/payments/expandable_payment_handler_browsertest.cc
index a7f817d..a473055 100644
--- a/chrome/browser/payments/expandable_payment_handler_browsertest.cc
+++ b/chrome/browser/payments/expandable_payment_handler_browsertest.cc
@@ -7,7 +7,7 @@
#include "content/public/test/browser_test.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
#define DISABLE_ON_ANDROID(test_name) DISABLED_##test_name
#else
#define DISABLE_ON_ANDROID(test_name) test_name
diff --git a/chrome/browser/payments/payment_handler_exploit_browsertest.cc b/chrome/browser/payments/payment_handler_exploit_browsertest.cc
index 993e2cd..ded593e0 100644
--- a/chrome/browser/payments/payment_handler_exploit_browsertest.cc
+++ b/chrome/browser/payments/payment_handler_exploit_browsertest.cc
@@ -12,7 +12,7 @@
#include "url/gurl.h"
#include "url/origin.h"
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
#include "components/payments/content/android/payment_feature_list.h"
#endif
@@ -86,11 +86,11 @@
// Android browsertests are not able to open a Chrome Custom Tab for the payment
// handler window due to an ActivityNotFoundException: "No Activity found to
// handle Intent." https://crbug.com/998737
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
#define MAYBE_SmokeTest DISABLED_SmokeTest
#else
#define MAYBE_SmokeTest SmokeTest
-#endif // defined(OS_ANDROID)
+#endif // BUILDFLAG(IS_ANDROID)
IN_PROC_BROWSER_TEST_F(PaymentHandlerExploitTest, MAYBE_SmokeTest) {
SmokeTest();
}
diff --git a/chrome/browser/payments/payment_handler_permission_context_unittest.cc b/chrome/browser/payments/payment_handler_permission_context_unittest.cc
index a8725fb..a159c99 100644
--- a/chrome/browser/payments/payment_handler_permission_context_unittest.cc
+++ b/chrome/browser/payments/payment_handler_permission_context_unittest.cc
@@ -20,7 +20,7 @@
#include "content/public/test/web_contents_tester.h"
#include "testing/gtest/include/gtest/gtest.h"
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
#include "components/infobars/content/content_infobar_manager.h"
#else
#include "components/permissions/permission_request_manager.h"
@@ -68,7 +68,7 @@
// ChromeRenderViewHostTestHarness:
void SetUp() override {
ChromeRenderViewHostTestHarness::SetUp();
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
infobars::ContentInfoBarManager::CreateForWebContents(web_contents());
#else
permissions::PermissionRequestManager::CreateForWebContents(web_contents());
diff --git a/chrome/browser/payments/payment_handler_ui_browsertest.cc b/chrome/browser/payments/payment_handler_ui_browsertest.cc
index 37e43ed..ac90005 100644
--- a/chrome/browser/payments/payment_handler_ui_browsertest.cc
+++ b/chrome/browser/payments/payment_handler_ui_browsertest.cc
@@ -13,7 +13,7 @@
class PaymentHandlerUiBrowserTest
: public PaymentRequestPlatformBrowserTestBase {};
-#if defined(OS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
#define MAYBE_OpenPaymentTwiceShouldBeSuccessful \
DISABLED_OpenPaymentTwiceShouldBeSuccessful
#else
diff --git a/chrome/browser/payments/secure_payment_confirmation_browsertest.cc b/chrome/browser/payments/secure_payment_confirmation_browsertest.cc
index 9b1ce08..6ec5cae 100644
--- a/chrome/browser/payments/secure_payment_confirmation_browsertest.cc
+++ b/chrome/browser/payments/secure_payment_confirmation_browsertest.cc
@@ -350,7 +350,7 @@
// Creation tests do not work on Android because there is not a way to
// override authenticator creation.
-#if !defined(OS_ANDROID)
+#if !BUILDFLAG(IS_ANDROID)
class SecurePaymentConfirmationCreationTest
: public SecurePaymentConfirmationTest,
public content::WebContentsObserver {
@@ -965,7 +965,7 @@
ExpectJourneyLoggerEvent(/*spc_confirm_logged=*/true);
}
-#endif // !defined(OS_ANDROID)
+#endif // !BUILDFLAG(IS_ANDROID)
} // namespace
} // namespace payments
