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

chromecast/browser/metrics/cast_metrics_service_client.h

 // Copyright 2014 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 CHROMECAST_BROWSER_METRICS_CAST_METRICS_SERVICE_CLIENT_H_
 #define CHROMECAST_BROWSER_METRICS_CAST_METRICS_SERVICE_CLIENT_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "build/build_config.h"
+#include "components/metrics/enabled_state_provider.h"
 #include "components/metrics/metrics_service_client.h"
 
 class PrefRegistrySimple;
 class PrefService;
 
 namespace base {
 class SingleThreadTaskRunner;
 class TaskRunner;
 }
 
 namespace metrics {
 struct ClientInfo;
 class MetricsService;
 class MetricsStateManager;
 }  // namespace metrics
 
 namespace net {
 class URLRequestContextGetter;
 }  // namespace net
 
 namespace chromecast {
 
 class CastService;
 
 namespace metrics {
 
 class ExternalMetrics;
 
-class CastMetricsServiceClient : public ::metrics::MetricsServiceClient {
+class CastMetricsServiceClient : public ::metrics::MetricsServiceClient,
+                                 public ::metrics::EnabledStateProvider {
  public:
   ~CastMetricsServiceClient() override;
 
   static std::unique_ptr<CastMetricsServiceClient> Create(
       base::TaskRunner* io_task_runner,
       PrefService* pref_service,
       net::URLRequestContextGetter* request_context);
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
   // Use |client_id| when starting MetricsService instead of generating a new
@@ skipping 20 matching lines @@
   ::metrics::SystemProfileProto::Channel GetChannel() override;
   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;
 
+  // ::metrics::EnabledStateProvider implementation:

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

Nit: Ditto.

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

Done.

+  bool IsConsentGiven() override;
+
   // Starts/stops the metrics service.
   void EnableMetricsService(bool enabled);
 
   std::string client_id() const { return client_id_; }
 
  private:
   CastMetricsServiceClient(base::TaskRunner* io_task_runner,
                            PrefService* pref_service,
                            net::URLRequestContextGetter* request_context);
 
-  // Returns whether or not metrics reporting is enabled.
-  bool IsReportingEnabled();
-
   std::unique_ptr<::metrics::ClientInfo> LoadClientInfo();
   void StoreClientInfo(const ::metrics::ClientInfo& client_info);
 
   base::TaskRunner* const io_task_runner_;
   PrefService* const pref_service_;
   CastService* cast_service_;
   std::string client_id_;
   std::string force_client_id_;
   bool client_info_loaded_;
 
 #if defined(OS_LINUX)
   ExternalMetrics* external_metrics_;
   ExternalMetrics* platform_metrics_;
 #endif  // defined(OS_LINUX)
   const scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   std::unique_ptr<::metrics::MetricsStateManager> metrics_state_manager_;
   std::unique_ptr<::metrics::MetricsService> metrics_service_;
+  std::unique_ptr<::metrics::EnabledStateProvider> enabled_state_provider_;
   net::URLRequestContextGetter* const request_context_;
 
   DISALLOW_COPY_AND_ASSIGN(CastMetricsServiceClient);
 };
 
 }  // namespace metrics
 }  // namespace chromecast
 
 #endif  // CHROMECAST_BROWSER_METRICS_CAST_METRICS_SERVICE_CLIENT_H_