Clean up handling of invalid HWID when running ChromeOS in VMs

chromeos/system/statistics_provider.h

 // 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.
 
 #ifndef CHROMEOS_SYSTEM_STATISTICS_PROVIDER_H_
 #define CHROMEOS_SYSTEM_STATISTICS_PROVIDER_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 26 matching lines @@
 // machine doesn't run on Chrome OS firmware. See crossystem source for more
 // details.
 CHROMEOS_EXPORT extern const char kFirmwareTypeKey[];
 CHROMEOS_EXPORT extern const char kFirmwareTypeValueDeveloper[];
 CHROMEOS_EXPORT extern const char kFirmwareTypeValueNonchrome[];
 CHROMEOS_EXPORT extern const char kFirmwareTypeValueNormal[];
 
 // HWID key.
 CHROMEOS_EXPORT extern const char kHardwareClassKey[];
 
+// Key/values reporting if Chrome OS is running in a VM or not. These values are
+// read from crossystem output. See crossystem source for VM detection logic.
+CHROMEOS_EXPORT extern const char kIsCrosVMKey[];
+CHROMEOS_EXPORT extern const char kIsCrosVMValueTrue[];
+CHROMEOS_EXPORT extern const char kIsCrosVMValueFalse[];

[Daniel Erat, 2016/08/10 13:58:05]

nit: change "VM" to "Vm" in all of these
(https://google.github.io/styleguide/cppguide.html#Function_Names; these aren't
functions but people have told me the same rule applies to constants in
chromium)

+
 // System vendor key.
-// The value is used to check if Chrome is running on a VM or a real Chrome OS
-// device. On QEMU VMs this value is QEMU.
+// Empty on non-x86 architectures, most meaningful in VM environments
 CHROMEOS_EXPORT extern const char kSystemVendorKey[];
 
 // OEM customization flag that permits exiting enterprise enrollment flow in
 // OOBE when 'oem_enterprise_managed' flag is set.
 CHROMEOS_EXPORT extern const char kOemCanExitEnterpriseEnrollmentKey[];
 
 // OEM customization directive that specified intended device purpose.
 CHROMEOS_EXPORT extern const char kOemDeviceRequisitionKey[];
 
 // OEM customization flag that enforces enterprise enrollment flow in OOBE.
@@ skipping 16 matching lines @@
 CHROMEOS_EXPORT extern const char kWriteProtectSwitchBootKey[];
 CHROMEOS_EXPORT extern const char kWriteProtectSwitchBootValueOff[];
 CHROMEOS_EXPORT extern const char kWriteProtectSwitchBootValueOn[];
 
 // Regional data
 CHROMEOS_EXPORT extern const char kRegionKey[];
 CHROMEOS_EXPORT extern const char kInitialLocaleKey[];
 CHROMEOS_EXPORT extern const char kInitialTimezoneKey[];
 CHROMEOS_EXPORT extern const char kKeyboardLayoutKey[];
 
+// Returns true when Chrome OS is running in a VM. NOTE: if crossystem is not
+// installed it will return false even if Chrome OS is running in a VM.
+CHROMEOS_EXPORT bool isRunningOnChromeOSVM();

[Daniel Erat, 2016/08/10 13:58:05]

s/is/Is/ (see naming conventions in style guide)

also get rid of "ChromeOS" in the name and just call it "IsRunningOnVm".

please also make this be a non-static method on StatisticsProvider.

+
 // This interface provides access to Chrome OS statistics.
 class CHROMEOS_EXPORT StatisticsProvider {
  public:
   // Starts loading the machine statistics. File operations are performed on
   // |file_task_runner|.
   virtual void StartLoadingMachineStatistics(
       const scoped_refptr<base::TaskRunner>& file_task_runner,
       bool load_oem_manifest) = 0;
 
   // Returns true if the named machine statistic (e.g. "hardware_class") is
@@ skipping 22 matching lines @@
   static void SetTestProvider(StatisticsProvider* test_provider);
 
  protected:
   virtual ~StatisticsProvider() {}
 };
 
 }  // namespace system
 }  // namespace chromeos
 
 #endif  // CHROMEOS_SYSTEM_STATISTICS_PROVIDER_H_