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 45 matching lines @@
       return channel_map.chrome_channel;
   }
 
   // Any non-empty channel name is considered beta channel
   return ::metrics::SystemProfileProto::CHANNEL_BETA;
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace
 
+class CastMetricsServiceClient::CastEnabledStateProvider
+    : public ::metrics::EnabledStateProvider {
+ public:
+  explicit CastEnabledStateProvider(PrefService* pref_service)
+      : pref_service_(pref_service) {}
+  ~CastEnabledStateProvider() override {}
+
+  bool IsConsentGiven() override {
+    return pref_service_->GetBoolean(prefs::kOptInStats);
+  }
+
+ private:
+  PrefService* const pref_service_;
+
+  DISALLOW_COPY_AND_ASSIGN(CastEnabledStateProvider);
+};
+
 // static
 std::unique_ptr<CastMetricsServiceClient> CastMetricsServiceClient::Create(
     base::TaskRunner* io_task_runner,
     PrefService* pref_service,
     net::URLRequestContextGetter* request_context) {
   return base::WrapUnique(new CastMetricsServiceClient(
       io_task_runner, pref_service, request_context));
 }
 
 void CastMetricsServiceClient::RegisterPrefs(PrefRegistrySimple* registry) {
@@ skipping 181 matching lines @@
     net::URLRequestContextGetter* request_context)
     : io_task_runner_(io_task_runner),
       pref_service_(pref_service),
       cast_service_(nullptr),
       client_info_loaded_(false),
 #if defined(OS_LINUX)
       external_metrics_(nullptr),
       platform_metrics_(nullptr),
 #endif  // defined(OS_LINUX)
       task_runner_(base::ThreadTaskRunnerHandle::Get()),
+      enabled_state_provider_(new CastEnabledStateProvider(pref_service)),
       request_context_(request_context) {
 }
 
 CastMetricsServiceClient::~CastMetricsServiceClient() {
 #if defined(OS_LINUX)
   DCHECK(!external_metrics_);
   DCHECK(!platform_metrics_);
 #endif  // defined(OS_LINUX)
 }
 
@@ skipping 18 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_, enabled_state_provider_.get(),
       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 28 matching lines @@
           new ::metrics::ProfilerMetricsProvider));
   shell::CastBrowserProcess::GetInstance()->browser_client()->
       RegisterMetricsProviders(metrics_service_.get());
 
   metrics_service_->InitializeMetricsRecordingState();
 #if !defined(OS_ANDROID)
   // Reset clean_shutdown bit after InitializeMetricsRecordingState().
   metrics_service_->LogNeedForCleanShutdown();
 #endif  // !defined(OS_ANDROID)
 
-  if (IsReportingEnabled())
+  if (enabled_state_provider_->IsReportingEnabled())
     metrics_service_->Start();
 
 #if defined(OS_LINUX)
   // Start external metrics collection, which feeds data from external
   // processes into the main external metrics.
   external_metrics_ = new ExternalMetrics(
       stability_provider,
       GetHomePathASCII(kExternalUmaEventsRelativePath).value());
   external_metrics_->Start();
   platform_metrics_ =
@@ skipping 12 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