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

chrome/browser/safe_browsing/safe_browsing_service.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/safe_browsing/safe_browsing_service.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
@@ skipping 868 matching lines @@
   // We only download the csd-whitelist if client-side phishing detection is
   // enabled and if the user has opted in with stats collection.  Note: we
   // cannot check whether the metrics_service() object is created because it
   // may be initialized after this method is called.
 #ifdef OS_CHROMEOS
   // Client-side detection is disabled on ChromeOS for now, so don't bother
   // downloading the whitelist.
   enable_csd_whitelist_ = false;
 #else
   enable_csd_whitelist_ =
-      (!cmdline->HasSwitch(switches::kDisableClientSidePhishingDetection) &&
-       local_state && local_state->GetBoolean(prefs::kMetricsReportingEnabled));
+      (cmdline->HasSwitch(
+          switches::kEnableSanitizedClientSidePhishingDetection) ||
+       (!cmdline->HasSwitch(switches::kDisableClientSidePhishingDetection) &&
+        local_state &&
+        local_state->GetBoolean(prefs::kMetricsReportingEnabled)));
 #endif
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &SafeBrowsingService::OnIOInitialize, client_key, wrapped_key,
           request_context_getter));
 }
 
 void SafeBrowsingService::OnCloseDatabase() {
@@ skipping 415 matching lines @@
       enable = true;
       break;
     }
   }
 
   if (enable)
     Start();
   else
     ShutDown();
 }