If there is a device id use that instead of a new one for re-enrolling.

chrome/browser/policy/cloud_policy_data_store.cc

 // 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.
 
 #include "chrome/browser/policy/cloud_policy_data_store.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
 
@@ skipping 15 matching lines @@
                                   dm_protocol::kChromeDevicePolicyType);
 }
 
 CloudPolicyDataStore::CloudPolicyDataStore(
     const em::DeviceRegisterRequest_Type policy_register_type,
     const std::string& policy_type)
     : user_affiliation_(USER_AFFILIATION_NONE),
       policy_register_type_(policy_register_type),
       policy_type_(policy_type),
       known_machine_id_(false),
+      reregister_(false),
       token_cache_loaded_(false),
       policy_fetching_enabled_(true),
       device_mode_(DEVICE_MODE_PENDING) {}
 
 void CloudPolicyDataStore::SetDeviceToken(const std::string& device_token,
                                           bool from_cache) {
   DCHECK(token_cache_loaded_ != from_cache);
   if (!token_cache_loaded_) {
     // The cache should be the first to set the token (it may be empty).
     DCHECK(from_cache);
@@ skipping 69 matching lines @@
 
 void CloudPolicyDataStore::set_policy_fetching_enabled(
     bool policy_fetching_enabled) {
   policy_fetching_enabled_ = policy_fetching_enabled;
 }
 
 void CloudPolicyDataStore::set_device_mode(DeviceMode device_mode) {
   device_mode_ = device_mode;
 }
 
+void CloudPolicyDataStore::set_reregister(bool reregister) {
+  reregister_ = reregister;
+}
+
 const std::string& CloudPolicyDataStore::device_token() const {
   return device_token_;
 }
 
 const std::string& CloudPolicyDataStore::gaia_token() const {
   return gaia_token_;
 }
 
 const std::string& CloudPolicyDataStore::oauth_token() const {
   return oauth_token_;
@@ skipping 37 matching lines @@
 }
 
 bool CloudPolicyDataStore::known_machine_id() const {
   return known_machine_id_;
 }
 
 DeviceMode CloudPolicyDataStore::device_mode() const {
   return device_mode_;
 }
 
+bool CloudPolicyDataStore::reregister() const {
+  return reregister_;
+}
+
 #if defined(OS_CHROMEOS)
 DeviceStatusCollector*
     CloudPolicyDataStore::device_status_collector() {
   return device_status_collector_.get();
 }
 
 void CloudPolicyDataStore::set_device_status_collector(
     DeviceStatusCollector* collector) {
   device_status_collector_.reset(collector);
 }
@@ skipping 11 matching lines @@
 
 void CloudPolicyDataStore::NotifyCredentialsChanged() {
   FOR_EACH_OBSERVER(Observer, observer_list_, OnCredentialsChanged());
 }
 
 void CloudPolicyDataStore::NotifyDeviceTokenChanged() {
   FOR_EACH_OBSERVER(Observer, observer_list_, OnDeviceTokenChanged());
 }
 
 }  // namespace policy