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

chrome/browser/intents/cws_intents_registry.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/intents/cws_intents_registry.h"
 
 #include "base/callback.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/message_bundle.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/webdata/web_data_service.h"
-#include "chrome/common/net/url_util.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/load_flags.h"
 #include "net/base/mime_util.h"
+#include "net/base/url_util.h"
 #include "net/url_request/url_fetcher.h"
 
 namespace {
 
 // Limit for the number of suggestions we fix from CWS. Ideally, the registry
 // simply get all of them, but there is a) chunking on the CWS side, and b)
 // there is a cost with suggestions fetched. (Network overhead for favicons,
 // roundtrips to registry to check if installed).
 //
 // Since the picker limits the number of suggestions displayed to 5, 15 means
@@ skipping 187 matching lines @@
   URLFetcherHandle handle = reinterpret_cast<URLFetcherHandle>(
       query->url_fetcher.get());
   queries_[handle] = query.release();
   queries_[handle]->url_fetcher->Start();
 }
 
 // static
 GURL CWSIntentsRegistry::BuildQueryURL(const string16& action,
                                        const string16& type) {
   GURL request(kCWSIntentServiceURL);
-  request = chrome_common_net::AppendQueryParameter(request, "intent",
-                                                    UTF16ToUTF8(action));
-  request = chrome_common_net::AppendQueryParameter(request, "mime_types",
-                                                    UTF16ToUTF8(type));
-  request = chrome_common_net::AppendQueryParameter(request, "start_index",
-                                                    "0");
-  request = chrome_common_net::AppendQueryParameter(request, "num_results",
-                                                    kMaxSuggestions);
-  request = chrome_common_net::AppendQueryParameter(request, "key",
-                                                    google_apis::GetAPIKey());
+  request = net::AppendQueryParameter(request, "intent", UTF16ToUTF8(action));
+  request = net::AppendQueryParameter(request, "mime_types", UTF16ToUTF8(type));
+  request = net::AppendQueryParameter(request, "start_index", "0");
+  request = net::AppendQueryParameter(request, "num_results", kMaxSuggestions);
+  request = net::AppendQueryParameter(request, "key", google_apis::GetAPIKey());
 
   return request;
 }