Remove safe_browsing=2 functionality, replace with =3 mode.

chrome/browser/safe_browsing/safe_browsing_service.cc

 // Copyright (c) 2012 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 <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 233 matching lines @@
 
 #if defined(FULL_SAFE_BROWSING)
 #if defined(SAFE_BROWSING_CSD)
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableClientSidePhishingDetection)) {
     csd_service_.reset(safe_browsing::ClientSideDetectionService::Create(
         url_request_context_getter_.get()));
   }
 #endif  // defined(SAFE_BROWSING_CSD)
 
-// TODO(nparker): Adding SAFE_BROWSING_SERVICE_DOWNLOAD to control this might
-// allow removing FULL_SAFE_BROWSING above.
-#if !defined(OS_ANDROID)
   download_service_.reset(new safe_browsing::DownloadProtectionService(
       this, url_request_context_getter_.get()));
-#endif
 
   if (safe_browsing::IncidentReportingService::IsEnabled()) {
     incident_service_.reset(new safe_browsing::IncidentReportingService(
         this, url_request_context_getter_));
     resource_request_detector_.reset(new safe_browsing::ResourceRequestDetector(
         incident_service_->GetIncidentReceiver()));
   }
 
   off_domain_inclusion_detector_.reset(
       new safe_browsing::OffDomainInclusionDetector(database_manager_));
@@ skipping 390 matching lines @@
 
   state_callback_list_.Notify();
 
 #if defined(FULL_SAFE_BROWSING)
   if (csd_service_)
     csd_service_->SetEnabledAndRefreshState(enable);
   if (download_service_)
     download_service_->SetEnabled(enable);
 #endif
 }