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

chrome/browser/policy/cloud_policy_data_store.h

Index: chrome/browser/policy/cloud_policy_data_store.h
diff --git a/chrome/browser/policy/cloud_policy_data_store.h b/chrome/browser/policy/cloud_policy_data_store.h
index 20d1709f083c2d449f2a620c6786263564324206..208f9c439d3d95f929fd10aa08128cb3248e95f3 100644
--- a/chrome/browser/policy/cloud_policy_data_store.h
+++ b/chrome/browser/policy/cloud_policy_data_store.h
@@ -78,6 +78,7 @@ class CloudPolicyDataStore {
   void set_known_machine_id(bool known_machine_id);
   void set_policy_fetching_enabled(bool policy_fetching_enabled);
   void set_device_mode(DeviceMode device_mode);
+  void set_reregister(bool reregister);
 
 #if defined(OS_CHROMEOS)
   void set_device_status_collector(DeviceStatusCollector* collector);
@@ -100,6 +101,7 @@ class CloudPolicyDataStore {
   UserAffiliation user_affiliation() const;
   bool known_machine_id() const;
   DeviceMode device_mode() const;
+  bool reregister() const;
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
@@ -131,6 +133,7 @@ class CloudPolicyDataStore {
   std::string machine_model_;
   std::string machine_id_;
   bool known_machine_id_;
+  bool reregister_;
 
   bool token_cache_loaded_;
   bool policy_fetching_enabled_;