summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordspell <dspell@amazon.com>2015-06-12 11:50:28 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-12 18:52:06 +0000
commitb44dc56df914c55b55613edd9f3b1ecd2dfe290d (patch)
treeeece8dcec238a049bd68a72b52a36843271460af
parent0a5eb156a7adf7a114d218390c1a250e73b3a3d1 (diff)
downloadchromium_src-b44dc56df914c55b55613edd9f3b1ecd2dfe290d.zip
chromium_src-b44dc56df914c55b55613edd9f3b1ecd2dfe290d.tar.gz
chromium_src-b44dc56df914c55b55613edd9f3b1ecd2dfe290d.tar.bz2
Fix WalletServiceURL.DefaultsToProd test on official unbranded builds
The WalletServiceURL.DefaultsToProd test and the WalletServiceURL code rely on different compile time flags, leading to a failure in the test when official build is set, but not branding. This commit adjusts the test to use the same flag as the code when determining if the production or non-production URL should be used. BUG=497884 Test=WalletServiceUrl and RealPanWalletClientTest component unittests on Android and Linux with official and branded set, with just official set, and with neither set Review URL: https://codereview.chromium.org/1165223002 Cr-Commit-Position: refs/heads/master@{#334210}
-rw-r--r--components/autofill/content/browser/wallet/wallet_service_url_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/autofill/content/browser/wallet/wallet_service_url_unittest.cc b/components/autofill/content/browser/wallet/wallet_service_url_unittest.cc
index 9bab781..ddee363 100644
--- a/components/autofill/content/browser/wallet/wallet_service_url_unittest.cc
+++ b/components/autofill/content/browser/wallet/wallet_service_url_unittest.cc
@@ -85,7 +85,7 @@ TEST(WalletServiceSandboxUrl, CheckProdUrls) {
}
TEST(WalletServiceUrl, DefaultsToProd) {
-#if defined(GOOGLE_CHROME_BUILD)
+#if defined(ENABLE_PROD_WALLET_SERVICE)
EXPECT_TRUE(IsUsingProd());
#else
EXPECT_FALSE(IsUsingProd());