Clean up handling of invalid HWID when running ChromeOS in 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 109 matching lines @@
     return true;
   chromeos::system::StatisticsProvider* stats =
       chromeos::system::StatisticsProvider::GetInstance();
 
   std::string hwid;
   if (!stats->GetMachineStatistic(chromeos::system::kHardwareClassKey, &hwid)) {
     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 {
+    if (!chromeos::system::isRunningOnChromeOSVM()) {

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

s/is/Is/ (see style guide)

       LOG(ERROR) << "Machine has malformed HWID '" << hwid << "'. "
                  << "The system vendor is '" << system_vendor << "'.";
       return false;
+    } else {
+      LOG(WARNING) << "The system is a VM. The system vendor is '"
+                << system_vendor << "'.";
     }
   }
   return true;
 }
 
 } // namespace chromeos