Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / components / autofill / content / browser / wallet / wallet_service_url.cc

diff --git a/src/components/autofill/content/browser/wallet/wallet_service_url.cc b/src/components/autofill/content/browser/wallet/wallet_service_url.cc
index 838dccf..310b927 100644 (file)
--- a/src/components/autofill/content/browser/wallet/wallet_service_url.cc
+++ b/src/components/autofill/content/browser/wallet/wallet_service_url.cc
@@ -25,11 +25,9 @@ namespace {
 
 const char kProdWalletServiceUrl[] = "https://wallet.google.com/";
 
-// TODO(ahutter): Remove this once production is ready.
 const char kSandboxWalletServiceUrl[] =
     "https://wallet-web.sandbox.google.com/";
 
-// TODO(ahutter): Remove this once production is ready.
 const char kSandboxWalletSecureServiceUrl[] =
     "https://wallet-web.sandbox.google.com/";
 
@@ -91,7 +89,6 @@ GURL GetBaseSecureUrl() {
 
 GURL GetBaseEncryptedFrontendUrl(size_t user_index) {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  // TODO(ahutter): Stop checking these switches once we switch over to prod.
   GURL base_url = IsWalletProductionEnabled() ||
       command_line.HasSwitch(switches::kWalletServiceUrl) ?
           GetWalletHostUrl() : GetBaseSecureUrl();
@@ -183,11 +180,10 @@ bool IsSignInContinueUrl(const GURL& url, size_t* user_index) {
 
   *user_index = 0;
   std::string query_str = url.query();
-  url_parse::Component query(0, query_str.length());
-  url_parse::Component key, value;
+  url::Component query(0, query_str.length());
+  url::Component key, value;
   const char kUserIndexKey[] = "authuser";
-  while (url_parse::ExtractQueryKeyValue(query_str.c_str(), &query, &key,
-                                         &value)) {
+  while (url::ExtractQueryKeyValue(query_str.c_str(), &query, &key, &value)) {
     if (key.is_nonempty() &&
         query_str.substr(key.begin, key.len) == kUserIndexKey) {
       base::StringToSizeT(query_str.substr(value.begin, value.len), user_index);