New encryption/escrow endpoints for Wallet

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"
@@ skipping 45 matching lines @@
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   std::string wallet_secure_url =
       command_line.GetSwitchValueASCII(switches::kWalletSecureServiceUrl);
   if (!wallet_secure_url.empty())
     return GURL(wallet_secure_url);
   if (IsWalletProductionEnabled())
     return GURL(kProdWalletServiceUrl);
   return GURL(kSandboxWalletSecureServiceUrl);
 }
 
+GURL GetBaseEncryptedFrontendUrl() {
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  // TODO(ahutter): Stop checking these switches once we switch over to prod.
+  if (IsWalletProductionEnabled() ||
+      command_line.HasSwitch(switches::kWalletServiceUrl)) {
+    return GetWalletHostUrl().Resolve("online-secure/v2/autocheckout/v1/");
+  } else {
+    return GetBaseSecureUrl().Resolve("online-secure/v2/autocheckout/v1/");
+  }

[Dan Beam, 2013/07/02 01:25:52]

nit:

  GURL base_url = IsWalletProductionEnabled() ||
      command_line.HasSwitch(switches::kWalletServiceUrl) ?
          GetWalletHostUrl() : GetBaseSecureUrl();
  return base_url.Resolve("online-secure/v2/autocheckout/v1/");

[ahutter, 2013/07/02 15:44:23]

Done.

+}
+
 }  // namespace
 
 namespace wallet {
 
 GURL GetGetWalletItemsUrl() {
   return GetBaseAutocheckoutUrl().Resolve("getWalletItemsJwtless");
 }
 
 GURL GetGetFullWalletUrl() {
-  return GetBaseAutocheckoutUrl().Resolve("getFullWalletJwtless");
+  return GetBaseEncryptedFrontendUrl().Resolve("getFullWalletJwtless?s7e=otp");
 }
 
 GURL GetManageInstrumentsUrl() {
   return GetBaseSecureUrl().Resolve("manage/w/0/#paymentMethods:");
 }
 
 GURL GetManageAddressesUrl() {
   return GetBaseSecureUrl().Resolve("manage/w/0/#settings:addresses");
 }
 
 GURL GetAcceptLegalDocumentsUrl() {
   return GetBaseAutocheckoutUrl().Resolve("acceptLegalDocument");
 }
 
 GURL GetAuthenticateInstrumentUrl() {
-  return GetBaseAutocheckoutUrl().Resolve("authenticateInstrument");
+  return GetBaseEncryptedFrontendUrl()
+      .Resolve("authenticateInstrument?s7e=cvn");
 }
 
 GURL GetSendStatusUrl() {
   return GetBaseAutocheckoutUrl().Resolve("reportStatus");
 }
 
 GURL GetSaveToWalletUrl() {
-  return GetBaseAutocheckoutUrl().Resolve("saveToWallet");
+  return GetBaseEncryptedFrontendUrl()
+      .Resolve("saveToWallet?s7e=card_number%3Bcvn");
 }
 
 GURL GetPassiveAuthUrl() {
   return GetBaseWalletUrl().Resolve("passiveauth?isChromePayments=true");
 }
 
-GURL GetEncryptionUrl() {
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  // TODO(ahutter): Stop checking these switches once we switch over to prod.
-  if (IsWalletProductionEnabled() ||
-      command_line.HasSwitch(switches::kWalletServiceUrl)) {
-    return GetWalletHostUrl().Resolve(
-        "online-secure/temporarydata/cvv?s7e=cvv");
-  } else {
-    return GetBaseSecureUrl().Resolve(
-        "online-secure/temporarydata/cvv?s7e=cvv");
-  }
-}
-
-GURL GetEscrowUrl() {
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  // TODO(ahutter): Stop checking these switches once we switch over to prod.
-  if (IsWalletProductionEnabled() ||
-      command_line.HasSwitch(switches::kWalletServiceUrl)) {
-    return GetBaseSecureUrl().Resolve("dehEfe?s7e=cardNumber%3Bcvv");
-  } else {
-    return GetBaseSecureUrl().Resolve("checkout/dehEfe?s7e=cardNumber%3Bcvv");
-  }
-}
-
 GURL GetSignInUrl() {
   GURL url(GaiaUrls::GetInstance()->service_login_url());
   url = net::AppendQueryParameter(url, "service", "toolbar");
   url = net::AppendQueryParameter(url, "nui", "1");
   url = net::AppendQueryParameter(url,
                                   "continue",
                                   GetSignInContinueUrl().spec());
   return url;
 }
 
 // The continue url portion of the sign-in URL.
 GURL GetSignInContinueUrl() {
   return GetPassiveAuthUrl();
 }
 
 bool IsSignInContinueUrl(const GURL& url) {
   GURL final_url = wallet::GetSignInContinueUrl();
   return url.SchemeIsSecure() &&
          url.host() == final_url.host() &&
          url.path() == final_url.path();
 }
 
 bool IsUsingProd() {
   return GetWalletHostUrl() == GURL(kProdWalletServiceUrl);
 }
 
 }  // namespace wallet
 }  // namespace autofill