  }
 
  bool ChromeMetricsServicesManagerClient::IsMetricsReportingEnabled() {
---- a/chrome/browser/browser_process.h
-+++ b/chrome/browser/browser_process.h
-@@ -42,10 +42,6 @@ class WatchDogThread;
- class WebRtcLogUploader;
- #endif
-
--namespace safe_browsing {
--class SafeBrowsingService;
--}
--
- namespace variations {
- class VariationsService;
- }
-@@ -107,10 +103,6 @@ namespace rappor {
- class RapporService;
- }
-
--namespace safe_browsing {
--class ClientSideDetectionService;
--}
--
- namespace web_resource {
- class PromoResourceService;
- }
-@@ -217,14 +209,6 @@ class BrowserProcess {
-   // on this platform (or this is a unit test).
-   virtual StatusTray* status_tray() = 0;
-
--  // Returns the SafeBrowsing service.
--  virtual safe_browsing::SafeBrowsingService* safe_browsing_service() = 0;
--
--  // Returns an object which handles communication with the SafeBrowsing
--  // client-side detection servers.
--  virtual safe_browsing::ClientSideDetectionService*
--      safe_browsing_detection_service() = 0;
--
- #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
-   // This will start a timer that, if Chrome is in persistent mode, will check
-   // whether an update is available, and if that's the case, restart the
 --- a/chrome/browser/download/download_danger_prompt.cc
 +++ b/chrome/browser/download/download_danger_prompt.cc
-@@ -28,10 +28,6 @@
- #include "ui/base/l10n/l10n_util.h"
-
- using extensions::ExperienceSamplingEvent;
+@@ -14,9 +14,6 @@
+ #include "content/public/browser/download_danger_type.h"
+ #include "content/public/browser/download_item.h"
+
 -using safe_browsing::ClientDownloadResponse;
 -using safe_browsing::ClientSafeBrowsingReportRequest;
--using safe_browsing::download_protection_util::
--    GetSBClientDownloadExtensionValueForUMA;
-
+-
  namespace {
 
-@@ -316,6 +312,7 @@ DownloadDangerPrompt* DownloadDangerPrompt::Create(
- void DownloadDangerPrompt::SendSafeBrowsingDownloadRecoveryReport(
+ const char kDownloadDangerPromptPrefix[] = "Download.DownloadDangerPrompt";
+@@ -53,57 +50,9 @@
+     ClientSafeBrowsingReportRequest::ReportType report_type,
      bool did_proceed,
      const content::DownloadItem& download) {
-+#if 0
-   safe_browsing::SafeBrowsingService* sb_service =
-       g_browser_process->safe_browsing_service();
-   ClientSafeBrowsingReportRequest report;
-@@ -345,11 +342,13 @@ void DownloadDangerPrompt::SendSafeBrowsingDownloadRecoveryReport(
-     sb_service->SendDownloadRecoveryReport(serialized_report);
-   else
-     DLOG(ERROR) << "Unable to serialize the threat report.";
-+#endif
+-  safe_browsing::SafeBrowsingService* sb_service =
+-      g_browser_process->safe_browsing_service();
+-  ClientSafeBrowsingReportRequest report;
+-  report.set_type(report_type);
+-  switch (download.GetDangerType()) {
+-    case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL:
+-    case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
+-      report.set_download_verdict(ClientDownloadResponse::DANGEROUS);
+-      break;
+-    case content::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT:
+-      report.set_download_verdict(ClientDownloadResponse::UNCOMMON);
+-      break;
+-    case content::DOWNLOAD_DANGER_TYPE_POTENTIALLY_UNWANTED:
+-      report.set_download_verdict(ClientDownloadResponse::POTENTIALLY_UNWANTED);
+-      break;
+-    case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
+-      report.set_download_verdict(ClientDownloadResponse::DANGEROUS_HOST);
+-      break;
+-    default:  // Don't send report for any other danger types.
+-      return;
+-  }
+-  report.set_url(download.GetURL().spec());
+-  report.set_did_proceed(did_proceed);
+-  std::string token =
+-    safe_browsing::DownloadProtectionService::GetDownloadPingToken(
+-        &download);
+-  if (!token.empty())
+-    report.set_token(token);
+-  std::string serialized_report;
+-  if (report.SerializeToString(&serialized_report))
+-    sb_service->SendSerializedDownloadReport(serialized_report);
+-  else
+-    DLOG(ERROR) << "Unable to serialize the threat report.";
  }
 
  void DownloadDangerPrompt::RecordDownloadDangerPrompt(
      bool did_proceed,
      const content::DownloadItem& download) {
-+#if 0
-   int dangerous_file_type =
-       GetSBClientDownloadExtensionValueForUMA(download.GetTargetFilePath());
-   content::DownloadDangerType danger_type = download.GetDangerType();
-@@ -364,4 +363,5 @@ void DownloadDangerPrompt::RecordDownloadDangerPrompt(
-                            GetDangerTypeString(danger_type)),
-         dangerous_file_type);
-   }
-+#endif
- }
+-  int64_t file_type_uma_value =
+-      safe_browsing::FileTypePolicies::GetInstance()->UmaValueForFile(
+-          download.GetTargetFilePath());
+-  content::DownloadDangerType danger_type = download.GetDangerType();
+-
+-  UMA_HISTOGRAM_SPARSE_SLOWLY(
+-      base::StringPrintf("%s.%s.Shown", kDownloadDangerPromptPrefix,
+-                         GetDangerTypeString(danger_type)),
+-      file_type_uma_value);
+-  if (did_proceed) {
+-    UMA_HISTOGRAM_SPARSE_SLOWLY(
+-        base::StringPrintf("%s.%s.Proceed", kDownloadDangerPromptPrefix,
+-                           GetDangerTypeString(danger_type)),
+-        file_type_uma_value);
+-  }
+ }


--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -592,10 +592,10 @@ class SafeBrowsingSSLCertReporter : public SSLCertReporter {
   // SSLCertReporter implementation
   void ReportInvalidCertificateChain(
       const std::string& serialized_report) override {

 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/browser/ui/browser_dialogs.h"
@@ -196,7 +195,6 @@
       created_icon_manager_(false),
       created_notification_ui_manager_(false),
       created_notification_bridge_(false),
-      created_safe_browsing_service_(false),
       created_subresource_filter_ruleset_service_(false),
       shutting_down_(false),
       tearing_down_(false),
@@ -280,8 +278,6 @@
   // that URLFetcher operation before going away.)
   metrics_services_manager_.reset();
   intranet_redirect_detector_.reset();
-  if (safe_browsing_service_.get())
-    safe_browsing_service()->ShutDown();
   network_time_tracker_.reset();
 #if defined(ENABLE_PLUGIN_INSTALLATION)
   plugins_resource_service_.reset();
@@ -843,22 +839,6 @@
   return status_tray_.get();
 }

