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

android_webview/browser/aw_metrics_service_client.cc

 // Copyright 2015 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 "android_webview/browser/aw_metrics_service_client.h"
 
 #include "android_webview/common/aw_version_info_values.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/guid.h"
 #include "base/i18n/rtl.h"
 #include "components/metrics/call_stack_profile_metrics_provider.h"
+#include "components/metrics/enabled_state_provider.h"
 #include "components/metrics/gpu/gpu_metrics_provider.h"
 #include "components/metrics/metrics_pref_names.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/profiler/profiler_metrics_provider.h"
 #include "components/metrics/ui/screen_info_metrics_provider.h"
 #include "components/metrics/url_constants.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 68 matching lines @@
                  base::Unretained(this), base::Owned(guid)));
 }
 
 void AwMetricsServiceClient::InitializeWithGUID(std::string* guid) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(!is_initialized_);
 
   pref_service_->SetString(metrics::prefs::kMetricsClientID, *guid);
 
   metrics_state_manager_ = metrics::MetricsStateManager::Create(
-      pref_service_, base::Bind(&AwMetricsServiceClient::is_reporting_enabled,
-                                base::Unretained(this)),
-      base::Bind(&StoreClientInfo), base::Bind(&LoadClientInfo));
+      pref_service_, this, base::Bind(&StoreClientInfo),
+      base::Bind(&LoadClientInfo));
 
   metrics_service_.reset(new ::metrics::MetricsService(
       metrics_state_manager_.get(), this, pref_service_));
 
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(
           new metrics::NetworkMetricsProvider(
               content::BrowserThread::GetBlockingPool())));
 
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(
           new metrics::GPUMetricsProvider));
 
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(
           new metrics::ScreenInfoMetricsProvider));
 
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(
           new metrics::ProfilerMetricsProvider()));
 
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(
           new metrics::CallStackProfileMetricsProvider));
 
   metrics_service_->InitializeMetricsRecordingState();
 
   is_initialized_ = true;
 
-  if (is_reporting_enabled())
+  if (IsReportingEnabled())
     metrics_service_->Start();
 }
 
 void AwMetricsServiceClient::SetMetricsEnabled(bool enabled) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // If the client is already initialized, apply the setting immediately.
   // Otherwise, it will be applied on initialization.
   if (is_initialized_ && is_enabled_ != enabled) {
     if (enabled)
       metrics_service_->Start();
     else
       metrics_service_->Stop();
   }
   is_enabled_ = enabled;
 }
 
+bool AwMetricsServiceClient::IsConsentGiven() {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  return is_enabled_;
+}
+
 metrics::MetricsService* AwMetricsServiceClient::GetMetricsService() {
   return metrics_service_.get();
 }
 
 // In Chrome, UMA and Breakpad are enabled/disabled together by the same
 // checkbox and they share the same client ID (a.k.a. GUID). SetMetricsClientId
 // and OnRecordingDisabled are intended to provide the ID to Breakpad. In
 // WebView, UMA and Breakpad are independent, so these are no-ops.
 
 void AwMetricsServiceClient::SetMetricsClientId(const std::string& client_id) {}
@@ skipping 54 matching lines @@
 }
 
 AwMetricsServiceClient::AwMetricsServiceClient()
     : is_initialized_(false),
       is_enabled_(false),
       pref_service_(nullptr),
       request_context_(nullptr) {}
 
 AwMetricsServiceClient::~AwMetricsServiceClient() {}
 
-bool AwMetricsServiceClient::is_reporting_enabled() {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  return is_enabled_;
-}
-
 }  // namespace android_webview