Add a killswitch for CSD malware IP match and report feature. Use a new killswitch whitelist URL wh…

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 67 matching lines @@
   // requests; existing ClientSideDetectionHosts will have their callbacks
   // 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_;
   }
 
+  void SetMalwareEnabled(bool malware_killswitch) {
+    malware_enabled_ = !malware_killswitch;
+  }
+
+  bool MalwareEnabled() const {
+    return malware_enabled_;
+  }
+
   // From the net::URLFetcherDelegate interface.
   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
@@ skipping 174 matching lines @@
   // valid hashes in the model.
   static bool ModelHasValidHashIds(const ClientSideModel& model);
 
   // Returns the URL that will be used for phishing requests.
   static std::string GetClientReportUrl(const std::string& report_url);
 
   // Whether the service is running or not.  When the service is not running,
   // it won't download the model nor report detected phishing URLs.
   bool enabled_;
 
+  // Whether the malware IP matching feature is enabled.
+  bool malware_enabled_;
+
   std::string model_str_;
   scoped_ptr<ClientSideModel> model_;
   scoped_ptr<base::TimeDelta> model_max_age_;
   scoped_ptr<net::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 net::URLFetcher*, ClientReportInfo*>
       client_phishing_reports_;
@@ skipping 27 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_