Enrollment recovery: Fix check for presence of machine id.

Ensure that enrollment recovery really only is triggered when the
machine id can be accessed.

BUG=389481

Review URL: https://codereview.chromium.org/386643003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282484 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc

@@ -133,12 +133,7 @@ bool DeviceCloudPolicyInitializer::ShouldRecoverEnrollment() const {
   if (install_attributes_->IsEnterpriseDevice() &&
       chromeos::StartupUtils::IsEnrollmentRecoveryRequired()) {
     LOG(WARNING) << "Enrollment recovery required according to pref.";
-    std::string machine_id;
-    bool machine_id_success =
-        chromeos::system::StatisticsProvider::GetInstance()
-            ->GetMachineStatistic(chromeos::system::kHardwareClassKey,
-                                  &machine_id);
-    if (machine_id_success && machine_id != "")
+    if (!DeviceCloudPolicyManagerChromeOS::GetMachineID().empty())
       return true;
     LOG(WARNING) << "Postponing recovery because machine id is missing.";
   }