Clean up handling of invalid HWID when running ChromeOS in VMs

chrome/browser/chromeos/login/hwid_checker.cc

Index: chrome/browser/chromeos/login/hwid_checker.cc
diff --git a/chrome/browser/chromeos/login/hwid_checker.cc b/chrome/browser/chromeos/login/hwid_checker.cc
index 334e52035cc01088080119d129c46a00fca6c716..209f35b600d2c09aa12a9e14d9e1206ae1b35f00 100644
--- a/chrome/browser/chromeos/login/hwid_checker.cc
+++ b/chrome/browser/chromeos/login/hwid_checker.cc
@@ -126,27 +126,9 @@ bool IsMachineHWIDCorrect() {
     LOG(ERROR) << "Couldn't get machine statistic 'hardware_class'.";
     return false;
   }
-  if (!chromeos::IsHWIDCorrect(hwid)) {
-    // Log the system vendor info to see what the system vendor is on the GCE
-    // VMs. This info will be used to filter out error messages on VMs. See
-    // http://crbug.com/585514 and http://crbug.com/585515 for more info.
-    std::string system_vendor;
-    stats->GetMachineStatistic(chromeos::system::kSystemVendorKey,
-                               &system_vendor);
-    std::string firmware_type;
-    const bool non_chrome_firmware =
-        stats->GetMachineStatistic(chromeos::system::kFirmwareTypeKey,
-                                   &firmware_type) &&
-        firmware_type == system::kFirmwareTypeValueNonchrome;
-    if (non_chrome_firmware) {
-      LOG(WARNING) << "Detected non-Chrome firmware with malformed HWID '"
-                   << hwid << "', assuming VM environment. "
-                   << "The system vendor is '" << system_vendor << "'.";
-    } else {
-      LOG(ERROR) << "Machine has malformed HWID '" << hwid << "'. "
-                 << "The system vendor is '" << system_vendor << "'.";
-      return false;
-    }
+  if (!(chromeos::IsHWIDCorrect(hwid) || stats->IsRunningOnVm())) {

[achuithb, 2016/08/11 18:40:15]

I wonder if it's clearer to explicitly do something like
if (stats->IsRunningOnVm())
  return true;

after line 123, similiar to our treatment of IsRunningOnChromeOS on line 119.

[norvez, 2016/08/12 10:18:29]

Done.

+    LOG(ERROR) << "Machine has malformed HWID '" << hwid << "'. ";
+    return false;
   }
   return true;
 }