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

chrome/browser/google_apis/gdata_contacts_operations.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_contacts_operations.h"
 
 #include "chrome/browser/google_apis/time_util.h"
-#include "chrome/common/net/url_util.h"
 #include "googleurl/src/gurl.h"
+#include "net/base/url_util.h"
 
 namespace google_apis {
 
 namespace {
 
 // URL requesting all contact groups.
 const char kGetContactGroupsURL[] =
     "https://www.google.com/m8/feeds/groups/default/full?alt=json";
 
 // URL requesting all contacts.
@@ skipping 46 matching lines @@
 
 GetContactsOperation::~GetContactsOperation() {}
 
 GURL GetContactsOperation::GetURL() const {
   if (!feed_url_for_testing_.is_empty())
     return GURL(feed_url_for_testing_);
 
   GURL url(kGetContactsURL);
 
   if (!group_id_.empty()) {
-    url = chrome_common_net::AppendQueryParameter(
-              url, kGetContactsGroupParam, group_id_);
+    url = net::AppendQueryParameter(url, kGetContactsGroupParam, group_id_);
   }
   if (!min_update_time_.is_null()) {
     std::string time_rfc3339 = util::FormatTimeAsString(min_update_time_);
-    url = chrome_common_net::AppendQueryParameter(
-              url, kGetContactsUpdatedMinParam, time_rfc3339);
+    url = net::AppendQueryParameter(
+        url, kGetContactsUpdatedMinParam, time_rfc3339);
   }
   return url;
 }
 
 //========================== GetContactPhotoOperation ==========================
 
 GetContactPhotoOperation::GetContactPhotoOperation(
     OperationRegistry* registry,
     net::URLRequestContextGetter* url_request_context_getter,
     const GURL& photo_url,
@@ skipping 18 matching lines @@
   OnProcessURLFetchResultsComplete(code == HTTP_SUCCESS);
 }
 
 void GetContactPhotoOperation::RunCallbackOnPrematureFailure(
     GDataErrorCode code) {
   scoped_ptr<std::string> data(new std::string);
   callback_.Run(code, data.Pass());
 }
 
 }  // namespace google_apis