Basic UkmService implementation

components/metrics/metrics_service_client.h

Index: components/metrics/metrics_service_client.h
diff --git a/components/metrics/metrics_service_client.h b/components/metrics/metrics_service_client.h
index 6a067afe6b89a79207daf65ca3ea6d5cad013c41..0ef5ff3d038bb1ba51d55646703aad8f9c6fd8a9 100644
--- a/components/metrics/metrics_service_client.h
+++ b/components/metrics/metrics_service_client.h
@@ -20,6 +20,10 @@ namespace base {
 class FilePath;
 }
 
+namespace ukm {
+class UkmService;
+}
+
 namespace metrics {
 
 class MetricsLogUploader;
@@ -37,6 +41,9 @@ class MetricsServiceClient {
   // implementation will own the MetricsService instance being returned).
   virtual MetricsService* GetMetricsService() = 0;
 
+  // Returns the UkmService instance that this client is associated with.
+  virtual ukm::UkmService* GetUkmService() = 0;
+
   // Registers the client id with other services (e.g. crash reporting), called
   // when metrics recording gets enabled.
   virtual void SetMetricsClientId(const std::string& client_id) = 0;
@@ -85,6 +92,8 @@ class MetricsServiceClient {
   // Creates a MetricsLogUploader with the specified parameters (see comments on
   // MetricsLogUploader for details).
   virtual std::unique_ptr<MetricsLogUploader> CreateUploader(
+      const std::string& server_url,
+      const std::string& mime_type,
       const base::Callback<void(int)>& on_upload_complete) = 0;
 
   // Returns the standard interval between upload attempts.