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

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 985 matching lines @@
 }
 
 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();
+      (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableSanitizedClientSidePhishingDetection) ||
+       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) {
@@ skipping 101 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartPersistentInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)