BASELINE: Update Chromium to 59.0.3071.134

Change-Id: Id02ef6fb2204c5fd21668a1c3e6911c83b17585a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

3 files changed, 4 insertions, 26 deletions

diff --git a/chromium/components/metrics_services_manager/OWNERS b/chromium/components/metrics_services_manager/OWNERS
index 236892ba623..3b1e0686f43 100644
--- a/chromium/components/metrics_services_manager/OWNERS
+++ b/chromium/components/metrics_services_manager/OWNERS
@@ -3,3 +3,5 @@ holte@chromium.org
 isherman@chromium.org
 mpearson@chromium.org
 rkaplow@chromium.org
+
+# COMPONENT: Internals>Metrics
diff --git a/chromium/components/metrics_services_manager/metrics_services_manager.cc b/chromium/components/metrics_services_manager/metrics_services_manager.cc
index 7b87f884a91..5987635fbac 100644
--- a/chromium/components/metrics_services_manager/metrics_services_manager.cc
+++ b/chromium/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() {
diff --git a/chromium/components/metrics_services_manager/metrics_services_manager_client.h b/chromium/components/metrics_services_manager/metrics_services_manager_client.h
index b53d39dbc55..1490ff984f8 100644
--- a/chromium/components/metrics_services_manager/metrics_services_manager_client.h
+++ b/chromium/components/metrics_services_manager/metrics_services_manager_client.h
@@ -48,14 +48,6 @@ class MetricsServicesManagerClient {
   // operate.
   virtual net::URLRequestContextGetter* GetURLRequestContext() = 0;
 
-  // Returns whether safe browsing is enabled. If relevant in the embedder's
-  // context, |on_update_callback| will be set up to be called when the state of
-  // safe browsing changes. |on_update_callback| is guaranteed to be valid for
-  // the lifetime of this client instance, but should not be used beyond this
-  // instance being destroyed.
-  virtual bool IsSafeBrowsingEnabled(
-      const base::Closure& on_update_callback) = 0;
-
   // Returns whether metrics reporting is enabled.
   virtual bool IsMetricsReportingEnabled() = 0;