Use the correct product/version for postmortem reports

components/browser_watcher/postmortem_report_collector.cc

 // Copyright 2016 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/postmortem_report_collector.h"
 
 #include <utility>
 
+#include "base/callback.h"
 #include "base/debug/activity_analyzer.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/path_service.h"
+#include "base/strings/utf_string_conversions.h"
 #include "components/browser_watcher/postmortem_minidump_writer.h"
-#include "components/version_info/version_info.h"
 #include "third_party/crashpad/crashpad/client/settings.h"
 #include "third_party/crashpad/crashpad/util/misc/uuid.h"
 
 using base::FilePath;
 
 namespace browser_watcher {
 
 using base::debug::GlobalActivityAnalyzer;
 using base::debug::ThreadActivityAnalyzer;
 using crashpad::CrashReportDatabase;
 
+PostmortemReportCollector::PostmortemReportCollector(
+    const GetExecutableDetailsCallback& exe_details_cb) {
+  DCHECK(!exe_details_cb.is_null());
+
+  base::string16 product_name, version_number, channel_name;
+  exe_details_cb.Run(&product_name, &version_number, &channel_name);
+
+  product_name_ = base::UTF16ToUTF8(product_name);
+  version_number_ = base::UTF16ToUTF8(version_number);
+  channel_name_ = base::UTF16ToUTF8(channel_name);
+}
+
 int PostmortemReportCollector::CollectAndSubmitForUpload(
     const base::FilePath& debug_info_dir,
     const base::FilePath::StringType& debug_file_pattern,
     const std::set<base::FilePath>& excluded_debug_files,
     crashpad::CrashReportDatabase* report_database) {
   DCHECK_NE(true, debug_info_dir.empty());
   DCHECK_NE(true, debug_file_pattern.empty());
   DCHECK_NE(nullptr, report_database);
 
   // Collect the list of files to harvest.
@@ skipping 145 matching lines @@
 }
 
 bool PostmortemReportCollector::WriteReportToMinidump(
     const StabilityReport& report,
     const crashpad::UUID& client_id,
     const crashpad::UUID& report_id,
     base::PlatformFile minidump_file) {
   MinidumpInfo minidump_info;
   minidump_info.client_id = client_id;
   minidump_info.report_id = report_id;
-  minidump_info.product_name = version_info::GetProductName();
-  minidump_info.version_number = version_info::GetVersionNumber();
+  // TODO(manzagop): replace this information, i.e. the reporter's attributes,
+  // by that of the reportee. Doing so requires adding this information to the
+  // stability report. In the meantime, there is a tolerable information
+  // mismatch after upgrades.
+  minidump_info.product_name = product_name();
+  minidump_info.version_number = version_number();
+  minidump_info.channel_name = channel_name();
+#if defined(ARCH_CPU_X86)
+  minidump_info.platform = std::string("Win32");
+#elif defined(ARCH_CPU_X86_64)
+  minidump_info.platform = std::string("Win64");
+#endif
 
   return WritePostmortemDump(minidump_file, report, minidump_info);
 }
 
 }  // namespace browser_watcher