Use the correct product/version for postmortem reports

components/browser_watcher/watcher_metrics_provider_win.cc

 // Copyright (c) 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 "components/browser_watcher/watcher_metrics_provider_win.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <memory>
 #include <set>
+#include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/feature_list.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/process/process.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "components/browser_watcher/features.h"
-#include "components/browser_watcher/postmortem_report_collector.h"
 #include "components/browser_watcher/stability_debugging_win.h"
 #include "third_party/crashpad/crashpad/client/crash_report_database.h"
 
 namespace browser_watcher {
 
 namespace {
 
 // Process ID APIs on Windows talk in DWORDs, whereas for string formatting
 // and parsing, this code uses int. In practice there are no process IDs with
 // the high bit set on Windows, so there's no danger of overflow if this is
@@ skipping 173 matching lines @@
 
 }  // namespace
 
 const char WatcherMetricsProviderWin::kBrowserExitCodeHistogramName[] =
     "Stability.BrowserExitCodes";
 
 WatcherMetricsProviderWin::WatcherMetricsProviderWin(
     const base::string16& registry_path,
     const base::FilePath& user_data_dir,
     const base::FilePath& crash_dir,
+    std::unique_ptr<PostmortemReportCollector> collector,
     base::TaskRunner* io_task_runner)
     : recording_enabled_(false),
       cleanup_scheduled_(false),
       registry_path_(registry_path),
       user_data_dir_(user_data_dir),
       crash_dir_(crash_dir),
+      collector_(std::move(collector)),
       io_task_runner_(io_task_runner),
       weak_ptr_factory_(this) {
   DCHECK(io_task_runner_);
 }
 
 WatcherMetricsProviderWin::~WatcherMetricsProviderWin() {
 }
 
 void WatcherMetricsProviderWin::OnRecordingEnabled() {
   recording_enabled_ = true;
@@ skipping 34 matching lines @@
 }
 
 void WatcherMetricsProviderWin::CollectPostmortemReportsOnBlockingPool() {
   // Note: the feature controls both instrumentation and collection.
   bool is_stability_debugging_on =
       base::FeatureList::IsEnabled(browser_watcher::kStabilityDebuggingFeature);
   if (!is_stability_debugging_on) {
     // TODO(manzagop): delete possible leftover data.
     return;
   }
+  DCHECK_NE(nullptr, collector_.get());
 
   SCOPED_UMA_HISTOGRAM_TIMER("ActivityTracker.Collect.TotalTime");
 
   if (user_data_dir_.empty() || crash_dir_.empty()) {
     LOG(ERROR) << "User data directory or crash directory is unknown.";
     LogCollectionInitStatus(UNKNOWN_DIR);
     return;
   }
 
   // Determine the stability directory and the stability file for the current
@@ skipping 17 matching lines @@
     LOG(ERROR) << "Failed to initialize a CrashPad database.";
     LogCollectionInitStatus(CRASHPAD_DATABASE_INIT_FAILED);
     return;
   }
 
   // Note: not caching the histogram pointer as this function isn't expected to
   // be called multiple times.
   LogCollectionInitStatus(INIT_SUCCESS);
 
   // TODO(manzagop): fix incorrect version attribution on update.
-  PostmortemReportCollector collector;
-  collector.CollectAndSubmitForUpload(stability_dir, GetStabilityFilePattern(),
-                                      excluded_debug_files,
-                                      crashpad_database.get());
+  collector_->CollectAndSubmitForUpload(
+      stability_dir, GetStabilityFilePattern(), excluded_debug_files,
+      crashpad_database.get());
 }
 
 }  // namespace browser_watcher