Remove Safebrowsing Rappor support

components/metrics_services_manager/metrics_services_manager.cc

 // Copyright 2014 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 "components/metrics_services_manager/metrics_services_manager.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "components/metrics/metrics_service.h"
@@ skipping 87 matching lines @@
   may_upload_ = current_may_upload;
   UpdateRunningServices();
 }
 
 void MetricsServicesManager::UpdateRunningServices() {
   DCHECK(thread_checker_.CalledOnValidThread());
   metrics::MetricsService* metrics = GetMetricsService();
 
   if (client_->OnlyDoMetricsRecording()) {
     metrics->StartRecordingForTests();
-    GetRapporServiceImpl()->Update(
-        rappor::UMA_RAPPOR_GROUP | rappor::SAFEBROWSING_RAPPOR_GROUP, false);
+    GetRapporServiceImpl()->Update(true, false);
     return;
   }
 
   client_->UpdateRunningServices(may_record_, may_upload_);
 
   if (may_record_) {
     if (!metrics->recording_active())
       metrics->Start();
     if (may_upload_)
       metrics->EnableReporting();
     else
       metrics->DisableReporting();
   } else {
     metrics->Stop();
   }
 
   UpdateUkmService();
 
-  int recording_groups = 0;
-#if defined(GOOGLE_CHROME_BUILD)
-  if (may_record_)
-    recording_groups |= rappor::UMA_RAPPOR_GROUP;
-
-  // NOTE: It is safe to use a raw pointer to |this| because this object owns
-  // |client_|, and the contract of
-  // MetricsServicesManagerClient::IsSafeBrowsingEnabled() states that the
-  // callback passed in must not be used beyond the lifetime of the client
-  // instance.
-  base::Closure on_safe_browsing_update_callback = base::Bind(
-      &MetricsServicesManager::UpdateRunningServices, base::Unretained(this));
-  if (client_->IsSafeBrowsingEnabled(on_safe_browsing_update_callback))
-    recording_groups |= rappor::SAFEBROWSING_RAPPOR_GROUP;
-#endif  // defined(GOOGLE_CHROME_BUILD)
-  GetRapporServiceImpl()->Update(recording_groups, may_upload_);
+  GetRapporServiceImpl()->Update(may_record_, may_upload_);
 }
 
 void MetricsServicesManager::UpdateUkmService() {
   ukm::UkmService* ukm = GetUkmService();
   if (!ukm)
     return;
   bool sync_enabled =
       metrics_service_client_->IsHistorySyncEnabledOnAllProfiles();
   if (may_record_ && sync_enabled) {
     ukm->EnableRecording();
     if (may_upload_)
       ukm->EnableReporting();
     else
       ukm->DisableReporting();
   } else {
     ukm->DisableRecording();
     ukm->DisableReporting();
   }
 }
 
 void MetricsServicesManager::UpdateUploadPermissions(bool may_upload) {
   UpdatePermissions(client_->IsMetricsReportingEnabled(), may_upload);
 }
 
 }  // namespace metrics_services_manager