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

android_webview/browser/aw_metrics_service_client.cc

 // 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.
 
 #include "android_webview/browser/aw_metrics_service_client.h"
 
 #include "android_webview/common/aw_version_info_values.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/guid.h"
 #include "base/i18n/rtl.h"
 #include "components/metrics/call_stack_profile_metrics_provider.h"
+#include "components/metrics/enabled_state_provider.h"
 #include "components/metrics/gpu/gpu_metrics_provider.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/metrics/metrics_service.h"
 #include "components/metrics/metrics_state_manager.h"
 #include "components/metrics/net/net_metrics_log_uploader.h"
 #include "components/metrics/profiler/profiler_metrics_provider.h"
 #include "components/metrics/ui/screen_info_metrics_provider.h"
 #include "components/metrics/url_constants.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 32 matching lines @@
 
   // We must write a new GUID.
   *guid = base::GenerateGUID();
   if (!base::WriteFile(guid_file_path, guid->c_str(), guid->size()))
     LOG(ERROR) << "Failed to write new GUID";
   return;
 }
 
 }  // namespace
 
+class AwMetricsServiceClient::AwEnabledStateProvider
+    : public metrics::EnabledStateProvider {
+ public:
+  AwEnabledStateProvider(AwMetricsServiceClient* metrics_service_client)
+      : metrics_service_client_(metrics_service_client) {}
+  ~AwEnabledStateProvider() override {}
+
+  bool IsConsentGiven() override {
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+    return metrics_service_client_->is_enabled_;
+  }
+
+ private:
+  AwMetricsServiceClient* metrics_service_client_;
+
+  DISALLOW_COPY_AND_ASSIGN(AwEnabledStateProvider);
+};
+
 // static
 AwMetricsServiceClient* AwMetricsServiceClient::GetInstance() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   return g_lazy_instance_.Pointer();
 }
 
 void AwMetricsServiceClient::Initialize(
     PrefService* pref_service,
     net::URLRequestContextGetter* request_context,
     const base::FilePath guid_file_path) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(!is_initialized_);
 
   pref_service_ = pref_service;
   request_context_ = request_context;
 
+  enabled_state_provider_.reset(new AwEnabledStateProvider(this));
+
   std::string* guid = new std::string;
   // Initialization happens on the UI thread, but getting the GUID should happen
   // on the file I/O thread. So we start to initialize, then post to get the
   // GUID, and then pick up where we left off, back on the UI thread, in
   // InitializeWithGUID.
   content::BrowserThread::PostTaskAndReply(
       content::BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&GetOrCreateGUID, guid_file_path, guid),
       base::Bind(&AwMetricsServiceClient::InitializeWithGUID,
                  base::Unretained(this), base::Owned(guid)));
 }
 
 void AwMetricsServiceClient::InitializeWithGUID(std::string* guid) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(!is_initialized_);
 
   pref_service_->SetString(metrics::prefs::kMetricsClientID, *guid);
 
   metrics_state_manager_ = metrics::MetricsStateManager::Create(
-      pref_service_, base::Bind(&AwMetricsServiceClient::is_reporting_enabled,
-                                base::Unretained(this)),
+      pref_service_, enabled_state_provider_.get(),
       base::Bind(&StoreClientInfo), base::Bind(&LoadClientInfo));
 
   metrics_service_.reset(new ::metrics::MetricsService(
       metrics_state_manager_.get(), this, pref_service_));
 
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(
           new metrics::NetworkMetricsProvider(
               content::BrowserThread::GetBlockingPool())));
 
@@ skipping 10 matching lines @@
           new metrics::ProfilerMetricsProvider()));
 
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(
           new metrics::CallStackProfileMetricsProvider));
 
   metrics_service_->InitializeMetricsRecordingState();
 
   is_initialized_ = true;
 
-  if (is_reporting_enabled())
+  if (enabled_state_provider_->IsReportingEnabled())
     metrics_service_->Start();
 }
 
 void AwMetricsServiceClient::SetMetricsEnabled(bool enabled) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // If the client is already initialized, apply the setting immediately.
   // Otherwise, it will be applied on initialization.
   if (is_initialized_ && is_enabled_ != enabled) {
     if (enabled)
@@ skipping 67 matching lines @@
 }
 
 base::TimeDelta AwMetricsServiceClient::GetStandardUploadInterval() {
   return base::TimeDelta::FromMinutes(kUploadIntervalMinutes);
 }
 
 AwMetricsServiceClient::AwMetricsServiceClient()
     : is_initialized_(false),
       is_enabled_(false),
       pref_service_(nullptr),
-      request_context_(nullptr) {}
+      request_context_(nullptr),
+      enabled_state_provider_(nullptr) {}
 
 AwMetricsServiceClient::~AwMetricsServiceClient() {}
 
-bool AwMetricsServiceClient::is_reporting_enabled() {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  return is_enabled_;
-}
-
 }  // namespace android_webview