Revert of Minor cleanup of EnrollmentHandlerChromeOS.

chrome/browser/chromeos/policy/enrollment_handler_chromeos.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_HANDLER_CHROMEOS_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_HANDLER_CHROMEOS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 103 matching lines @@
     STEP_ROBOT_AUTH_FETCH,    // Fetching device API auth code.
     STEP_ROBOT_AUTH_REFRESH,  // Fetching device API refresh token.
     STEP_LOCK_DEVICE,         // Writing installation-time attributes.
     STEP_STORE_TOKEN_AND_ID,  // Storing DM token and virtual device ID.
     STEP_STORE_ROBOT_AUTH,    // Encrypting & writing robot refresh token.
     STEP_STORE_POLICY,        // Storing policy and API refresh token.
     STEP_FINISHED,            // Enrollment process finished, no further action.
   };
 
   // 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();
+  void AttemptRegistration();
 
-  // Handles the policy validation result, proceeding with device lock if
-  // successful.
-  void HandlePolicyValidationResult(DeviceCloudPolicyValidator* validator);
+  // Handles the policy validation result, proceeding with installation-time
+  // attributes locking if successful.
+  void PolicyValidated(DeviceCloudPolicyValidator* validator);
 
-  // Calls InstallAttributes::LockDevice() for enterprise enrollment and
-  // DeviceSettingsService::SetManagementSettings() for consumer
-  // enrollment.
+  // 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();
+  void OnSetManagementSettingsDone();
 
-  // Handle callback from InstallAttributes::LockDevice() and retry on failure.
+  // 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();
 
   // Reports the result of the enrollment process to the initiator.
   void ReportResult(EnrollmentStatus status);
 
   DeviceCloudPolicyStoreChromeOS* store_;
   EnterpriseInstallAttributes* install_attributes_;
   ServerBackedStateKeysBroker* state_keys_broker_;
@@ skipping 29 matching lines @@
   int lockbox_init_duration_;
 
   base::WeakPtrFactory<EnrollmentHandlerChromeOS> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EnrollmentHandlerChromeOS);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_ENROLLMENT_HANDLER_CHROMEOS_H_