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

android_webview/browser/aw_metrics_service_client.h

Index: android_webview/browser/aw_metrics_service_client.h
diff --git a/android_webview/browser/aw_metrics_service_client.h b/android_webview/browser/aw_metrics_service_client.h
index 29cca691e4b86dfd03acb85b8901e6e1e4257337..13f78347d32a61030acc37267d142c5c04dc9980 100644
--- a/android_webview/browser/aw_metrics_service_client.h
+++ b/android_webview/browser/aw_metrics_service_client.h
@@ -11,6 +11,7 @@
 #include "android_webview/browser/aw_metrics_service_client.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
+#include "components/metrics/enabled_state_provider.h"
 #include "components/metrics/metrics_service_client.h"
 
 class PrefService;
@@ -37,7 +38,8 @@ namespace android_webview {
 // race conditions, and because MetricsService is single-threaded.
 // Initialization is asynchronous; even after Initialize has returned, some
 // methods may not be ready to use (see below).
-class AwMetricsServiceClient : public metrics::MetricsServiceClient {
+class AwMetricsServiceClient : public metrics::MetricsServiceClient,
+                               public metrics::EnabledStateProvider {
   friend struct base::DefaultLazyInstanceTraits<AwMetricsServiceClient>;
 
  public:
@@ -48,6 +50,9 @@ class AwMetricsServiceClient : public metrics::MetricsServiceClient {
                   const base::FilePath guid_file_path);
   void SetMetricsEnabled(bool enabled);
 
+  // metrics::EnabledStateProvider:
+  bool IsConsentGiven() override;
+
   // These implement metrics::MetricsServiceClient. They must not be called
   // until initialization has asynchronously finished.
   metrics::MetricsService* GetMetricsService() override;
@@ -73,9 +78,6 @@ class AwMetricsServiceClient : public metrics::MetricsServiceClient {
 
   void InitializeWithGUID(std::string* guid);
 
-  // Callback for metrics::MetricsStateManager::Create
-  bool is_reporting_enabled();
-
   bool is_initialized_;
   bool is_enabled_;
   PrefService* pref_service_;