Make MetricsService upload logs through an interface.

chrome/browser/metrics/chrome_metrics_service_client.cc

Index: chrome/browser/metrics/chrome_metrics_service_client.cc
===================================================================
--- chrome/browser/metrics/chrome_metrics_service_client.cc	(revision 274045)
+++ chrome/browser/metrics/chrome_metrics_service_client.cc	(working copy)
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
 
+#include <vector>
+
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ -26,6 +28,7 @@
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/crash_keys.h"
 #include "chrome/common/render_messages.h"
+#include "components/metrics/net/net_metrics_log_uploader.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/histogram_fetcher.h"
 #include "content/public/browser/notification_service.h"
@@ -182,6 +185,17 @@
   network_stats_uploader_.CollectAndReportNetworkStats();
 }
 
+void ChromeMetricsServiceClient::StartGatheringMetrics(
+    const base::Closure& done_callback) {
+// TODO(blundell): Move all metrics gathering tasks from MetricsService to
+// here.
+#if defined(OS_CHROMEOS)
+  chromeos_metrics_provider_->InitTaskGetHardwareClass(done_callback);
+#else
+  done_callback.Run();
+#endif
+}
+
 void ChromeMetricsServiceClient::CollectFinalMetrics(
     const base::Closure& done_callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ -212,6 +226,17 @@
   }
 }
 
+scoped_ptr<metrics::MetricsLogUploader>
+ChromeMetricsServiceClient::CreateUploader(
+    const std::string& server_url,
+    const std::string& mime_type,
+    const base::Callback<void(int)>& on_upload_complete) {
+  return scoped_ptr<metrics::MetricsLogUploader>(
+      new metrics::NetMetricsLogUploader(
+          g_browser_process->system_request_context(), server_url, mime_type,
+          on_upload_complete));
+}
+
 void ChromeMetricsServiceClient::OnMemoryDetailCollectionDone() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
@@ -335,17 +360,6 @@
   }
 }
 
-void ChromeMetricsServiceClient::StartGatheringMetrics(
-    const base::Closure& done_callback) {
-// TODO(blundell): Move all metrics gathering tasks from MetricsService to
-// here.
-#if defined(OS_CHROMEOS)
-  chromeos_metrics_provider_->InitTaskGetHardwareClass(done_callback);
-#else
-  done_callback.Run();
-#endif
-}
-
 #if defined(OS_WIN)
 void ChromeMetricsServiceClient::CountBrowserCrashDumpAttempts() {
   // Open the registry key for iteration.