Make MetricsService upload logs through an interface.

chrome/browser/metrics/chrome_metrics_service_client.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.
 
 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
 
+#include <vector>
+
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/memory_details.h"
 #include "chrome/browser/metrics/extensions_metrics_provider.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/ui/browser_otr_state.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #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"
 #include "content/public/browser/render_process_host.h"
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/service_process/service_process_control.h"
 #endif
 
 #if defined(OS_CHROMEOS)
@@ skipping 136 matching lines @@
   if (!version_info.IsOfficialBuild())
     version.append("-devel");
   return version;
 }
 
 void ChromeMetricsServiceClient::OnLogUploadComplete() {
   // Collect network stats after each UMA upload.
   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());
 
   collect_final_metrics_done_callback_ = done_callback;
 
   // Begin the multi-step process of collecting memory usage histograms:
   // First spawn a task to collect the memory details; when that task is
   // finished, it will call OnMemoryDetailCollectionDone. That will in turn
   // call HistogramSynchronization to collect histograms from all renderers and
@@ skipping 10 matching lines @@
   details->StartFetch(MemoryDetails::UPDATE_USER_METRICS);
 
   // Collect WebCore cache information to put into a histogram.
   for (content::RenderProcessHost::iterator i(
           content::RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance()) {
     i.GetCurrentValue()->Send(new ChromeViewMsg_GetCacheResourceStats());
   }
 }
 
+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());
 
   // This function should only be called as the callback from an ansynchronous
   // step.
   DCHECK(waiting_for_collect_final_metrics_step_);
 
   // Create a callback_task for OnHistogramSynchronizationDone.
   base::Closure callback = base::Bind(
       &ChromeMetricsServiceClient::OnHistogramSynchronizationDone,
@@ skipping 103 matching lines @@
     case content::NOTIFICATION_RENDERER_PROCESS_CLOSED:
     case content::NOTIFICATION_RENDER_WIDGET_HOST_HANG:
       metrics_service_->OnApplicationNotIdle();
       break;
 
     default:
       NOTREACHED();
   }
 }
 
-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.
   base::win::RegKey regkey;
   if (regkey.Open(HKEY_CURRENT_USER,
                   chrome::kBrowserCrashDumpAttemptsRegistryPath,
                   KEY_ALL_ACCESS) != ERROR_SUCCESS) {
     return;
   }
 
@@ skipping 31 matching lines @@
   // Capture the histogram samples.
   if (dumps_with_crash != 0)
     UMA_HISTOGRAM_COUNTS("Chrome.BrowserDumpsWithCrash", dumps_with_crash);
   if (dumps_with_no_crash != 0)
     UMA_HISTOGRAM_COUNTS("Chrome.BrowserDumpsWithNoCrash", dumps_with_no_crash);
   int total_dumps = dumps_with_crash + dumps_with_no_crash;
   if (total_dumps != 0)
     UMA_HISTOGRAM_COUNTS("Chrome.BrowserCrashDumpAttempts", total_dumps);
 }
 #endif  // defined(OS_WIN)