Adding ChromeOS firmware version to feedback reports

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

 // Copyright 2013 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/feedback/system_logs/log_sources/chrome_internal_log_source.h"
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/sys_info.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/pref_names.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/prefs/pref_service.h"
 #include "components/sync/driver/about_sync_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 
 #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)
 #include "base/win/win_util.h"
 #endif
 
 namespace system_logs {
 
 namespace {
 
 constexpr char kSyncDataKey[] = "about_sync_data";
 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";
 constexpr char kLocalStateSettingsResponseKey[] = "Local State: settings";
 #else
 constexpr char kOsVersionTag[] = "OS VERSION";
 #endif
 #if defined(OS_WIN)
 constexpr char kUsbKeyboardDetected[] = "usb_keyboard_detected";
 constexpr char kIsEnrolledToDomain[] = "enrolled_to_domain";
 #endif
 
 #if defined(OS_CHROMEOS)
 std::string GetEnrollmentStatusString() {
   switch (ChromeOSMetricsProvider::GetEnrollmentStatus()) {
     case ChromeOSMetricsProvider::NON_MANAGED:
       return "Not managed";
     case ChromeOSMetricsProvider::MANAGED:
       return "Managed";
     case ChromeOSMetricsProvider::UNUSED:
     case ChromeOSMetricsProvider::ERROR_GETTING_ENROLLMENT_STATUS:
     case ChromeOSMetricsProvider::ENROLLMENT_STATUS_MAX:
       return "Error retrieving status";
   }
   // For compilers that don't recognize all cases handled above.
   NOTREACHED();
   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
 
 }  // namespace
 
 ChromeInternalLogSource::ChromeInternalLogSource()
     : SystemLogsSource("ChromeInternal") {
 }
 
 ChromeInternalLogSource::~ChromeInternalLogSource() {
@@ skipping 23 matching lines @@
   PopulateUsbKeyboardDetected(response.get());
   PopulateEnrolledToDomain(response.get());
 #endif
 
   if (ProfileManager::GetLastUsedProfile()->IsChild())
     (*response)["account_type"] = "child";
 
 #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.
   callback.Run(response.get());
 #endif  // defined(OS_CHROMEOS)
 }
 
 void ChromeInternalLogSource::PopulateSyncLogs(SystemLogsResponse* response) {
   // We are only interested in sync logs for the primary user profile.
   Profile* profile = ProfileManager::GetPrimaryUserProfile();
@@ skipping 101 matching lines @@
 
 void ChromeInternalLogSource::PopulateEnrolledToDomain(
     SystemLogsResponse* response) {
   (*response)[kIsEnrolledToDomain] = base::win::IsEnrolledToDomain()
                                          ? "Enrolled to domain"
                                          : "Not enrolled to domain";
 }
 #endif
 
 }  // namespace system_logs