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

chrome/browser/policy/cloud_policy_data_store.cc

Index: chrome/browser/policy/cloud_policy_data_store.cc
diff --git a/chrome/browser/policy/cloud_policy_data_store.cc b/chrome/browser/policy/cloud_policy_data_store.cc
index 94ce161d635c782d8fb221f756ae8124028d1bde..a09f1c6444b862d10839a2f56d46606d39c6ca2b 100644
--- a/chrome/browser/policy/cloud_policy_data_store.cc
+++ b/chrome/browser/policy/cloud_policy_data_store.cc
@@ -33,6 +33,7 @@ CloudPolicyDataStore::CloudPolicyDataStore(
       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) {}
@@ -122,6 +123,10 @@ 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_;
 }
@@ -179,6 +184,10 @@ DeviceMode CloudPolicyDataStore::device_mode() const {
   return device_mode_;
 }
 
+bool CloudPolicyDataStore::reregister() const {
+  return reregister_;
+}
+
 #if defined(OS_CHROMEOS)
 DeviceStatusCollector*
     CloudPolicyDataStore::device_status_collector() {