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

chrome/browser/captive_portal/captive_portal_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/captive_portal/captive_portal_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
-#include "content/public/common/url_fetcher.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
+#include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
 
 namespace captive_portal {
 
 namespace {
 
 // The test URL.  When connected to the Internet, it should return a blank page
 // with a 204 status code.  When behind a captive portal, requests for this
 // URL should get an HTTP redirect or a login page.  When neither is true,
 // no server should respond to requests for this URL.
@@ skipping 159 matching lines @@
   // When not enabled, just claim there's an Internet connection.
   if (!enabled_) {
     // Count this as a success, so the backoff entry won't apply exponential
     // backoff, but will apply the standard delay.
     backoff_entry_->InformOfRequest(true);
     OnResult(RESULT_INTERNET_CONNECTED);
     return;
   }
 
   // The first 0 means this can use a TestURLFetcherFactory in unit tests.
-  url_fetcher_.reset(content::URLFetcher::Create(0,
-                                                 test_url_,
-                                                 net::URLFetcher::GET,
-                                                 this));
+  url_fetcher_.reset(net::URLFetcher::Create(0,
+                                             test_url_,
+                                             net::URLFetcher::GET,
+                                             this));
   url_fetcher_->SetAutomaticallyRetryOn5xx(false);
   url_fetcher_->SetRequestContext(profile_->GetRequestContext());
   // Can't safely use net::LOAD_DISABLE_CERT_REVOCATION_CHECKING here,
   // since then the connection may be reused without checking the cert.
   url_fetcher_->SetLoadFlags(
       net::LOAD_BYPASS_CACHE |
       net::LOAD_DO_NOT_PROMPT_FOR_LOGIN |
       net::LOAD_DO_NOT_SAVE_COOKIES |
       net::LOAD_DO_NOT_SEND_COOKIES |
       net::LOAD_DO_NOT_SEND_AUTH_DATA);
@@ skipping 199 matching lines @@
 
 bool CaptivePortalService::FetchingURL() const {
   return url_fetcher_.get() != NULL;
 }
 
 bool CaptivePortalService::TimerRunning() const {
   return check_captive_portal_timer_.IsRunning();
 }
 
 }  // namespace captive_portal