Basic UkmService implementation

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"
 #include "components/metrics/metrics_service_client.h"
 #include "components/metrics/metrics_state_manager.h"
 #include "components/metrics_services_manager/metrics_services_manager_client.h"
 #include "components/rappor/rappor_service_impl.h"
+#include "components/ukm/ukm_service.h"
 #include "components/variations/service/variations_service.h"
 
 namespace metrics_services_manager {
 
 MetricsServicesManager::MetricsServicesManager(
     std::unique_ptr<MetricsServicesManagerClient> client)
     : client_(std::move(client)), may_upload_(false), may_record_(false) {
   DCHECK(client_);
 }
 
@@ skipping 11 matching lines @@
 
 rappor::RapporServiceImpl* MetricsServicesManager::GetRapporServiceImpl() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!rappor_service_) {
     rappor_service_ = client_->CreateRapporServiceImpl();
     rappor_service_->Initialize(client_->GetURLRequestContext());
   }
   return rappor_service_.get();
 }
 
+ukm::UkmService* MetricsServicesManager::GetUkmService() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  return GetMetricsServiceClient()->GetUkmService();
+}
+
 variations::VariationsService* MetricsServicesManager::GetVariationsService() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!variations_service_)
     variations_service_ = client_->CreateVariationsService();
   return variations_service_.get();
 }
 
 void MetricsServicesManager::OnPluginLoadingError(
     const base::FilePath& plugin_path) {
   GetMetricsServiceClient()->OnPluginLoadingError(plugin_path);
@@ skipping 19 matching lines @@
   // 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_)
+    if (may_upload_) {
       metrics->EnableReporting();
-    else
+      // TODO(holte): Make UKM checks sync state

[battre, 2017/01/20 07:42:30]

Can you add something like this into EnableReporting of the UKM?

#ifdef OFFICIAL_BUILD
  CHECK(false);  // Remove this, once UKM checks the sync state (see
MetricsServicesManager::UpdateRunningServices())
#endif

[Steven Holte, 2017/01/20 20:07:39]

Done, and added a #if around the call in MSM to make sure it isn't called.

+      if (ukm)
+        ukm->EnableReporting();
+    } else {
       metrics->DisableReporting();
+      if (ukm)
+        ukm->DisableReporting();
+    }
   } else {
     metrics->Stop();
   }
 
   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_);
 }
 
 void MetricsServicesManager::UpdateUploadPermissions(bool may_upload) {
   UpdatePermissions(client_->IsMetricsReportingEnabled(), may_upload);
 }
 
 }  // namespace metrics_services_manager