Wire in postmortem report collection

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 <stddef.h>
 
 #include <vector>
 
@@ skipping 231 matching lines @@
       chromeos_metrics_provider_(nullptr),
 #endif
       waiting_for_collect_final_metrics_step_(false),
       num_async_histogram_fetches_in_progress_(0),
       profiler_metrics_provider_(nullptr),
 #if defined(ENABLE_PLUGINS)
       plugin_metrics_provider_(nullptr),
 #endif
 #if defined(OS_WIN)
       google_update_metrics_provider_(nullptr),
+      watcher_metrics_provider_(nullptr),
+      antivirus_metrics_provider_(nullptr),
 #endif
       drive_metrics_provider_(nullptr),
       start_time_(base::TimeTicks::Now()),
       has_uploaded_profiler_data_(false),
       weak_ptr_factory_(this) {
   DCHECK(thread_checker_.CalledOnValidThread());
   RecordCommandLineMetrics();
   RegisterForNotifications();
 }
 
@@ skipping 229 matching lines @@
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(new PageLoadMetricsProvider()));
 #endif  // BUILDFLAG(ANDROID_JAVA_UI)
 
 #if defined(OS_WIN)
   google_update_metrics_provider_ = new GoogleUpdateMetricsProviderWin;
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(
           google_update_metrics_provider_));
 
+  base::FilePath user_data_dir;
+  base::FilePath crash_dir;
+  if (!base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir) ||
+      !base::PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dir)) {
+    // If either call fails, then clear both.
+    user_data_dir = base::FilePath();
+    crash_dir = base::FilePath();
+  }
+  watcher_metrics_provider_ = new browser_watcher::WatcherMetricsProviderWin(
+      chrome::GetBrowserExitCodesRegistryPath(), user_data_dir, crash_dir,
+      content::BrowserThread::GetBlockingPool());
   metrics_service_->RegisterMetricsProvider(
-      std::unique_ptr<metrics::MetricsProvider>(
-          new browser_watcher::WatcherMetricsProviderWin(
-              chrome::GetBrowserExitCodesRegistryPath(),
-              content::BrowserThread::GetBlockingPool())));
+      std::unique_ptr<metrics::MetricsProvider>(watcher_metrics_provider_));
 
   antivirus_metrics_provider_ = new AntiVirusMetricsProvider(
       content::BrowserThread::GetBlockingPool()
           ->GetTaskRunnerWithShutdownBehavior(
               base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN));
 
   metrics_service_->RegisterMetricsProvider(
       std::unique_ptr<metrics::MetricsProvider>(antivirus_metrics_provider_));
 #endif  // defined(OS_WIN)
 
@@ skipping 97 matching lines @@
 #endif  // defined(OS_WIN)
 }
 
 void ChromeMetricsServiceClient::OnInitTaskGotAntiVirusData() {
   drive_metrics_provider_->GetDriveMetrics(
       base::Bind(&ChromeMetricsServiceClient::OnInitTaskGotDriveMetrics,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void ChromeMetricsServiceClient::OnInitTaskGotDriveMetrics() {
+  const base::Closure on_collected_callback = base::Bind(
+      &ChromeMetricsServiceClient::OnInitTaskCollectedPostmortemReports,

[Sigurður Ásgeirsson, 2016/09/22 13:06:11]

ubernit: it's pretty wasteful to create a Closure, and then dispatch through it
for !OS_WIN. We don't need cut #1001 :(.

[manzagop (departed), 2016/09/22 15:41:57]

Done.

+      weak_ptr_factory_.GetWeakPtr());
+
+#if defined(OS_WIN)
+  watcher_metrics_provider_->CollectPostmortemReports(on_collected_callback);
+#else
+  on_collected_callback.Run();
+#endif  // defined(OS_WIN)
+}
+
+void ChromeMetricsServiceClient::OnInitTaskCollectedPostmortemReports() {
   finished_init_task_callback_.Run();
 }
 
 bool ChromeMetricsServiceClient::ShouldIncludeProfilerDataInLog() {
   // Upload profiler data at most once per session.
   if (has_uploaded_profiler_data_)
     return false;
 
   // For each log, flip a fair coin. Thus, profiler data is sent with the first
   // log with probability 50%, with the second log with probability 25%, and so
@@ skipping 181 matching lines @@
   }
 }
 
 void ChromeMetricsServiceClient::OnURLOpenedFromOmnibox(OmniboxLog* log) {
   metrics_service_->OnApplicationNotIdle();
 }
 
 bool ChromeMetricsServiceClient::IsUMACellularUploadLogicEnabled() {
   return metrics::IsCellularLogicEnabled();
 }