| Index: chrome/browser/metrics/chrome_metrics_service_client.cc
|
| ===================================================================
|
| --- chrome/browser/metrics/chrome_metrics_service_client.cc (revision 272759)
|
| +++ chrome/browser/metrics/chrome_metrics_service_client.cc (working copy)
|
| @@ -25,6 +25,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/histogram_fetcher.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/render_process_host.h"
|
| @@ -143,6 +144,12 @@
|
| network_stats_uploader_.CollectAndReportNetworkStats();
|
| }
|
|
|
| +void ChromeMetricsServiceClient::StartGatheringMetrics(
|
| + const base::Closure& done_callback) {
|
| + // TODO(blundell): Move metrics gathering tasks from MetricsService to here.
|
| + done_callback.Run();
|
| +}
|
| +
|
| void ChromeMetricsServiceClient::CollectFinalMetrics(
|
| const base::Closure& done_callback) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| @@ -173,6 +180,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());
|
|
|
| @@ -298,12 +316,6 @@
|
| }
|
| }
|
|
|
| -void ChromeMetricsServiceClient::StartGatheringMetrics(
|
| - const base::Closure& done_callback) {
|
| - // TODO(blundell): Move metrics gathering tasks from MetricsService to here.
|
| - done_callback.Run();
|
| -}
|
| -
|
| #if defined(OS_WIN)
|
| void ChromeMetricsServiceClient::CountBrowserCrashDumpAttempts() {
|
| // Open the registry key for iteration.
|
|
|