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

components/metrics/net/net_metrics_log_uploader.cc

Index: components/metrics/net/net_metrics_log_uploader.cc
diff --git a/components/metrics/net/net_metrics_log_uploader.cc b/components/metrics/net/net_metrics_log_uploader.cc
index 5b2c95e5c141f27f57bfe1c4799ec1bc7f5c24a9..9bba8abd231ea3e6fc15aca1cd7ac7269176b7c4 100644
--- a/components/metrics/net/net_metrics_log_uploader.cc
+++ b/components/metrics/net/net_metrics_log_uploader.cc
@@ -6,6 +6,7 @@
 
 #include "base/metrics/histogram_macros.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
+#include "components/metrics/metrics_log_uploader.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "url/gurl.h"
@@ -16,10 +17,13 @@ NetMetricsLogUploader::NetMetricsLogUploader(
     net::URLRequestContextGetter* request_context_getter,
     const std::string& server_url,
     const std::string& mime_type,
+    MetricsLogUploader::MetricServiceType service_type,
     const base::Callback<void(int)>& on_upload_complete)
-    : MetricsLogUploader(server_url, mime_type, on_upload_complete),
-      request_context_getter_(request_context_getter) {
-}
+    : MetricsLogUploader(server_url,
+                         mime_type,
+                         service_type,
+                         on_upload_complete),
+      request_context_getter_(request_context_getter) {}
 
 NetMetricsLogUploader::~NetMetricsLogUploader() {
 }
@@ -28,8 +32,14 @@ void NetMetricsLogUploader::UploadLog(const std::string& compressed_log_data,
                                       const std::string& log_hash) {
   current_fetch_ =
       net::URLFetcher::Create(GURL(server_url_), net::URLFetcher::POST, this);
-  data_use_measurement::DataUseUserData::AttachToFetcher(
-      current_fetch_.get(), data_use_measurement::DataUseUserData::UMA);
+
+  // Default to UMA service.
+  auto service = data_use_measurement::DataUseUserData::UMA;
+  if (service_type_ == MetricsLogUploader::UKM)

[Alexei Svitkine (slow), 2017/02/22 15:46:10]

Can you do a switch instead?

Switch guarantees if a new enum is added, there will be an error if the switch
wasn't updated due to compiler options Chromium build uses.

[rkaplow, 2017/02/22 16:11:35]

Done.

+    service = data_use_measurement::DataUseUserData::UKM;
+
+  data_use_measurement::DataUseUserData::AttachToFetcher(current_fetch_.get(),
+                                                         service);
   current_fetch_->SetRequestContext(request_context_getter_);
   current_fetch_->SetUploadData(mime_type_, compressed_log_data);