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

chrome/browser/safe_browsing/client_side_detection_host.h

Index: chrome/browser/safe_browsing/client_side_detection_host.h
diff --git a/chrome/browser/safe_browsing/client_side_detection_host.h b/chrome/browser/safe_browsing/client_side_detection_host.h
index e4e47cf4f7209a40d12babd9312172a0e5e5e184..caad42fea8d923c62c72983863b7378f21efa5a2 100644
--- a/chrome/browser/safe_browsing/client_side_detection_host.h
+++ b/chrome/browser/safe_browsing/client_side_detection_host.h
@@ -52,7 +52,14 @@ class ClientSideDetectionHost : public content::WebContentsObserver,
   virtual void OnSafeBrowsingHit(
       const SafeBrowsingUIManager::UnsafeResource& resource) OVERRIDE;
 
+  // Returns true if the given IP address is malicious.
+  // This method has be to called on the IO thread.
+  virtual bool IsBadIpAddress(const std::string& ip_address);
+
  protected:
+  // Used for testing only when we mock out the host.
+  ClientSideDetectionHost();
+
   // From content::WebContentsObserver.
   virtual void WebContentsDestroyed(content::WebContents* tab) OVERRIDE;
 
@@ -81,8 +88,11 @@ class ClientSideDetectionHost : public content::WebContentsObserver,
   // 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);
+  // Takes ownership of the request object.  Called on the UI thread.
+  void MalwareFeatureExtractionDone(bool success,
+                                    ClientMalwareRequest* request);

[mattm, 2013/10/25 06:28:12]

Why removing the scoped_ptr?  It's the explicit way of saying "this function
takes ownership".

[noé, 2013/10/28 23:39:26]

Kept the scoped_ptr here but had to remove it from the extractor API since it's
not possible to mock a method that has a scoped_ptr :-(.

 
   // Update the entries in browse_info_->ips map.
   void UpdateIPUrlMap(const std::string& ip, const std::string& url);