[rAC, OSX] Default to prod wallet.

R=estade@chromium.org
BUG=none

Review URL: https://codereview.chromium.org/100103002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238437 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

@@ -2173,15 +2173,9 @@ TEST_F(AutofillDialogControllerTest, NotProdNotification) {
       "",
       command_line->GetSwitchValueASCII(switches::kWalletServiceUseSandbox));
 
-#if defined(OS_MACOSX)
-  // Default on Mac is to use sandbox (which shows a warning).
-  EXPECT_EQ(1U,
-            NotificationsOfType(DialogNotification::DEVELOPER_WARNING).size());
-#else
-  // Default everywhere else is to use prod (no warning).
+  // Default everywhere is to use prod (no warning).
   EXPECT_EQ(0U,
             NotificationsOfType(DialogNotification::DEVELOPER_WARNING).size());
-#endif
 
   command_line->AppendSwitchASCII(switches::kWalletServiceUseSandbox, "1");
   EXPECT_EQ(1U,

components/autofill/content/browser/wallet/wallet_service_url.cc

@@ -35,11 +35,7 @@ bool IsWalletProductionEnabled() {
       command_line->GetSwitchValueASCII(switches::kWalletServiceUseSandbox));
   if (!sandbox_enabled.empty())
     return sandbox_enabled != "1";
-#if defined(OS_MACOSX)
-  return false;
-#else
   return true;
-#endif
 }
 
 GURL GetWalletHostUrl() {

components/autofill/content/browser/wallet/wallet_service_url_unittest.cc

@@ -81,11 +81,7 @@ TEST(WalletServiceSandboxUrl, CheckProdUrls) {
 }
 
 TEST(WalletServiceUrl, IsUsingProd) {
-#if defined(OS_MACOSX)
-  EXPECT_FALSE(IsUsingProd());
-#else
   EXPECT_TRUE(IsUsingProd());
-#endif
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   command_line->AppendSwitchASCII(switches::kWalletServiceUseSandbox, "1");