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

android_webview/browser/aw_metrics_service_client.cc

Index: android_webview/browser/aw_metrics_service_client.cc
diff --git a/android_webview/browser/aw_metrics_service_client.cc b/android_webview/browser/aw_metrics_service_client.cc
index 685cc33f88eb67db7ba1c6913ee35923be88ce7f..3129fe9df65064f791f6c049afb13289da49c0c8 100644
--- a/android_webview/browser/aw_metrics_service_client.cc
+++ b/android_webview/browser/aw_metrics_service_client.cc
@@ -10,6 +10,7 @@
 #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"
@@ -98,9 +99,8 @@ void AwMetricsServiceClient::InitializeWithGUID(std::string* guid) {
   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_));
@@ -130,7 +130,7 @@ void AwMetricsServiceClient::InitializeWithGUID(std::string* guid) {
 
   is_initialized_ = true;
 
-  if (is_reporting_enabled())
+  if (IsReportingEnabled())
     metrics_service_->Start();
 }
 
@@ -148,6 +148,11 @@ void AwMetricsServiceClient::SetMetricsEnabled(bool enabled) {
   is_enabled_ = enabled;
 }
 
+bool AwMetricsServiceClient::IsConsentGiven() {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  return is_enabled_;
+}
+
 metrics::MetricsService* AwMetricsServiceClient::GetMetricsService() {
   return metrics_service_.get();
 }
@@ -222,9 +227,4 @@ AwMetricsServiceClient::AwMetricsServiceClient()
 
 AwMetricsServiceClient::~AwMetricsServiceClient() {}
 
-bool AwMetricsServiceClient::is_reporting_enabled() {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  return is_enabled_;
-}
-
 }  // namespace android_webview