google_apis: Move AppendQueryParameter() etc. from common/net/url_util.h to net/base/url_util.h

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 "chrome/common/net/url_util.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "googleurl/src/gurl.h"
+#include "net/base/url_util.h"
 
 namespace {
 
 const char kDefaultWalletServiceUrl[] = "https://wallet.google.com/";
 
 GURL GetWalletHostUrl() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   std::string wallet_service_hostname =
       command_line.GetSwitchValueASCII(switches::kWalletServiceUrl);
   return !wallet_service_hostname.empty() ? GURL(wallet_service_hostname) :
@@ skipping 51 matching lines @@
 GURL GetEncryptionUrl() {
   return GetWalletHostUrl().Resolve("online-secure/temporarydata/cvv?s7e=cvv");
 }
 
 GURL GetEscrowUrl() {
   return GetBaseSecureUrl().Resolve("dehEfe?s7e=cardNumber%3Bcvv");
 }
 
 GURL GetSignInUrl() {
   GURL url(GaiaUrls::GetInstance()->service_login_url());
-  url = chrome_common_net::AppendQueryParameter(url, "service", "sierra");
-  url = chrome_common_net::AppendQueryParameter(url, "btmpl", "popup");
-  url = chrome_common_net::AppendQueryParameter(
-      url,
-      "continue",
-      GetSignInContinueUrl().spec());
+  url = net::AppendQueryParameter(url, "service", "sierra");
+  url = net::AppendQueryParameter(url, "btmpl", "popup");
+  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();
 }
 
 }  // namespace wallet