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

Index: chrome/browser/google_apis/gdata_wapi_url_generator.cc
diff --git a/chrome/browser/google_apis/gdata_wapi_url_generator.cc b/chrome/browser/google_apis/gdata_wapi_url_generator.cc
index 020f8ed2c24b71a294a5d1c67da2325621180e1b..79dd18ef93594f9046d2a8ad010fb62712a9f445 100644
--- a/chrome/browser/google_apis/gdata_wapi_url_generator.cc
+++ b/chrome/browser/google_apis/gdata_wapi_url_generator.cc
@@ -6,9 +6,9 @@
 
 #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 {
@@ -66,17 +66,15 @@ const char GDataWapiUrlGenerator::kBaseUrlForProduction[] =
 
 // 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;
 }
@@ -88,27 +86,22 @@ GURL GDataWapiUrlGenerator::AddFeedUrlParams(
     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;
 }