Splitting the concept of UMA consent, and should UMA report.

chromecast/browser/metrics/cast_metrics_service_client.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 "chromecast/browser/metrics/cast_metrics_service_client.h"
 
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "chromecast/base/cast_sys_info_util.h"
 #include "chromecast/base/chromecast_switches.h"
 #include "chromecast/base/path_utils.h"
 #include "chromecast/base/pref_names.h"
 #include "chromecast/base/version.h"
 #include "chromecast/browser/cast_browser_process.h"
 #include "chromecast/browser/cast_content_browser_client.h"
 #include "chromecast/browser/metrics/cast_stability_metrics_provider.h"
 #include "chromecast/public/cast_sys_info.h"
 #include "components/metrics/client_info.h"
+#include "components/metrics/enabled_state_provider.h"
 #include "components/metrics/gpu/gpu_metrics_provider.h"
 #include "components/metrics/metrics_provider.h"
 #include "components/metrics/metrics_service.h"
 #include "components/metrics/metrics_state_manager.h"
 #include "components/metrics/net/net_metrics_log_uploader.h"
 #include "components/metrics/net/network_metrics_provider.h"
 #include "components/metrics/profiler/profiler_metrics_provider.h"
 #include "components/metrics/ui/screen_info_metrics_provider.h"
 #include "components/metrics/url_constants.h"
 #include "components/prefs/pref_registry_simple.h"
@@ skipping 218 matching lines @@
   return std::unique_ptr<::metrics::MetricsLogUploader>(
       new ::metrics::NetMetricsLogUploader(request_context_, uma_server_url,
                                            ::metrics::kDefaultMetricsMimeType,
                                            on_upload_complete));
 }
 
 base::TimeDelta CastMetricsServiceClient::GetStandardUploadInterval() {
   return base::TimeDelta::FromMinutes(kStandardUploadIntervalMinutes);
 }
 
+bool CastMetricsServiceClient::IsConsentGiven() {
+  return pref_service_->GetBoolean(prefs::kOptInStats);
+}
+
 void CastMetricsServiceClient::EnableMetricsService(bool enabled) {
   if (!task_runner_->BelongsToCurrentThread()) {
     task_runner_->PostTask(
         FROM_HERE, base::Bind(&CastMetricsServiceClient::EnableMetricsService,
                               base::Unretained(this), enabled));
     return;
   }
 
   if (enabled) {
     metrics_service_->Start();
@@ skipping 46 matching lines @@
       << "Force client ID must be set before client info is loaded.";
   force_client_id_ = client_id;
 }
 
 void CastMetricsServiceClient::Initialize(CastService* cast_service) {
   DCHECK(cast_service);
   DCHECK(!cast_service_);
   cast_service_ = cast_service;
 
   metrics_state_manager_ = ::metrics::MetricsStateManager::Create(
-      pref_service_,
-      base::Bind(&CastMetricsServiceClient::IsReportingEnabled,
-                 base::Unretained(this)),
+      pref_service_, this,
       base::Bind(&CastMetricsServiceClient::StoreClientInfo,
                  base::Unretained(this)),
       base::Bind(&CastMetricsServiceClient::LoadClientInfo,
                  base::Unretained(this)));
   metrics_service_.reset(new ::metrics::MetricsService(
       metrics_state_manager_.get(), this, pref_service_));
 
   // Always create a client id as it may also be used by crash reporting,
   // (indirectly) included in feedback, and can be queried during setup.
   // For UMA and crash reporting, associated opt-in settings will control
@@ skipping 61 matching lines @@
   // Stop metrics service cleanly before destructing CastMetricsServiceClient.
   // The pointer will be deleted in StopAndDestroy().
   external_metrics_->StopAndDestroy();
   external_metrics_ = nullptr;
   platform_metrics_->StopAndDestroy();
   platform_metrics_ = nullptr;
 #endif  // defined(OS_LINUX)
   metrics_service_->Stop();
 }
 
-bool CastMetricsServiceClient::IsReportingEnabled() {
-  return pref_service_->GetBoolean(prefs::kOptInStats);
-}
-
 }  // namespace metrics
 }  // namespace chromecast