Convert to base::Callback in safe_browsing client-side-detection code.

chrome/browser/safe_browsing/client_side_detection_service.h

 // Copyright (c) 2011 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 38 matching lines @@
 }  // namespace net
 
 namespace safe_browsing {
 class ClientPhishingRequest;
 class ClientPhishingResponse;
 class ClientSideModel;
 
 class ClientSideDetectionService : public content::URLFetcherDelegate,
                                    public content::NotificationObserver {
  public:
-  typedef Callback2<GURL /* phishing URL */, bool /* is phishing */>::Type
-      ClientReportPhishingRequestCallback;
+  // void(GURL phishing_url, bool is_phishing).
+  typedef base::Callback<void(GURL, bool)> ClientReportPhishingRequestCallback;
 
   virtual ~ClientSideDetectionService();
 
   // Creates a client-side detection service.  The service is initially
   // disabled, use SetEnabledAndRefreshState() to start it.  The caller takes
   // ownership of the object.  This function may return NULL.
   static ClientSideDetectionService* Create(
       net::URLRequestContextGetter* request_context_getter);
 
   // Enables or disables the service, and refreshes the state of all renderers.
@@ skipping 21 matching lines @@
   // 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
   // occurs during the fetch.  If the service is disabled or an error occurs
   // the phishing verdict will always be false.  The callback is always called
   // after SendClientReportPhishingRequest() returns and on the same thread as
   // SendClientReportPhishingRequest() was called.  You may set |callback| to
   // NULL if you don't care about the server verdict.
   virtual void SendClientReportPhishingRequest(
       ClientPhishingRequest* verdict,
-      ClientReportPhishingRequestCallback* callback);
+      const ClientReportPhishingRequestCallback& callback);
 
   // Returns true if the given IP address string falls within a private
   // (unroutable) network block.  Pages which are hosted on these IP addresses
   // are exempt from client-side phishing detection.  This is called by the
   // ClientSideDetectionHost prior to sending the renderer a
   // SafeBrowsingMsg_StartPhishingDetection IPC.
   //
   // ip_address should be a dotted IPv4 address, or an unbracketed IPv6
   // address.
   virtual bool IsPrivateIPAddress(const std::string& ip_address) const;
@@ skipping 83 matching lines @@
   static const int kClientModelFetchIntervalMs;
   static const int kInitialClientModelFetchDelayMs;
   static const base::TimeDelta kReportsInterval;
   static const base::TimeDelta kNegativeCacheInterval;
   static const base::TimeDelta kPositiveCacheInterval;
 
   // Starts sending the request to the client-side detection frontends.
   // This method takes ownership of both pointers.
   void StartClientReportPhishingRequest(
       ClientPhishingRequest* verdict,
-      ClientReportPhishingRequestCallback* callback);
+      const ClientReportPhishingRequestCallback& callback);
 
   // Called by OnURLFetchComplete to handle the response from fetching the
   // model.
   void HandleModelResponse(const content::URLFetcher* source,
                            const GURL& url,
                            const net::URLRequestStatus& status,
                            int response_code,
                            const net::ResponseCookies& cookies,
                            const std::string& data);
 
@@ skipping 81 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_