Use production Wallet service URL by default.

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

 // Copyright 2013 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 "components/autofill/content/browser/wallet/wallet_service_url.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/url_util.h"
 #include "url/gurl.h"
 
 namespace autofill {
 namespace {
 
 const char kProdWalletServiceUrl[] = "https://wallet.google.com/";
 
 // TODO(ahutter): Remove this once production is ready.
 const char kSandboxWalletServiceUrl[] =
     "https://payments-form-dogfood.sandbox.google.com/";
 
 // TODO(ahutter): Remove this once production is ready.
 const char kSandboxWalletSecureServiceUrl[] =
     "https://wallet-web.sandbox.google.com/";
 
 bool IsWalletProductionEnabled() {
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  return command_line.HasSwitch(switches::kWalletServiceUseProd) ||
-      base::FieldTrialList::FindFullName("WalletProductionService") == "Yes";
+  const CommandLine* command_line = CommandLine::ForCurrentProcess();
+  std::string sandbox_enabled(
+      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() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   std::string wallet_service_hostname =
       command_line.GetSwitchValueASCII(switches::kWalletServiceUrl);
   if (!wallet_service_hostname.empty())
     return GURL(wallet_service_hostname);
   if (IsWalletProductionEnabled())
     return GURL(kProdWalletServiceUrl);
@@ skipping 97 matching lines @@
          url.host() == final_url.host() &&
          url.path() == final_url.path();
 }
 
 bool IsUsingProd() {
   return GetWalletHostUrl() == GURL(kProdWalletServiceUrl);
 }
 
 }  // namespace wallet
 }  // namespace autofill