New encryption/escrow endpoints for Wallet

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

Index: components/autofill/content/browser/wallet/wallet_service_url.cc
diff --git a/components/autofill/content/browser/wallet/wallet_service_url.cc b/components/autofill/content/browser/wallet/wallet_service_url.cc
index 7bad0197a00c4a2c0480462a6681dd37b0713ca9..5ca4fda08949954e1d9e69c3fdc397f46d5bef43 100644
--- a/components/autofill/content/browser/wallet/wallet_service_url.cc
+++ b/components/autofill/content/browser/wallet/wallet_service_url.cc
@@ -63,6 +63,17 @@ GURL GetBaseSecureUrl() {
   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 {
@@ -72,7 +83,7 @@ GURL GetGetWalletItemsUrl() {
 }
 
 GURL GetGetFullWalletUrl() {
-  return GetBaseAutocheckoutUrl().Resolve("getFullWalletJwtless");
+  return GetBaseEncryptedFrontendUrl().Resolve("getFullWalletJwtless?s7e=otp");
 }
 
 GURL GetManageInstrumentsUrl() {
@@ -88,7 +99,8 @@ GURL GetAcceptLegalDocumentsUrl() {
 }
 
 GURL GetAuthenticateInstrumentUrl() {
-  return GetBaseAutocheckoutUrl().Resolve("authenticateInstrument");
+  return GetBaseEncryptedFrontendUrl()
+      .Resolve("authenticateInstrument?s7e=cvn");
 }
 
 GURL GetSendStatusUrl() {
@@ -96,37 +108,14 @@ GURL GetSendStatusUrl() {
 }
 
 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");