Switch UKM service to properly mark upload data as UKM and not UMA.

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 "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"
 
@@ skipping 170 matching lines @@
 
 void AwMetricsServiceClientImpl::CollectFinalMetricsForLog(
     const base::Closure& done_callback) {
   done_callback.Run();
 }
 
 std::unique_ptr<metrics::MetricsLogUploader>
 AwMetricsServiceClientImpl::CreateUploader(
     const std::string& server_url,
     const std::string& mime_type,
+    metrics::MetricsLogUploader::MetricServiceType service_type,
     const base::Callback<void(int)>& on_upload_complete) {
   return std::unique_ptr<::metrics::MetricsLogUploader>(
-      new metrics::NetMetricsLogUploader(
-          request_context_, server_url, mime_type, on_upload_complete));
+      new metrics::NetMetricsLogUploader(request_context_, server_url,
+                                         mime_type, service_type,
+                                         on_upload_complete));
 }
 
 base::TimeDelta AwMetricsServiceClientImpl::GetStandardUploadInterval() {
   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