Move the Google Payments URL functions out of content.

components/autofill/core/browser/payments/payments_client.cc

 // Copyright 2015 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/core/browser/payments/payments_client.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "components/autofill/core/browser/autofill_data_model.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/payments/payments_request.h"
-#include "components/autofill/core/common/autofill_switches.h"
+#include "components/autofill/core/browser/payments/payments_service_url.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "google_apis/gaia/identity_provider.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace autofill {
 namespace payments {
 
 namespace {
 
-const char kPaymentsRequestHost[] = "https://wallet.google.com";
-const char kPaymentsRequestHostSandbox[] = "https://sandbox.google.com";
-
 const char kUnmaskCardRequestPath[] =
     "payments/apis-secure/creditcardservice/getrealpan?s7e_suffix=chromewallet";
 const char kUnmaskCardRequestFormat[] =
     "requestContentType=application/json; charset=utf-8&request=%s"
     "&s7e_13_cvc=%s";
 
 const char kGetUploadDetailsRequestPath[] =
     "payments/apis/chromepaymentsservice/getdetailsforsavecard";
 
 const char kUploadCardRequestPath[] =
     "payments/apis-secure/chromepaymentsservice/savecard"
     "?s7e_suffix=chromewallet";
 const char kUploadCardRequestFormat[] =
     "requestContentType=application/json; charset=utf-8&request=%s"
     "&s7e_1_pan=%s&s7e_13_cvc=%s";
 
 const char kTokenServiceConsumerId[] = "wallet_client";
 const char kPaymentsOAuth2Scope[] =
     "https://www.googleapis.com/auth/wallet.chrome";
 
-// This is mostly copied from wallet_service_url.cc, which is currently in
-// content/, hence inaccessible from here.
-bool IsPaymentsProductionEnabled() {
-  // If the command line flag exists, it takes precedence.
-  const base::CommandLine* command_line =
-      base::CommandLine::ForCurrentProcess();
-  std::string sandbox_enabled(
-      command_line->GetSwitchValueASCII(switches::kWalletServiceUseSandbox));
-  if (!sandbox_enabled.empty())
-    return sandbox_enabled != "1";
-
-#if defined(ENABLE_PROD_WALLET_SERVICE)
-  return true;
-#else
-  return false;
-#endif
-}
-
 GURL GetRequestUrl(const std::string& path) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch("sync-url")) {
     if (IsPaymentsProductionEnabled()) {
       LOG(ERROR) << "You are using production Payments but you specified a "
                     "--sync-url. You likely want to disable the sync sandbox "
                     "or switch to sandbox Payments. Both are controlled in "
                     "about:flags.";
     }
   } else if (!IsPaymentsProductionEnabled()) {
     LOG(ERROR) << "You are using sandbox Payments but you didn't specify a "
                   "--sync-url. You likely want to enable the sync sandbox "
                   "or switch to production Payments. Both are controlled in "
                   "about:flags.";
   }
 
-  GURL base(IsPaymentsProductionEnabled() ? kPaymentsRequestHost
-                                          : kPaymentsRequestHostSandbox);
-  return base.Resolve(path);
+  return GetBaseSecureUrl().Resolve(path);
 }
 
 std::unique_ptr<base::DictionaryValue> BuildRiskDictionary(
     const std::string& encoded_risk_data) {
   std::unique_ptr<base::DictionaryValue> risk_data(new base::DictionaryValue());
 #if defined(OS_IOS)
   // Browser fingerprinting is not available on iOS. Instead, we generate
   // RiskAdvisoryData.
   risk_data->SetString("message_type", "RISK_ADVISORY_DATA");
   risk_data->SetString("encoding_type", "BASE_64_URL");
@@ skipping 441 matching lines @@
 
 void PaymentsClient::SetOAuth2TokenAndStartRequest() {
   url_fetcher_->AddExtraRequestHeader(net::HttpRequestHeaders::kAuthorization +
                                       std::string(": Bearer ") + access_token_);
 
   url_fetcher_->Start();
 }
 
 }  // namespace payments
 }  // namespace autofill