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

chrome/browser/web_resource/web_resource_service.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/web_resource/web_resource_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/web_resource/web_resource_unpacker.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/utility_process_host.h"
 #include "content/public/browser/utility_process_host_client.h"
-#include "content/public/common/url_fetcher.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
+#include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
 
 using content::BrowserThread;
 using content::UtilityProcessHost;
 using content::UtilityProcessHostClient;
 
 // This class coordinates a web resource unpack and parse task which is run in
 // a separate process.  Results are sent back to this class and routed to
 // the WebResourceService.
 class WebResourceService::UnpackerClient : public UtilityProcessHostClient {
@@ skipping 162 matching lines @@
   in_fetch_ = true;
 
   // Balanced in OnURLFetchComplete.
   AddRef();
 
   GURL web_resource_server = apply_locale_to_url_ ?
       google_util::AppendGoogleLocaleParam(web_resource_server_) :
       web_resource_server_;
 
   DVLOG(1) << "WebResourceService StartFetch " << web_resource_server;
-  url_fetcher_.reset(content::URLFetcher::Create(
+  url_fetcher_.reset(net::URLFetcher::Create(
       web_resource_server, net::URLFetcher::GET, this));
   // Do not let url fetcher affect existing state in system context
   // (by setting cookies, for example).
   url_fetcher_->SetLoadFlags(net::LOAD_DISABLE_CACHE |
                              net::LOAD_DO_NOT_SEND_COOKIES |
                              net::LOAD_DO_NOT_SAVE_COOKIES);
   net::URLRequestContextGetter* url_request_context_getter =
       g_browser_process->system_request_context();
   url_fetcher_->SetRequestContext(url_request_context_getter);
   url_fetcher_->Start();
@@ skipping 12 matching lines @@
     client->Start(data);
   } else {
     // Don't parse data if attempt to download was unsuccessful.
     // Stop loading new web resource data, and silently exit.
     // We do not call UnpackerClient, so we need to call EndFetch ourselves.
     EndFetch();
   }
 
   Release();
 }