Add support for client-side phishing detection for non-UMA users.

chrome/browser/safe_browsing/safe_browsing_service.cc

Index: chrome/browser/safe_browsing/safe_browsing_service.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index c8f1851d26bb6332e1d102ab06438361475e0122..256b0e127f78026b2896f7373297d67c7c2f2d88 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -169,7 +169,9 @@ SafeBrowsingService::SafeBrowsingService()
 #if !defined(OS_CHROMEOS)
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableClientSidePhishingDetection) &&
-      CanReportStats()) {
+      (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableSanitizedClientSidePhishingDetection) ||
+       CanReportStats())) {
     csd_service_.reset(
         safe_browsing::ClientSideDetectionService::Create(
             g_browser_process->system_request_context()));
@@ -899,7 +901,10 @@ void SafeBrowsingService::Start() {
 #else
   enable_csd_whitelist_ =
       (!cmdline->HasSwitch(switches::kDisableClientSidePhishingDetection) &&
-       local_state && local_state->GetBoolean(prefs::kMetricsReportingEnabled));
+       (cmdline->HasSwitch(
+           switches::kEnableSanitizedClientSidePhishingDetection) ||
+        (local_state &&
+         local_state->GetBoolean(prefs::kMetricsReportingEnabled))));
 #endif
 
   BrowserThread::PostTask(