Mostly integrate new malware IP blacklist with the csd client. When

chrome/browser/safe_browsing/client_side_detection_host.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.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_DETECTION_HOST_H_
 #define CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_DETECTION_HOST_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 34 matching lines @@
   // we should classify the new URL.
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) OVERRIDE;
 
   // Called when the SafeBrowsingService found a hit with one of the
   // SafeBrowsing lists.  This method is called on the UI thread.
   virtual void OnSafeBrowsingHit(
       const SafeBrowsingUIManager::UnsafeResource& resource) OVERRIDE;
 
+  virtual scoped_refptr<SafeBrowsingDatabaseManager> database_manager();
+
  protected:
+  explicit ClientSideDetectionHost(content::WebContents* tab);
+
   // From content::WebContentsObserver.
   virtual void WebContentsDestroyed(content::WebContents* tab) OVERRIDE;
 
+  // Used for testing.
+  void set_safe_browsing_managers(
+      SafeBrowsingUIManager* ui_manager,
+      SafeBrowsingDatabaseManager* database_manager);
+
  private:
   friend class ClientSideDetectionHostTest;
   class ShouldClassifyUrlRequest;
   friend class ShouldClassifyUrlRequest;
 
-  explicit ClientSideDetectionHost(content::WebContents* tab);
-
   // Verdict is an encoded ClientPhishingRequest protocol message.
   void OnPhishingDetectionDone(const std::string& verdict);
 
   // Callback that is called when the server ping back is
   // done. Display an interstitial if |is_phishing| is true.
   // Otherwise, we do nothing.  Called in UI thread.
   void MaybeShowPhishingWarning(GURL phishing_url, bool is_phishing);
 
   // Callback that is called when the malware IP server ping back is
   // done. Display an interstitial if |is_malware| is true.
   // Otherwise, we do nothing.  Called in UI thread.
   void MaybeShowMalwareWarning(GURL original_url, GURL malware_url,
                                bool is_malware);
 
   // Callback that is called when the browser feature extractor is done.
   // This method is responsible for deleting the request object.  Called on
   // the UI thread.
   void FeatureExtractionDone(bool success, ClientPhishingRequest* request);
+
   // Function to be called when the browser malware feature extractor is done.
-  void MalwareFeatureExtractionDone(scoped_ptr<ClientMalwareRequest> request);
+  // Called on the UI thread.
+  void MalwareFeatureExtractionDone(bool success,
+                                    scoped_ptr<ClientMalwareRequest> request);
 
   // Update the entries in browse_info_->ips map.
   void UpdateIPUrlMap(const std::string& ip, const std::string& url);
 
   // From NotificationObserver.  Called when a notification comes in.  This
   // method is called in the UI thread.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Returns true if the user has seen a regular SafeBrowsing
   // interstitial for the current page.  This is only true if the user has
   // actually clicked through the warning.  This method is called on the UI
   // thread.
   bool DidShowSBInterstitial();
 
   // Used for testing.  This function does not take ownership of the service
   // class.
   void set_client_side_detection_service(ClientSideDetectionService* service);
 
-  // Used for testing.
-  void set_safe_browsing_managers(
-      SafeBrowsingUIManager* ui_manager,
-      SafeBrowsingDatabaseManager* database_manager);
-
   // Get/Set malware_killswitch_on_ value. These methods called on UI thread.
   bool MalwareKillSwitchIsOn();
   void SetMalwareKillSwitch(bool killswitch_on);
 
   // This pointer may be NULL if client-side phishing detection is disabled.
   ClientSideDetectionService* csd_service_;
   // These pointers may be NULL if SafeBrowsing is disabled.
   scoped_refptr<SafeBrowsingDatabaseManager> database_manager_;
   scoped_refptr<SafeBrowsingUIManager> ui_manager_;
   // Keep a handle to the latest classification request so that we can cancel
@@ skipping 33 matching lines @@
   // Whether the malware bad ip matching and report feature is enabled.
   // This should be accessed from UI thread.
   bool malware_report_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientSideDetectionHost);
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_DETECTION_HOST_H_