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

chrome/browser/autofill/wallet/wallet_service_url.cc

 // Copyright (c) 2012 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 "chrome/browser/autofill/wallet/wallet_service_url.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
 #include "googleurl/src/gurl.h"
 
 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";
 
 GURL GetBaseWalletUrl() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   std::string base_wallet_service_url =
       command_line.GetSwitchValueASCII(switches::kWalletServiceUrl);
   return !base_wallet_service_url.empty() ? GURL(base_wallet_service_url) :
                                             GURL(kDefaultWalletServiceUrl);
 }
 
 }  // 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 wallet::GetGetFullWalletUrl() {
-  return GetBaseWalletUrl().Resolve("getFullWalletJwtless");
+GURL GetGetFullWalletUrl() {
+  return GetBaseWalletUrl().Resolve("wallet/autocheckout/getFullWalletJwtless");
 }
 
-GURL wallet::GetAcceptLegalDocumentsUrl() {
-  return GetBaseWalletUrl().Resolve("acceptLegalDocuments");
+GURL GetAcceptLegalDocumentsUrl() {
+  return GetBaseWalletUrl().Resolve("wallet/autocheckout/acceptLegalDocuments");
 }
 
-GURL wallet::GetSendStatusUrl() {
-  return GetBaseWalletUrl().Resolve("reportStatus");
+GURL GetSendStatusUrl() {
+  return GetBaseWalletUrl().Resolve("wallet/autocheckout/reportStatus");
 }
 
-GURL wallet::GetSaveToWalletUrl() {
-  return GetBaseWalletUrl().Resolve("saveToWallet");
+GURL GetSaveToWalletUrl() {
+  return GetBaseWalletUrl().Resolve("wallet/autocheckout/saveToWallet");
 }
 
-GURL wallet::GetSecureUrl() {
+GURL GetPassiveAuthUrl() {
+  return GetBaseWalletUrl().Resolve("passiveauth");
+}
+
+GURL GetSecureUrl() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   std::string wallet_secure_url =
       command_line.GetSwitchValueASCII(switches::kWalletSecureServiceUrl);
   return !wallet_secure_url.empty() ? GURL(wallet_secure_url) :
                                       GURL(kDefaultWalletSecureServiceUrl);
 }
 
+}  // namespace wallet