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

chrome/browser/google_apis/gdata_wapi_url_generator.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/google_apis/gdata_wapi_url_generator.h"
 
 #include "base/logging.h"
 #include "base/stringprintf.h"
-#include "chrome/common/net/url_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
+#include "net/base/url_util.h"
 
 namespace google_apis {
 namespace {
 
 // URL requesting resource list that belong to the authenticated user only
 // (handled with '/-/mine' part).
 const char kGetResourceListURLForAllDocuments[] =
     "/feeds/default/private/full/-/mine";
 
 // URL requesting resource list in a particular directory specified by "%s"
@@ skipping 37 matching lines @@
 // URL requesting documents list of changes to documents collections.
 const char kGetChangesListURL[] = "/feeds/default/private/changes";
 
 }  // namespace
 
 const char GDataWapiUrlGenerator::kBaseUrlForProduction[] =
     "https://docs.google.com/";
 
 // static
 GURL GDataWapiUrlGenerator::AddStandardUrlParams(const GURL& url) {
-  GURL result =
-      chrome_common_net::AppendOrReplaceQueryParameter(url, "v", "3");
-  result =
-      chrome_common_net::AppendOrReplaceQueryParameter(result, "alt", "json");
+  GURL result = net::AppendOrReplaceQueryParameter(url, "v", "3");
+  result = net::AppendOrReplaceQueryParameter(result, "alt", "json");
   return result;
 }
 
 // static
 GURL GDataWapiUrlGenerator::AddMetadataUrlParams(const GURL& url) {
   GURL result = AddStandardUrlParams(url);
-  result = chrome_common_net::AppendOrReplaceQueryParameter(
+  result = net::AppendOrReplaceQueryParameter(
       result, "include-installed-apps", "true");
   return result;
 }
 
 // static
 GURL GDataWapiUrlGenerator::AddFeedUrlParams(
     const GURL& url,
     int num_items_to_fetch,
     int changestamp,
     const std::string& search_string) {
   GURL result = AddStandardUrlParams(url);
-  result = chrome_common_net::AppendOrReplaceQueryParameter(
-      result,
-      "showfolders",
-      "true");
-  result = chrome_common_net::AppendOrReplaceQueryParameter(
+  result = net::AppendOrReplaceQueryParameter(result, "showfolders", "true");
+  result = net::AppendOrReplaceQueryParameter(
       result,
       "max-results",
       base::StringPrintf("%d", num_items_to_fetch));
-  result = chrome_common_net::AppendOrReplaceQueryParameter(
+  result = net::AppendOrReplaceQueryParameter(
       result, "include-installed-apps", "true");
 
   if (changestamp) {
-    result = chrome_common_net::AppendQueryParameter(
-        result,
-        "start-index",
-        base::StringPrintf("%d", changestamp));
+    result = net::AppendQueryParameter(result,
+                                       "start-index",
+                                       base::StringPrintf("%d", changestamp));
   }
 
   if (!search_string.empty()) {
-    result = chrome_common_net::AppendOrReplaceQueryParameter(
-        result, "q", search_string);
+    result = net::AppendOrReplaceQueryParameter(result, "q", search_string);
   }
   return result;
 }
 
 GDataWapiUrlGenerator::GDataWapiUrlGenerator(const GURL& base_url)
     : base_url_(GURL(base_url)) {
 }
 
 GDataWapiUrlGenerator::~GDataWapiUrlGenerator() {
 }
@@ skipping 71 matching lines @@
 
 GURL GDataWapiUrlGenerator::GenerateResourceListRootUrl() const {
   return AddStandardUrlParams(base_url_.Resolve(kResourceListRootURL));
 }
 
 GURL GDataWapiUrlGenerator::GenerateAccountMetadataUrl() const {
   return AddMetadataUrlParams(base_url_.Resolve(kAccountMetadataURL));
 }
 
 }  // namespace google_apis