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..2aba58d10995b37fa4ed2fce5fda3936d194e46b 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:
@@ -67,21 +69,21 @@ class AwMetricsServiceClient : public metrics::MetricsServiceClient {
       const base::Callback<void(int)>& on_upload_complete) override;
   base::TimeDelta GetStandardUploadInterval() override;
 
+  // metrics::EnabledStateProvider implementation:

[Alexei Svitkine (slow), 2016/05/11 18:37:26]

Nit: New suggested syntax for these comments is just:

// metrics::EnableStateProvider:

[jwd, 2016/05/11 19:17:04]

Done.

+  bool IsConsentGiven() override;
+
  private:
   AwMetricsServiceClient();
   ~AwMetricsServiceClient() override;
 
   void InitializeWithGUID(std::string* guid);
 
-  // Callback for metrics::MetricsStateManager::Create
-  bool is_reporting_enabled();
-
   bool is_initialized_;
   bool is_enabled_;
   PrefService* pref_service_;
   net::URLRequestContextGetter* request_context_;
-  std::unique_ptr<metrics::MetricsStateManager> metrics_state_manager_;
   std::unique_ptr<metrics::MetricsService> metrics_service_;
+  std::unique_ptr<AwEnabledStateProvider> enabled_state_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(AwMetricsServiceClient);
 };