Revert 98168, it caused compile errors on mac:

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 151 matching lines @@
       enable_download_protection_(false),
       enable_csd_whitelist_(false),
       update_in_progress_(false),
       database_update_in_progress_(false),
       closing_database_(false),
       download_urlcheck_timeout_ms_(kDownloadUrlCheckTimeoutMs),
       download_hashcheck_timeout_ms_(kDownloadHashCheckTimeoutMs) {
 #if !defined(OS_CHROMEOS)
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableClientSidePhishingDetection) &&
-      (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableSanitizedClientSidePhishingDetection) ||
-       CanReportStats())) {
+      CanReportStats()) {
     csd_service_.reset(
         safe_browsing::ClientSideDetectionService::Create(
             g_browser_process->system_request_context()));
   }
 #endif
 }
 
 SafeBrowsingService::~SafeBrowsingService() {
   // Deletes the PrefChangeRegistrars, whose dtors also unregister |this| as an
   // observer of the preferences.
@@ skipping 709 matching lines @@
   // 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) &&
-       (cmdline->HasSwitch(
-           switches::kEnableSanitizedClientSidePhishingDetection) ||
-        (local_state &&
-         local_state->GetBoolean(prefs::kMetricsReportingEnabled))));
+       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::Stop() {
@@ skipping 424 matching lines @@
   }
 
   if (enable)
     Start();
   else
     Stop();
 
   if (csd_service_.get())
     csd_service_->SetEnabled(enable);
 }