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

components/metrics/test_metrics_service_client.h

 // 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.
 
 #ifndef COMPONENTS_METRICS_TEST_METRICS_SERVICE_CLIENT_H_
 #define COMPONENTS_METRICS_TEST_METRICS_SERVICE_CLIENT_H_
 
 #include <stdint.h>
 
 #include <string>
 
 #include "base/macros.h"
+#include "components/metrics/metrics_log_uploader.h"
 #include "components/metrics/metrics_service_client.h"
 #include "components/metrics/test_metrics_log_uploader.h"
 
 namespace metrics {
 
 // A simple concrete implementation of the MetricsServiceClient interface, for
 // use in tests.
 class TestMetricsServiceClient : public MetricsServiceClient {
  public:
   static const char kBrandForTesting[];
 
   TestMetricsServiceClient();
   ~TestMetricsServiceClient() override;
 
   // MetricsServiceClient:
   metrics::MetricsService* GetMetricsService() override;
   void SetMetricsClientId(const std::string& client_id) override;
   int32_t GetProduct() override;
   std::string GetApplicationLocale() override;
   bool GetBrand(std::string* brand_code) override;
   SystemProfileProto::Channel GetChannel() override;
   std::string GetVersionString() override;
   void InitializeSystemProfileMetrics(
       const base::Closure& done_callback) override;
   void CollectFinalMetricsForLog(const base::Closure& done_callback) override;
   std::unique_ptr<MetricsLogUploader> CreateUploader(
       const std::string& server_url,
       const std::string& mime_type,
+      MetricsLogUploader::MetricServiceType service_type,
       const base::Callback<void(int)>& on_upload_complete) override;
   base::TimeDelta GetStandardUploadInterval() override;
   bool IsReportingPolicyManaged() override;
   EnableMetricsDefault GetMetricsReportingDefaultState() override;
 
   const std::string& get_client_id() const { return client_id_; }
   // Returns a weak ref to the last created uploader.
   TestMetricsLogUploader* uploader() { return uploader_; }
   void set_version_string(const std::string& str) { version_string_ = str; }
   void set_product(int32_t product) { product_ = product; }
@@ skipping 13 matching lines @@
 
   // A weak ref to the last created TestMetricsLogUploader.
   TestMetricsLogUploader* uploader_;
 
   DISALLOW_COPY_AND_ASSIGN(TestMetricsServiceClient);
 };
 
 }  // namespace metrics
 
 #endif  // COMPONENTS_METRICS_TEST_METRICS_SERVICE_CLIENT_H_