Move URLFetcherDelegate to net/ and split URLFetcher between net/ and content/

chrome/browser/intranet_redirect_detector.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_INTRANET_REDIRECT_DETECTOR_H_
 #define CHROME_BROWSER_INTRANET_REDIRECT_DETECTOR_H_
 #pragma once
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
-#include "content/public/common/url_fetcher_delegate.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "content/public/common/url_fetcher_delegate.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/host_resolver_proc.h"
 #include "net/base/network_change_notifier.h"
 
 class PrefService;
 
 // This object is responsible for determining whether the user is on a network
 // that redirects requests for intranet hostnames to another site, and if so,
 // tracking what that site is (including across restarts via a pref).  For
 // example, the user's ISP might convert a request for "http://query/" into a
@@ skipping 26 matching lines @@
   // is in place.
   static GURL RedirectOrigin();
 
   static void RegisterPrefs(PrefService* prefs);
 
   // The number of characters the fetcher will use for its randomly-generated
   // hostnames.
   static const size_t kNumCharsInHostnames;
 
  private:
-  typedef std::set<content::URLFetcher*> Fetchers;
+  typedef std::set<net::URLFetcher*> Fetchers;
 
   // Called when the seven second startup sleep or the one second network
   // switch sleep has finished.  Runs any pending fetch.
   void FinishSleep();
 
   // content::URLFetcherDelegate
-  virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // NetworkChangeNotifier::IPAddressObserver
   virtual void OnIPAddressChanged() OVERRIDE;
 
   GURL redirect_origin_;
   base::WeakPtrFactory<IntranetRedirectDetector> weak_factory_;
   Fetchers fetchers_;
   std::vector<GURL> resulting_origins_;
   bool in_sleep_;  // True if we're in the seven-second "no fetching" period
                    // that begins at browser start, or the one-second "no
@@ skipping 12 matching lines @@
                       net::AddressFamily address_family,
                       net::HostResolverFlags host_resolver_flags,
                       net::AddressList* addrlist,
                       int* os_error) OVERRIDE;
 
  private:
   virtual ~IntranetRedirectHostResolverProc() {}
 };
 
 #endif  // CHROME_BROWSER_INTRANET_REDIRECT_DETECTOR_H_