Revert of Minor cleanup of EnrollmentHandlerChromeOS.

chrome/browser/chromeos/policy/enrollment_handler_chromeos.h

Index: chrome/browser/chromeos/policy/enrollment_handler_chromeos.h
diff --git a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h
index 71bd5fae5f181d5ad23963c75f8f071347c03e1f..275aa2b27bcdbd56e36b18e36d1cd2ac7ae6c04e 100644
--- a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h
+++ b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h
@@ -121,34 +121,35 @@
   };
 
   // Handles the response to a request for server-backed state keys.
-  void HandleStateKeysResult(const std::vector<std::string>& state_keys,
-                             bool first_boot);
+  void CheckStateKeys(const std::vector<std::string>& state_keys,
+                      bool first_boot);
 
   // Starts registration if the store is initialized.
-  void StartRegistration();
-
-  // Handles the policy validation result, proceeding with device lock if
-  // successful.
-  void HandlePolicyValidationResult(DeviceCloudPolicyValidator* validator);
-
-  // Calls InstallAttributes::LockDevice() for enterprise enrollment and
-  // DeviceSettingsService::SetManagementSettings() for consumer
-  // enrollment.
+  void AttemptRegistration();
+
+  // Handles the policy validation result, proceeding with installation-time
+  // attributes locking if successful.
+  void PolicyValidated(DeviceCloudPolicyValidator* validator);
+
+  // Calls LockDevice() and proceeds to policy installation. If unsuccessful,
+  // reports the result. Actual installation or error report will be done in
+  // HandleLockDeviceResult().
   void StartLockDevice();
 
   // Checks the status after SetManagementSettings() is done. Proceeds to
   // robot auth code storing if successful.
-  void HandleSetManagementSettingsDone();
-
-  // Handle callback from InstallAttributes::LockDevice() and retry on failure.
+  void OnSetManagementSettingsDone();
+
+  // Helper for StartLockDevice(). It performs the actual action based on
+  // the result of LockDevice.
   void HandleLockDeviceResult(
       EnterpriseInstallAttributes::LockResult lock_result);
 
-  // Initiates storing of robot auth token.
-  void StartStoreRobotAuth();
+  // Stores robot auth token.
+  void StoreRobotAuth();
 
   // Handles completion of the robot token store operation.
-  void HandleStoreRobotAuthTokenResult(bool result);
+  void HandleRobotAuthTokenStored(bool result);
 
   // Drops any ongoing actions.
   void Stop();