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

Unified Diff: chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc

Issue 212653004: Update server-backed state key generation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix re-enrollment test. Created 6 years, 9 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 | chrome/browser/chromeos/login/wizard_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc
diff --git a/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc b/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc
index 3c273ad0284122fb09b8d37c3ef62b99c3843c0c..1c78f41876b1b92ab353ad757db90b8e4863e5d8 100644
--- a/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc
+++ b/chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc
@@ -141,7 +141,8 @@ void AutoEnrollmentController::OnOwnershipStatusCheckDone(
if (CommandLine::ForCurrentProcess()->HasSwitch(
chromeos::switches::kEnterpriseEnableForcedReEnrollment)) {
retrieve_device_state = true;
- device_id = policy::DeviceCloudPolicyManagerChromeOS::GetDeviceStateKey();
+ device_id =
+ policy::DeviceCloudPolicyManagerChromeOS::GetCurrentDeviceStateKey();
} else {
device_id = policy::DeviceCloudPolicyManagerChromeOS::GetMachineID();
}
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/wizard_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698