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

chrome/browser/safe_browsing/client_side_detection_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.
 //
 // Helper class which handles communication with the SafeBrowsing backends for
 // client-side phishing detection.  This class is used to fetch the client-side
 // model and send it to all renderers.  This class is also used to send a ping
 // back to Google to verify if a particular site is really phishing or not.
 //
 // This class is not thread-safe and expects all calls to be made on the UI
@@ skipping 11 matching lines @@
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.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/net_util.h"
 
 class SafeBrowsingService;
 
 namespace base {
 class TimeDelta;
 }
 
 namespace content {
@@ skipping 32 matching lines @@
   // called with "false" verdicts.  Enabling starts downloading the model after
   // a delay.  In all cases, each render process is updated to match the state
   // of the SafeBrowsing preference for that profile.
   void SetEnabledAndRefreshState(bool enabled);
 
   bool enabled() const {
     return enabled_;
   }
 
   // From the content::URLFetcherDelegate interface.
-  virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // content::NotificationObserver overrides:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Sends a request to the SafeBrowsing servers with the ClientPhishingRequest.
   // The URL scheme of the |url()| in the request should be HTTP.  This method
   // takes ownership of the |verdict| as well as the |callback| and calls the
   // the callback once the result has come back from the server or if an error
@@ skipping 103 matching lines @@
   static const int kPositiveCacheIntervalMinutes;
 
   // Starts sending the request to the client-side detection frontends.
   // This method takes ownership of both pointers.
   void StartClientReportPhishingRequest(
       ClientPhishingRequest* verdict,
       const ClientReportPhishingRequestCallback& callback);
 
   // Called by OnURLFetchComplete to handle the response from fetching the
   // model.
-  void HandleModelResponse(const content::URLFetcher* source,
+  void HandleModelResponse(const net::URLFetcher* source,
                            const GURL& url,
                            const net::URLRequestStatus& status,
                            int response_code,
                            const net::ResponseCookies& cookies,
                            const std::string& data);
 
   // Called by OnURLFetchComplete to handle the server response from
   // sending the client-side phishing request.
-  void HandlePhishingVerdict(const content::URLFetcher* source,
+  void HandlePhishingVerdict(const net::URLFetcher* source,
                              const GURL& url,
                              const net::URLRequestStatus& status,
                              int response_code,
                              const net::ResponseCookies& cookies,
                              const std::string& data);
 
   // Invalidate cache results which are no longer useful.
   void UpdateCache();
 
   // Get the number of phishing reports that we have sent over kReportsInterval
@@ skipping 25 matching lines @@
   bool enabled_;
 
   std::string model_str_;
   scoped_ptr<ClientSideModel> model_;
   scoped_ptr<base::TimeDelta> model_max_age_;
   scoped_ptr<content::URLFetcher> model_fetcher_;
 
   // Map of client report phishing request to the corresponding callback that
   // has to be invoked when the request is done.
   struct ClientReportInfo;
-  std::map<const content::URLFetcher*, ClientReportInfo*>
+  std::map<const net::URLFetcher*, ClientReportInfo*>
       client_phishing_reports_;
 
   // Cache of completed requests. Used to satisfy requests for the same urls
   // as long as the next request falls within our caching window (which is
   // determined by kNegativeCacheInterval and kPositiveCacheInterval). The
   // size of this cache is limited by kMaxReportsPerDay *
   // ceil(InDays(max(kNegativeCacheInterval, kPositiveCacheInterval))).
   // TODO(gcasto): Serialize this so that it doesn't reset on browser restart.
   PhishingCache cache_;
 
@@ skipping 16 matching lines @@
   // this map to speed up lookups.
   BadSubnetMap bad_subnets_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientSideDetectionService);
 };
 }  // namepsace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_DETECTION_SERVICE_H_