Move content::URLFetcher static functions to net::URLFetcher

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/browser/intents/api_key.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 "content/public/common/url_fetcher.h"
 #include "net/base/load_flags.h"
 #include "net/base/mime_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
 // the suggestion list only has the potential to be shorter than that once the
@@ skipping 123 matching lines @@
 
   if (!query->callback.is_null())
     query->callback.Run(intents);
 }
 
 void CWSIntentsRegistry::GetIntentServices(const string16& action,
                                            const string16& mimetype,
                                            const ResultsCallback& cb) {
   scoped_ptr<IntentsQuery> query(new IntentsQuery);
   query->callback = cb;
-  query->url_fetcher.reset(content::URLFetcher::Create(
+  query->url_fetcher.reset(net::URLFetcher::Create(
       0, BuildQueryURL(action,mimetype), net::URLFetcher::GET, this));
 
   if (query->url_fetcher.get() == NULL)
     return;
 
   query->url_fetcher->SetRequestContext(request_context_);
   query->url_fetcher->SetLoadFlags(
       net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES);
 
   URLFetcherHandle handle = reinterpret_cast<URLFetcherHandle>(
@@ skipping 14 matching lines @@
                                                     "0");
   request = chrome_common_net::AppendQueryParameter(request, "num_results",
                                                     kMaxSuggestions);
   if (web_intents::kApiKey[0]) {
     request = chrome_common_net::AppendQueryParameter(request, "key",
                                                        web_intents::kApiKey);
   }
 
   return request;
 }