Update server-backed state key generation.

chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 123 matching lines @@
     LOG(ERROR) << "Initial auto-enrollment modulus is larger than the limit, "
                << "clamping to the limit.";
     power_initial = power_limit;
   }
 
   bool retrieve_device_state = false;
   std::string device_id;
   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();
   }
 
   client_.reset(new policy::AutoEnrollmentClient(
       base::Bind(&AutoEnrollmentController::UpdateState,
                  base::Unretained(this)),
       service,
       g_browser_process->local_state(),
       g_browser_process->system_request_context(),
       device_id,
       retrieve_device_state,
       power_initial,
       power_limit));
 
   VLOG(1) << "Starting auto-enrollment client.";
   client_->Start();
 }
 
 void AutoEnrollmentController::UpdateState(
     policy::AutoEnrollmentState new_state) {
   state_ = new_state;
   progress_callbacks_.Notify(state_);
 }
 
 }  // namespace chromeos