Remove content::URLFetcherDelegate

chrome/browser/captive_portal/captive_portal_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_
 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "content/public/browser/notification_observer.h"
-#include "content/public/common/url_fetcher_delegate.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/backoff_entry.h"
+#include "net/url_request/url_fetcher_delegate.h"
 
 class Profile;
 
 namespace net {
 class URLFetcher;
 }
 
 namespace captive_portal {
 
 // Possible results of an attempt to detect a captive portal.
 enum Result {
   // There's a confirmed connection to the Internet.
   RESULT_INTERNET_CONNECTED,
   // The URL request received a network or HTTP error, or a non-HTTP response.
   RESULT_NO_RESPONSE,
   // The URL request apparently encountered a captive portal.  It received a
   // a valid HTTP response with a 2xx or 3xx status code, other than a 204.
   RESULT_BEHIND_CAPTIVE_PORTAL,
   RESULT_COUNT
 };
 
 // Service that checks for captive portals when queried, and sends a
 // NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT with the Profile as the source and
 // a CaptivePortalService::Results as the details.
 //
 // Captive portal checks are rate-limited.  The CaptivePortalService may only
 // be accessed on the UI thread.
 // Design doc: https://docs.google.com/document/d/1k-gP2sswzYNvryu9NcgN7q5XrsMlUdlUdoW9WRaEmfM/edit
 class CaptivePortalService : public ProfileKeyedService,
-                             public content::URLFetcherDelegate,
+                             public net::URLFetcherDelegate,
                              public content::NotificationObserver,
                              public base::NonThreadSafe {
  public:
   // The details sent via a NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT.
   struct Results {
     // The result of the second most recent captive portal check.
     Result previous_result;
     // The result of the most recent captive portal check.
     Result result;
   };
@@ skipping 48 matching lines @@
     // |initial_backoff_no_portal_ms|.  Also used when the service is disabled.
     int initial_backoff_portal_ms;
 
     net::BackoffEntry::Policy backoff_policy;
   };
 
   // Initiates a captive portal check, without any throttling.  If the service
   // is disabled, just acts like there's an Internet connection.
   void DetectCaptivePortalInternal();
 
-  // content::URLFetcherDelegate:
+  // net::URLFetcherDelegate:
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // content::NotificationObserver:
   virtual void Observe(
       int type,
       const content::NotificationSource& source,
       const content::NotificationDetails& details) OVERRIDE;
 
   // ProfileKeyedService:
   virtual void Shutdown() OVERRIDE;
@@ skipping 79 matching lines @@
   BooleanPrefMember resolve_errors_with_web_service_;
 
   base::OneShotTimer<CaptivePortalService> check_captive_portal_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalService);
 };
 
 }  // namespace captive_portal
 
 #endif  // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_