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

chrome/browser/google_apis/drive_api_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/drive_api_url_generator.h"
 
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
-#include "chrome/common/net/url_util.h"
+#include "net/base/url_util.h"
 
 namespace google_apis {
 
 namespace {
 
 // Hard coded URLs for communication with a google drive server.
 const char kDriveV2AboutUrl[] = "/drive/v2/about";
 const char kDriveV2ApplistUrl[] = "/drive/v2/apps";
 const char kDriveV2ChangelistUrl[] = "/drive/v2/changes";
 const char kDriveV2FilelistUrl[] = "/drive/v2/files";
@@ skipping 22 matching lines @@
 }
 
 GURL DriveApiUrlGenerator::GetChangelistUrl(
     const GURL& override_url, int64 start_changestamp) const {
   // Use override_url if not empty,
   // otherwise use the default url (kDriveV2Changelisturl based on base_url_).
   const GURL& url = override_url.is_empty() ?
       base_url_.Resolve(kDriveV2ChangelistUrl) :
       override_url;
   return start_changestamp ?
-      chrome_common_net::AppendOrReplaceQueryParameter(
+      net::AppendOrReplaceQueryParameter(
           url, "startChangeId", base::Int64ToString(start_changestamp)) :
       url;
 }
 
 GURL DriveApiUrlGenerator::GetFilelistUrl(
     const GURL& override_url, const std::string& search_string) const {
   // Use override_url if not empty,
   // otherwise use the default url (kDriveV2FilelistUrl based on base_url_).
   const GURL& url = override_url.is_empty() ?
       base_url_.Resolve(kDriveV2FilelistUrl) :
       override_url;
   return search_string.empty() ?
       url :
-      chrome_common_net::AppendOrReplaceQueryParameter(
-          url, "q", search_string);
+      net::AppendOrReplaceQueryParameter(url, "q", search_string);
 }
 
 GURL DriveApiUrlGenerator::GetFileUrl(const std::string& file_id) const {
   return base_url_.Resolve(
       base::StringPrintf(kDriveV2FileUrlFormat, file_id.c_str()));
 }
 
 }  // namespace google_apis