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

components/metrics/metrics_service.cc

 // Copyright 2014 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.
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
 //
 // A MetricsService instance is typically created at application startup.  It is
@@ skipping 982 matching lines @@
 void MetricsService::SendStagedLog() {
   DCHECK(log_store_.has_staged_log());
   if (!log_store_.has_staged_log())
     return;
 
   DCHECK(!log_upload_in_progress_);
   log_upload_in_progress_ = true;
 
   if (!log_uploader_) {
     log_uploader_ = client_->CreateUploader(
-        client_->GetMetricsServerUrl(),
-        metrics::kDefaultMetricsMimeType,
+        client_->GetMetricsServerUrl(), metrics::kDefaultMetricsMimeType,
+        metrics::MetricsLogUploader::UMA,
         base::Bind(&MetricsService::OnLogUploadComplete,
                    self_ptr_factory_.GetWeakPtr()));
   }
   const std::string hash = base::HexEncode(log_store_.staged_log_hash().data(),
                                            log_store_.staged_log_hash().size());
   log_uploader_->UploadLog(log_store_.staged_log(), hash);
 
   if (!upload_scheduler_)
     HandleIdleSinceLastTransmission(true);
 }
@@ skipping 195 matching lines @@
   // Redundant setting to assure that we always reset this value at shutdown
   // (and that we don't use some alternate path, and not call LogCleanShutdown).
   clean_shutdown_status_ = CLEANLY_SHUTDOWN;
   client_->OnLogCleanShutdown();
   clean_exit_beacon_.WriteBeaconValue(true);
   SetExecutionPhase(ExecutionPhase::SHUTDOWN_COMPLETE, local_state_);
   StabilityMetricsProvider(local_state_).MarkSessionEndCompleted(end_completed);
 }
 
 }  // namespace metrics