WebView: Add channel info for UMA

android_webview/browser/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/browser/aw_metrics_service_client_impl.h"
 
 #include "android_webview/browser/aw_metrics_log_uploader.h"
 #include "android_webview/common/aw_version_info_values.h"
 #include "android_webview/jni/AwMetricsServiceClient_jni.h"
 #include "base/android/build_info.h"
+#include "base/android/jni_string.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/profiler/profiler_metrics_provider.h"
 #include "components/metrics/ui/screen_info_metrics_provider.h"
 #include "components/metrics/url_constants.h"
+#include "components/metrics/version_utils.h"
 #include "components/prefs/pref_service.h"
+#include "components/version_info/channel_android.h"
+#include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace android_webview {
 
 base::LazyInstance<AwMetricsServiceClientImpl>::Leaky g_lazy_instance_;
 
 namespace {
 
 const int kUploadIntervalMinutes = 30;
 
@@ skipping 43 matching lines @@
     PrefService* pref_service,
     net::URLRequestContextGetter* request_context,
     const base::FilePath guid_file_path) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   DCHECK(pref_service_ == nullptr);  // Initialize should only happen once.
   DCHECK(request_context_ == nullptr);
   pref_service_ = pref_service;
   request_context_ = request_context;
 
+  // The channel will always be "unknown" when using stand-alone WebView, since
+  // stand-alone WebView has the same package name across channels.
+  JNIEnv* env = base::android::AttachCurrentThread();
+  std::string package_name = base::android::ConvertJavaStringToUTF8(
+      env, Java_AwMetricsServiceClient_getWebViewPackageName(env));
+  channel_ = version_info::ChannelFromPackageName(package_name.c_str());

[Alexei Svitkine (slow), 2017/05/12 14:26:22]

Nit: This seems like a good candidate for a helper function in the anon
namespace.

[paulmiller, 2017/05/12 19:45:35]

Done.

+
   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(&AwMetricsServiceClientImpl::InitializeWithGUID,
                  base::Unretained(this), base::Owned(guid)));
@@ skipping 80 matching lines @@
 std::string AwMetricsServiceClientImpl::GetApplicationLocale() {
   return base::i18n::GetConfiguredLocale();
 }
 
 bool AwMetricsServiceClientImpl::GetBrand(std::string* brand_code) {
   // WebView doesn't use brand codes.
   return false;
 }
 
 metrics::SystemProfileProto::Channel AwMetricsServiceClientImpl::GetChannel() {
-  // "Channel" means stable, beta, etc. WebView doesn't have channel info yet.
-  // TODO(paulmiller) Update this once we have channel info.
-  return metrics::SystemProfileProto::CHANNEL_UNKNOWN;
+  return metrics::AsProtobufChannel(channel_);
 }
 
 std::string AwMetricsServiceClientImpl::GetVersionString() {
   return PRODUCT_VERSION;
 }
 
 void AwMetricsServiceClientImpl::InitializeSystemProfileMetrics(
     const base::Closure& done_callback) {
   done_callback.Run();
 }
@@ skipping 15 matching lines @@
       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) {}
+    : is_enabled_(false),
+      pref_service_(nullptr),
+      request_context_(nullptr),
+      channel_(version_info::Channel::UNKNOWN) {}
 
 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