Use production Wallet service URL by default.

chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 1752 matching lines @@
                                   required_actions,
                                   form_errors);
 
   EXPECT_EQ(1U, NotificationsOfType(
       DialogNotification::REQUIRED_ACTION).size());
 }
 
 // Test Wallet banners are show in the right situations. These banners promote
 // saving details into Wallet (i.e. "[x] Save details to Wallet").
 TEST_F(AutofillDialogControllerTest, WalletBanners) {
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  command_line->AppendSwitch(switches::kWalletServiceUseProd);
-
   // Simulate non-signed-in case.
   SetUpControllerWithFormData(DefaultFormData());
   GoogleServiceAuthError error(GoogleServiceAuthError::NONE);
   controller()->OnPassiveSigninFailure(error);
   EXPECT_EQ(0U, NotificationsOfType(
       DialogNotification::WALLET_USAGE_CONFIRMATION).size());
 
   // Sign in a user with a completed account.
   SetUpControllerWithFormData(DefaultFormData());
   controller()->OnDidGetWalletItems(CompleteAndValidWalletItems());
@@ skipping 347 matching lines @@
   controller()->ForceFinishSubmit();
   EXPECT_TRUE(form_structure());
 }
 
 TEST_F(AutofillDialogControllerTest, NotProdNotification) {
   // To make IsPayingWithWallet() true.
   controller()->OnDidGetWalletItems(
       wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED));
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
-  ASSERT_FALSE(command_line->HasSwitch(switches::kWalletServiceUseProd));
-  EXPECT_FALSE(
-      NotificationsOfType(DialogNotification::DEVELOPER_WARNING).empty());
+  ASSERT_EQ(
+      "",
+      command_line->GetSwitchValueASCII(switches::kWalletServiceUseSandbox));
 
-  command_line->AppendSwitch(switches::kWalletServiceUseProd);
-  EXPECT_TRUE(
-      NotificationsOfType(DialogNotification::DEVELOPER_WARNING).empty());
+#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).
+  EXPECT_EQ(0U,
+            NotificationsOfType(DialogNotification::DEVELOPER_WARNING).size());
+#endif
+
+  command_line->AppendSwitchASCII(switches::kWalletServiceUseSandbox, "1");
+  EXPECT_EQ(1U,
+            NotificationsOfType(DialogNotification::DEVELOPER_WARNING).size());
 }
 
 // Ensure Wallet instruments marked expired by the server are shown as invalid.
 TEST_F(AutofillDialogControllerTest, WalletExpiredCard) {
   scoped_ptr<wallet::WalletItems> wallet_items =
       wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED);
   wallet_items->AddInstrument(wallet::GetTestMaskedInstrumentExpired());
   controller()->OnDidGetWalletItems(wallet_items.Pass());
 
   EXPECT_TRUE(controller()->IsEditingExistingData(SECTION_CC_BILLING));
@@ skipping 386 matching lines @@
   controller()->OnAccept();
 
   const CreditCard& imported_card = test_pdm->imported_credit_card();
   EXPECT_EQ(test_profile.GetRawInfo(NAME_FULL),
             imported_card.GetRawInfo(CREDIT_CARD_NAME));
 
   controller()->ViewClosed();
 }
 
 }  // namespace autofill