No "Factory error" splashscreen on ChromeOS VMs

chrome/browser/chromeos/login/hwid_checker.cc

 // Copyright (c) 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/chromeos/login/hwid_checker.h"
 
 #include <cstdio>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 115 matching lines @@
     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);
-    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;
 }
 
 } // namespace chromeos