Add "enabled" state to the ClientSideDetectionService.

chrome/browser/safe_browsing/safe_browsing_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.
 //
 // The Safe Browsing service is responsible for downloading anti-phishing and
 // anti-malware tables and checking urls against them.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H_
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H_
 #pragma once
@@ skipping 24 matching lines @@
 class SafeBrowsingServiceFactory;
 
 namespace base {
 class Thread;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
+namespace safe_browsing {
+class ClientSideDetectionService;
+}
+
 // Construction needs to happen on the main thread.
 class SafeBrowsingService
     : public base::RefCountedThreadSafe<SafeBrowsingService>,
       public NotificationObserver {
  public:
   class Client;
   // Users of this service implement this interface to be notified
   // asynchronously of the result.
   enum UrlCheckResult {
     SAFE,
@@ skipping 189 matching lines @@
   // updated MAC keys.
   void OnNewMacKeys(const std::string& client_key,
                     const std::string& wrapped_key);
 
   bool enabled() const { return enabled_; }
 
   bool download_protection_enabled() const {
     return enabled_ && enable_download_protection_;
   }
 
+  safe_browsing::ClientSideDetectionService*
+      safe_browsing_detection_service() const {
+    return csd_service_.get();
+  }
+
   // Preference handling.
   static void RegisterPrefs(PrefService* prefs);
 
   // Called on the IO thread to reset the database.
   void ResetDatabase();
 
   // Log the user perceived delay caused by SafeBrowsing. This delay is the time
   // delta starting from when we would have started reading data from the
   // network, and ending when the SafeBrowsing check completes indicating that
   // the current page is 'safe'.
@@ skipping 102 matching lines @@
 
   void NotifyClientBlockingComplete(Client* client, bool proceed);
 
   void DatabaseUpdateFinished(bool update_succeeded);
 
   // Start up SafeBrowsing objects. This can be called at browser start, or when
   // the user checks the "Enable SafeBrowsing" option in the Advanced options
   // UI.
   void Start();
 
+  // Stops the SafeBrowsingService. This can be called when the safe browsing
+  // preference is disabled.
+  void Stop();
+
   // Called on the db thread to close the database.  See CloseDatabase().
   void OnCloseDatabase();
 
   // Runs on the db thread to reset the database. We assume that resetting the
   // database is a synchronous operation.
   void OnResetDatabase();
 
   // Store in-memory the GetHash response. Runs on the database thread.
   void CacheHashResults(const std::vector<SBPrefix>& prefixes,
                         const std::vector<SBFullHashResult>& full_hashes);
@@ skipping 129 matching lines @@
   NotificationRegistrar registrar_;
 
   // Tracks existing PrefServices, and the safe browsing preference on each.
   // This is used to determine if any profile is currently using the safe
   // browsing service, and to start it up or shut it down accordingly.
   std::map<PrefService*, PrefChangeRegistrar*> prefs_map_;
 
   // Used to track creation and destruction of profiles on the UI thread.
   NotificationRegistrar prefs_registrar_;
 
+  // The ClientSideDetectionService is managed by the SafeBrowsingService,
+  // since its running state and lifecycle depends on SafeBrowsingService's.
+  scoped_ptr<safe_browsing::ClientSideDetectionService> csd_service_;
+
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingService);
 };
 
 // Factory for creating SafeBrowsingService.  Useful for tests.
 class SafeBrowsingServiceFactory {
  public:
   SafeBrowsingServiceFactory() { }
   virtual ~SafeBrowsingServiceFactory() { }
   virtual SafeBrowsingService* CreateSafeBrowsingService() = 0;
  private:
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingServiceFactory);
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H_