UKM Sync Observer

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 50 matching lines @@
   GetMetricsServiceClient()->OnPluginLoadingError(plugin_path);
 }
 
 void MetricsServicesManager::OnRendererProcessCrash() {
   GetMetricsServiceClient()->OnRendererProcessCrash();
 }
 
 metrics::MetricsServiceClient*
 MetricsServicesManager::GetMetricsServiceClient() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  if (!metrics_service_client_)
+  if (!metrics_service_client_) {
     metrics_service_client_ = client_->CreateMetricsServiceClient();
+    // base::Unretained is safe since |this| owns the metrics_service_client_.
+    metrics_service_client_->SetUpdateRunningServicesCallback(
+        base::Bind(&MetricsServicesManager::UpdateRunningServices,
+                   base::Unretained(this)));
+  }
   return metrics_service_client_.get();
 }
 
 void MetricsServicesManager::UpdatePermissions(bool may_record,
                                                bool may_upload) {
   DCHECK(thread_checker_.CalledOnValidThread());
+  // If the user has opted out of metrics, delete local UKM state.
+  if (may_record_ && !may_record) {

[rkaplow, 2017/02/01 16:40:55]

nit - this just looks confusing. May want to rename the argument to
current_may_record or something. (and current_may_upload)

[Steven Holte, 2017/02/03 00:04:34]

Done.

+    ukm::UkmService* ukm = GetUkmService();
+    if (ukm)
+      ukm->Purge();
+  }
+
   // Stash the current permissions so that we can update the RapporServiceImpl
   // correctly when the Rappor preference changes.  The metrics recording
   // preference partially determines the initial rappor setting, and also
   // controls whether FINE metrics are sent.
   may_record_ = may_record;
   may_upload_ = may_upload;
   UpdateRunningServices();
 }
 
 void MetricsServicesManager::UpdateRunningServices() {
   DCHECK(thread_checker_.CalledOnValidThread());
   metrics::MetricsService* metrics = GetMetricsService();
   ukm::UkmService* ukm = GetUkmService();
 
   if (client_->OnlyDoMetricsRecording()) {
     metrics->StartRecordingForTests();
     GetRapporServiceImpl()->Update(
         rappor::UMA_RAPPOR_GROUP | rappor::SAFEBROWSING_RAPPOR_GROUP, false);
     return;
   }
 
   client_->UpdateRunningServices(may_record_, may_upload_);
 
   if (may_record_) {
     if (!metrics->recording_active())
       metrics->Start();
 
     if (may_upload_) {
       metrics->EnableReporting();
-#if !defined(OFFICIAL_BUILD)
-      // TODO(holte): Make UKM check sync state instead of official build.
-      if (ukm)
+      if (ukm && metrics_service_client_->IsHistorySyncEnabledOnAllProfiles())
         ukm->EnableReporting();
-#endif
     } else {
       metrics->DisableReporting();
       if (ukm)
         ukm->DisableReporting();
     }
   } else {
     metrics->Stop();
   }
 
   int recording_groups = 0;
@@ skipping 12 matching lines @@
     recording_groups |= rappor::SAFEBROWSING_RAPPOR_GROUP;
 #endif  // defined(GOOGLE_CHROME_BUILD)
   GetRapporServiceImpl()->Update(recording_groups, may_upload_);
 }
 
 void MetricsServicesManager::UpdateUploadPermissions(bool may_upload) {
   UpdatePermissions(client_->IsMetricsReportingEnabled(), may_upload);
 }
 
 }  // namespace metrics_services_manager