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..245407364eed802b15d972b4cf3593b5630deb9c 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,15 +69,15 @@ class AwMetricsServiceClient : public metrics::MetricsServiceClient {
       const base::Callback<void(int)>& on_upload_complete) override;
   base::TimeDelta GetStandardUploadInterval() override;
 
+  // metrics::EnabledStateProvider:
+  bool IsConsentGiven() override;

[paulmiller, 2016/05/11 21:31:35]

This looks like it can be called before AwMetricsServiceClient initialization,
so please group it with those similar functions at the top (where it says "These
may be called at any time.")

[jwd, 2016/05/11 22:01:04]

Done.

+
  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_;