Add "enabled" state to the ClientSideDetectionService.

chrome/browser/browser_process_impl.cc

 // 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.
 
 #include "chrome/browser/browser_process_impl.h"
 
 #include <map>
 #include <set>
 #include <vector>
 
@@ skipping 30 matching lines @@
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prerender/prerender_tracker.h"
 #include "chrome/browser/printing/background_printing_manager.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h"
-#include "chrome/browser/safe_browsing/client_side_detection_service.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/sidebar/sidebar_manager.h"
 #include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/browser/tab_closeable_state_watcher.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/web_resource/gpu_blacklist_updater.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 66 matching lines @@
       created_web_socket_proxy_thread_(false),
 #endif
       created_profile_manager_(false),
       created_local_state_(false),
       created_icon_manager_(false),
       created_devtools_manager_(false),
       created_sidebar_manager_(false),
       created_browser_policy_connector_(false),
       created_notification_ui_manager_(false),
       created_safe_browsing_service_(false),
-      created_safe_browsing_detection_service_(false),
       module_ref_count_(0),
       did_start_(false),
       checked_for_new_frames_(false),
       using_new_frames_(false) {
   g_browser_process = this;
   clipboard_.reset(new ui::Clipboard);
   main_notification_service_.reset(new NotificationService);
 
   // Must be created after the NotificationService.
   print_job_manager_.reset(new printing::PrintJobManager);
@@ skipping 24 matching lines @@
   automation_provider_list_.reset();
 
   // We need to shutdown the SdchDictionaryFetcher as it regularly holds
   // a pointer to a URLFetcher, and that URLFetcher (upon destruction) will do
   // a PostDelayedTask onto the IO thread.  This shutdown call will both discard
   // any pending URLFetchers, and avoid creating any more.
   SdchDictionaryFetcher::Shutdown();
 
   // We need to destroy the MetricsService, GoogleURLTracker,
   // IntranetRedirectDetector, and SafeBrowsing ClientSideDetectionService
-  // before the io_thread_ gets destroyed, since their destructors can call the
-  // URLFetcher destructor, which does a PostDelayedTask operation on the IO
-  // thread. (The IO thread will handle that URLFetcher operation before going
-  // away.)
+  // (owned by the SafeBrowsingService) before the io_thread_ gets destroyed,
+  // since their destructors can call the URLFetcher destructor, which does a
+  // PostDelayedTask operation on the IO thread.
+  // (The IO thread will handle that URLFetcher operation before going away.)
   metrics_service_.reset();
   google_url_tracker_.reset();
   intranet_redirect_detector_.reset();
-  safe_browsing_detection_service_.reset();
+#if defined(ENABLE_SAFE_BROWSING)
+  if (safe_browsing_service_.get()) {
+    safe_browsing_service()->ShutDown();
+  }
+#endif
 
   // Need to clear the desktop notification balloons before the io_thread_ and
   // before the profiles, since if there are any still showing we will access
   // those things during teardown.
   notification_ui_manager_.reset();
 
   // FIXME - We shouldn't need this, it's because of DefaultRequestContext! :(
   // We need to kill off all URLFetchers using profile related
   // URLRequestContexts. Normally that'd be covered by deleting the Profiles,
   // but we have some URLFetchers using the DefaultRequestContext, so they need
   // to be cancelled too. Remove this when DefaultRequestContext goes away.
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           NewRunnableFunction(&URLFetcher::CancelAll));
 
   // Need to clear profiles (download managers) before the io_thread_.
   profile_manager_.reset();
 
   // Debugger must be cleaned up before IO thread and NotificationService.
   remote_debugging_server_.reset();
 
   if (devtools_legacy_handler_.get()) {
     devtools_legacy_handler_->Stop();
     devtools_legacy_handler_ = NULL;
   }
 
-#if defined(ENABLE_SAFE_BROWSING)
-  if (safe_browsing_service_.get())
-    safe_browsing_service()->ShutDown();
-#endif
-
   if (resource_dispatcher_host_.get()) {
     // Cancel pending requests and prevent new requests.
     resource_dispatcher_host()->Shutdown();
   }
 
   ExtensionTabIdMap::GetInstance()->Shutdown();
 
   // The policy providers managed by |browser_policy_connector_| need to shut
   // down while the IO and FILE threads are still alive.
   browser_policy_connector_.reset();
@@ skipping 388 matching lines @@
 SafeBrowsingService* BrowserProcessImpl::safe_browsing_service() {
   DCHECK(CalledOnValidThread());
   if (!created_safe_browsing_service_)
     CreateSafeBrowsingService();
   return safe_browsing_service_.get();
 }
 
 safe_browsing::ClientSideDetectionService*
     BrowserProcessImpl::safe_browsing_detection_service() {
   DCHECK(CalledOnValidThread());
-  if (!created_safe_browsing_detection_service_)
-    CreateSafeBrowsingDetectionService();
-  return safe_browsing_detection_service_.get();
+  if (safe_browsing_service())
+    return safe_browsing_service()->safe_browsing_detection_service();
+  return NULL;
 }
 
 bool BrowserProcessImpl::plugin_finder_disabled() const {
   return *plugin_finder_disabled_pref_;
 }
 
 void BrowserProcessImpl::Observe(int type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_PREF_CHANGED) {
@@ skipping 339 matching lines @@
   DCHECK(safe_browsing_service_.get() == NULL);
   // Set this flag to true so that we don't retry indefinitely to
   // create the service class if there was an error.
   created_safe_browsing_service_ = true;
 #if defined(ENABLE_SAFE_BROWSING)
   safe_browsing_service_ = SafeBrowsingService::CreateSafeBrowsingService();
   safe_browsing_service_->Initialize();
 #endif
 }
 
-void BrowserProcessImpl::CreateSafeBrowsingDetectionService() {
-  DCHECK(safe_browsing_detection_service_.get() == NULL);
-  // Set this flag to true so that we don't retry indefinitely to
-  // create the service class if there was an error.
-  created_safe_browsing_detection_service_ = true;
-
-#if defined(ENABLE_SAFE_BROWSING)
-  if (IsSafeBrowsingDetectionServiceEnabled()) {
-    safe_browsing_detection_service_.reset(
-        safe_browsing::ClientSideDetectionService::Create(
-            g_browser_process->system_request_context()));
-  }
-#endif
-}
-
-bool BrowserProcessImpl::IsSafeBrowsingDetectionServiceEnabled() {
-  // The safe browsing client-side detection is enabled only if the switch is
-  // not disabled and when safe browsing related stats are allowed to be
-  // collected.
-#if defined(ENABLE_SAFE_BROWSING) && !defined(OS_CHROMEOS)
-  return !CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableClientSidePhishingDetection) &&
-      safe_browsing_service() &&
-      safe_browsing_service()->CanReportStats();
-#else
-  return false;
-#endif
-}
-
 void BrowserProcessImpl::ApplyDisabledSchemesPolicy() {
   std::set<std::string> schemes;
   const ListValue* scheme_list = local_state_->GetList(prefs::kDisabledSchemes);
   for (ListValue::const_iterator iter = scheme_list->begin();
        iter != scheme_list->end(); ++iter) {
     std::string scheme;
     if ((*iter)->GetAsString(&scheme))
       schemes.insert(scheme);
   }
   ChildProcessSecurityPolicy::GetInstance()->RegisterDisabledSchemes(schemes);
@@ skipping 96 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartPersistentInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)