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[];
+
 // 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

[Daniel Erat, 2016/08/10 16:32:28]

nit: add trailing period

 CHROMEOS_EXPORT extern const char kSystemVendorKey[];

[achuithb, 2016/08/10 18:24:58]

We should just get rid of kSystemVendorKey. I believe the only application is
figuring out if we're in a VM.

[norvez, 2016/08/11 17:10:34]

Done.

 
 // 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.
 CHROMEOS_EXPORT extern const char kOemIsEnterpriseManagedKey[];
@@ skipping 43 matching lines @@
 
   // Checks whether a machine statistic is present (without logging a warning).
   bool HasMachineStatistic(const std::string& name);
 
   // Similar to GetMachineStatistic for boolean flags.
   virtual bool GetMachineFlag(const std::string& name, bool* result) = 0;
 
   // Cancels any pending file operations.
   virtual void Shutdown() = 0;
 
+  // Returns true if the machine is a VM

[Daniel Erat, 2016/08/10 16:32:28]

nit: add trailing period

[norvez, 2016/08/11 17:10:34]

Done.

+  virtual bool IsRunningOnVm() = 0;
+
   // Get the Singleton instance.
   static StatisticsProvider* GetInstance();
 
   // Set the instance returned by GetInstance() for testing.
   static void SetTestProvider(StatisticsProvider* test_provider);
 
  protected:
   virtual ~StatisticsProvider() {}
 };
 
 }  // namespace system
 }  // namespace chromeos
 
 #endif  // CHROMEOS_SYSTEM_STATISTICS_PROVIDER_H_