Change the behavior of --wallet-service-url.

chrome/browser/autofill/wallet/wallet_service_url.cc

Index: chrome/browser/autofill/wallet/wallet_service_url.cc
diff --git a/chrome/browser/autofill/wallet/wallet_service_url.cc b/chrome/browser/autofill/wallet/wallet_service_url.cc
index f94d90d266e81a419b6c4accf734373a9ef06f14..f3d407598443ef777f24a5aa5ac2023fa2717693 100644
--- a/chrome/browser/autofill/wallet/wallet_service_url.cc
+++ b/chrome/browser/autofill/wallet/wallet_service_url.cc
@@ -13,7 +13,7 @@
 namespace {
 
 const char kDefaultWalletServiceUrl[] =
-    "https://wallet.google.com/online/v2/wallet/autocheckout/";
+    "https://wallet.google.com/online/v2/";

[Ilya Sherman, 2013/01/04 22:11:46]

nit: Looks like this will now (juuust barely) fit on the previous line.

[Albert Bodenhamer, 2013/01/04 22:54:38]

Done.

 
 const char kDefaultWalletSecureServiceUrl[] =
     "https://wallet.google.com/online-secure/temporarydata/cvv?s7e=cvv";
@@ -28,31 +28,38 @@ GURL GetBaseWalletUrl() {
 
 }  // anonymous namespace
 
+namespace wallet {
+
 // TODO(ahutter): This shouldn't live in this class. See
 // http://crbug.com/164281.
 const char wallet::kApiKey[] = "abcdefg";

[Ilya Sherman, 2013/01/04 22:11:46]

nit: Remove the "wallet::" prefix?

[Albert Bodenhamer, 2013/01/04 22:54:38]

Done.

 
-GURL wallet::GetGetWalletItemsUrl() {
-  return GetBaseWalletUrl().Resolve("getWalletItemsJwtless");
+GURL GetGetWalletItemsUrl() {
+  return GetBaseWalletUrl().Resolve(
+      "wallet/autocheckout/getWalletItemsJwtless");

[Ilya Sherman, 2013/01/04 22:11:46]

Optional nit: It seems a little repetitive to need to specify
wallet/autocheckout/ in so many places.  Maybe add a GetBaseAutocheckoutUrl()
function so that this is harder to accidentally typo or forget to update?

[Albert Bodenhamer, 2013/01/04 22:54:38]

Done.

+}
+
+GURL GetGetFullWalletUrl() {
+  return GetBaseWalletUrl().Resolve("wallet/autocheckout/getFullWalletJwtless");
 }
 
-GURL wallet::GetGetFullWalletUrl() {
-  return GetBaseWalletUrl().Resolve("getFullWalletJwtless");
+GURL GetAcceptLegalDocumentsUrl() {
+  return GetBaseWalletUrl().Resolve("wallet/autocheckout/acceptLegalDocuments");
 }
 
-GURL wallet::GetAcceptLegalDocumentsUrl() {
-  return GetBaseWalletUrl().Resolve("acceptLegalDocuments");
+GURL GetSendStatusUrl() {
+  return GetBaseWalletUrl().Resolve("wallet/autocheckout/reportStatus");
 }
 
-GURL wallet::GetSendStatusUrl() {
-  return GetBaseWalletUrl().Resolve("reportStatus");
+GURL GetSaveToWalletUrl() {
+  return GetBaseWalletUrl().Resolve("wallet/autocheckout/saveToWallet");
 }
 
-GURL wallet::GetSaveToWalletUrl() {
-  return GetBaseWalletUrl().Resolve("saveToWallet");
+GURL GetPassiveAuthUrl() {
+  return GetBaseWalletUrl().Resolve("passiveauth");
 }
 
-GURL wallet::GetSecureUrl() {
+GURL GetSecureUrl() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   std::string wallet_secure_url =
       command_line.GetSwitchValueASCII(switches::kWalletSecureServiceUrl);
@@ -60,3 +67,4 @@ GURL wallet::GetSecureUrl() {
                                       GURL(kDefaultWalletSecureServiceUrl);
 }
 
+}  // namespace wallet