WebView: Create UMA uploader

android_webview/native/aw_metrics_service_client_impl.cc

 // Copyright 2017 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/native/aw_metrics_service_client_impl.h"
 
 #include "android_webview/common/aw_version_info_values.h"
 #include "android_webview/jni/AwMetricsServiceClient_jni.h"
+#include "android_webview/native/aw_metrics_log_uploader.h"
+#include "base/android/build_info.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/guid.h"
 #include "base/i18n/rtl.h"
 #include "base/threading/sequenced_worker_pool.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_log_uploader.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"
 
 namespace android_webview {
 
 base::LazyInstance<AwMetricsServiceClientImpl>::Leaky g_lazy_instance_;
 
@@ skipping 107 matching lines @@
 }
 
 bool AwMetricsServiceClientImpl::IsConsentGiven() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   return is_enabled_;
 }
 
 void AwMetricsServiceClientImpl::SetMetricsEnabled(bool enabled) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
+  // For now, UMA is only enabled on future versions.
+  if (base::android::BuildInfo::GetInstance()->sdk_int() <=
+      base::android::SDK_VERSION_NOUGAT) {
+    return;
+  }
+
   if (is_enabled_ != enabled) {
     if (enabled) {
-      // TODO(paulmiller): Actually enable metrics when the server-side is ready
-      //metrics_service_->Start();
+      metrics_service_->Start();
     } else {
       metrics_service_->Stop();
     }
     is_enabled_ = enabled;
   }
 }
 
 metrics::MetricsService* AwMetricsServiceClientImpl::GetMetricsService() {
   return metrics_service_.get();
 }
@@ skipping 37 matching lines @@
     const base::Closure& done_callback) {
   done_callback.Run();
 }
 
 std::unique_ptr<metrics::MetricsLogUploader>
 AwMetricsServiceClientImpl::CreateUploader(
     base::StringPiece server_url,
     base::StringPiece mime_type,
     metrics::MetricsLogUploader::MetricServiceType service_type,
     const base::Callback<void(int)>& on_upload_complete) {
+  // server_url & mime_type are unused because WebView uses the platform logging

[Alexei Svitkine (slow), 2017/03/29 19:19:17]

Nit: Put ||'s around param names you're referring to from the comment.

+  // mechanism instead of the normal UMA server.
   return std::unique_ptr<::metrics::MetricsLogUploader>(
-      new metrics::NetMetricsLogUploader(request_context_, server_url,
-                                         mime_type, service_type,
-                                         on_upload_complete));
+      new AwMetricsLogUploader(on_upload_complete));
 }
 
 base::TimeDelta AwMetricsServiceClientImpl::GetStandardUploadInterval() {
+  // The platform logging mechanism is responsible for upload frequency; this
+  // just specifies how frequently to provide logs to the platform.
   return base::TimeDelta::FromMinutes(kUploadIntervalMinutes);
 }
 
 AwMetricsServiceClientImpl::AwMetricsServiceClientImpl()
     : is_enabled_(false),
       pref_service_(nullptr),
       request_context_(nullptr) {}
 
 AwMetricsServiceClientImpl::~AwMetricsServiceClientImpl() {}
 
 // static
 void SetMetricsEnabled(
     JNIEnv* env,
     const base::android::JavaParamRef<jclass>& jcaller,
     jboolean enabled) {
   g_lazy_instance_.Pointer()->SetMetricsEnabled(enabled);
 }
 
 bool RegisterAwMetricsServiceClient(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview