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

android_webview/browser/aw_metrics_service_client.h

 // 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.
 
 #ifndef ANDROID_WEBVIEW_BROWSER_AW_METRICS_SERVICE_CLIENT_IMPL_H_
 #define ANDROID_WEBVIEW_BROWSER_AW_METRICS_SERVICE_CLIENT_IMPL_H_
 
 #include <memory>
 #include <string>
 
 #include "android_webview/browser/aw_metrics_service_client.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "components/metrics/metrics_service_client.h"
 
 class PrefService;
 
 namespace base {
 class FilePath;
 }
 
 namespace metrics {
 struct ClientInfo;
+class EnabledStateProvider;
 class MetricsStateManager;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace android_webview {
 
 // This singleton manages metrics for an app using any number of WebViews. The
@@ skipping 27 matching lines @@
   std::string GetVersionString() override;
   void OnLogUploadComplete() override;
   void InitializeSystemProfileMetrics(
       const base::Closure& done_callback) override;
   void CollectFinalMetricsForLog(const base::Closure& done_callback) override;
   std::unique_ptr<metrics::MetricsLogUploader> CreateUploader(
       const base::Callback<void(int)>& on_upload_complete) override;
   base::TimeDelta GetStandardUploadInterval() override;
 
  private:
+  class AwEnabledStateProvider;
+
   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_;

[Alexei Svitkine (slow), 2016/05/11 17:16:28]

Nit: How about just making AwMetricsServiceClient implement the interface? Then,
you don't need an extra member/class.

[jwd, 2016/05/11 18:31:38]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(AwMetricsServiceClient);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_AW_METRICS_SERVICE_CLIENT_IMPL_H_