Adding ChromeOS firmware version to feedback reports

chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc

Index: chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
diff --git a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
index b90fba39620abfbc490ee6409e363451203954bc..937bb8d3808e5cd3758ac6a5450039b1f5cb3436 100644
--- a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
+++ b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
@@ -23,6 +23,7 @@
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
 #include "chromeos/system/statistics_provider.h"
+#include "chromeos/system/version_loader.h"
 #endif
 
 #if defined(OS_WIN)
@@ -38,6 +39,7 @@ constexpr char kExtensionsListKey[] = "extensions";
 constexpr char kDataReductionProxyKey[] = "data_reduction_proxy";
 constexpr char kChromeVersionTag[] = "CHROME VERSION";
 #if defined(OS_CHROMEOS)
+constexpr char kChromeOsFirmwareVersion[] = "CHROMEOS_FIRMWARE_VERSION";
 constexpr char kChromeEnrollmentTag[] = "ENTERPRISE_ENROLLED";
 constexpr char kHWIDKey[] = "HWID";
 constexpr char kSettingsKey[] = "settings";
@@ -67,20 +69,23 @@ std::string GetEnrollmentStatusString() {
   return std::string();
 }
 
-void GetHWID(SystemLogsResponse* response) {
+void GetBackgroundEntries(SystemLogsResponse* response) {

[xiyuan, 2017/01/05 17:46:17]

nit: If "background" here does not have special meanings other than running the
job on a background thread, suggest to 

  GetBackgroundEntries -> GetEntriesOnBlockingPool

to follow existing name convention and easier to read.

[afakhry, 2017/01/05 17:57:15]

Good suggestion. Thanks! Done.

   DCHECK(response);
 
   chromeos::system::StatisticsProvider* stats =
       chromeos::system::StatisticsProvider::GetInstance();
   DCHECK(stats);
 
+  // Get the HWID.
   std::string hwid;
-  if (!stats->GetMachineStatistic(chromeos::system::kHardwareClassKey, &hwid)) {
+  if (!stats->GetMachineStatistic(chromeos::system::kHardwareClassKey, &hwid))
     VLOG(1) << "Couldn't get machine statistic 'hardware_class'.";
-    return;
-  }
+  else
+    (*response)[kHWIDKey] = hwid;
 
-  (*response)[kHWIDKey] = hwid;
+  // Get the firmware version.
+  (*response)[kChromeOsFirmwareVersion] =
+      chromeos::version_loader::GetFirmware();
 }
 #endif
 
@@ -124,10 +129,11 @@ void ChromeInternalLogSource::Fetch(const SysLogsSourceCallback& callback) {
 #if defined(OS_CHROMEOS)
   PopulateLocalStateSettings(response.get());
 
-  // Get the HWID on the blocking pool and invoke the callback later when done.
+  // Get the entries that should be retrieved on the blocking pool and invoke
+  // the callback later when done.
   SystemLogsResponse* response_ptr = response.release();
   content::BrowserThread::PostBlockingPoolTaskAndReply(
-      FROM_HERE, base::Bind(&GetHWID, response_ptr),
+      FROM_HERE, base::Bind(&GetBackgroundEntries, response_ptr),
       base::Bind(callback, base::Owned(response_ptr)));
 #else
   // On other platforms, we're done. Invoke the callback.