No "Factory error" splashscreen on ChromeOS 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 4509672ba2b3608ff3da44187be03d4264dca5c5..334e52035cc01088080119d129c46a00fca6c716 100644
--- a/chrome/browser/chromeos/login/hwid_checker.cc
+++ b/chrome/browser/chromeos/login/hwid_checker.cc
@@ -133,9 +133,20 @@ bool IsMachineHWIDCorrect() {
     std::string system_vendor;
     stats->GetMachineStatistic(chromeos::system::kSystemVendorKey,
                                &system_vendor);
-    LOG(ERROR) << "Machine has malformed HWID '" << hwid << "'. "
-               << "The system vendor is '" << system_vendor << "'.";
-    return false;
+    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;
+    }
   }
   return true;
 }