Remove Safebrowsing Rappor support

components/metrics_services_manager/metrics_services_manager.cc

Index: components/metrics_services_manager/metrics_services_manager.cc
diff --git a/components/metrics_services_manager/metrics_services_manager.cc b/components/metrics_services_manager/metrics_services_manager.cc
index 7b87f884a91557cc8324d8fd549feb9aa10960ed..5987635fbacfbf3d479b89ff07eeb33c4e116827 100644
--- a/components/metrics_services_manager/metrics_services_manager.cc
+++ b/components/metrics_services_manager/metrics_services_manager.cc
@@ -105,8 +105,7 @@ void MetricsServicesManager::UpdateRunningServices() {
 
   if (client_->OnlyDoMetricsRecording()) {
     metrics->StartRecordingForTests();
-    GetRapporServiceImpl()->Update(
-        rappor::UMA_RAPPOR_GROUP | rappor::SAFEBROWSING_RAPPOR_GROUP, false);
+    GetRapporServiceImpl()->Update(true, false);
     return;
   }
 
@@ -125,22 +124,7 @@ void MetricsServicesManager::UpdateRunningServices() {
 
   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() {