Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(74)

Unified Diff: chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc

Issue 386643003: Enrollment recovery: Fix check for presence of machine id. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
index 7e61b992ad3923249877c91fd4b4344a1fb8fb05..2839ad1e63cbf4110c72c594422b65ed2cdd294c 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
+++ b/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.";
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698