Allow re-enrollment to the same domain in case of policy data loss.

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

Index: chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
diff --git a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
index 9b50a20e91b7d3116d887f8492885520c8913f6e..da6abd0db29fcabb5864f39677d0ce37ce48f730 100644
--- a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
+++ b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
@@ -228,12 +228,19 @@ void EnterpriseEnrollmentScreen::RegisterForDevicePolicy(
       g_browser_process->browser_policy_connector();
   if (!connector->device_cloud_policy_subsystem()) {
     LOG(ERROR) << "Cloud policy subsystem not initialized.";
-  } else if (connector->IsEnterpriseManaged()) {
-    LOG(ERROR) << "Device is already enterprise managed!";
   } else if (connector->device_cloud_policy_subsystem()->state() ==
       policy::CloudPolicySubsystem::SUCCESS) {
     LOG(ERROR) << "A previous enrollment already succeeded!";
   } else {
+    if (connector->IsEnterpriseManaged() &&
+        connector->GetEnterpriseDomain() !=
+            policy::EnterpriseInstallAttributes::ExtractDomainName(user_)) {
+      LOG(ERROR) << "Trying to re-enroll to a different domain than "
+                 << connector->GetEnterpriseDomain();
+      if (is_showing_)
+        actor_->ShowFatalEnrollmentError();

[Mattias Nissler (ping if slow), 2012/06/08 12:06:11]

This condition needs a proper error message.

[pastarmovj, 2012/06/08 12:56:39]

Done.

+      return;
+    }
     // Make sure the device policy subsystem is in a clean slate.
     connector->ResetDevicePolicy();
     connector->ScheduleServiceInitialization(0);