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

chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.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/chromeos/login/enrollment/enterprise_enrollment_screen.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 210 matching lines @@
 
   NOTREACHED();
 }
 
 void EnterpriseEnrollmentScreen::RegisterForDevicePolicy(
     const std::string& token) {
   policy::BrowserPolicyConnector* connector =
       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() !=
+            chromeos::Authenticator::ExtractDomainName(user_)) {
+      LOG(ERROR) << "Trying to re-enroll to a different domain than "
+                 << connector->GetEnterpriseDomain();
+      if (is_showing_)
+        actor_->ShowDomainMismatchError();
+      return;
+    }
     // Make sure the device policy subsystem is in a clean slate.
     connector->ResetDevicePolicy();
     connector->ScheduleServiceInitialization(0);
     registrar_.reset(new policy::CloudPolicySubsystem::ObserverRegistrar(
         connector->device_cloud_policy_subsystem(), this));
     // Push the credentials to the policy infrastructure. It'll start enrollment
     // and notify us of progress through CloudPolicySubsystem::Observer.
     connector->RegisterForDevicePolicy(user_, token, is_auto_enrollment_);
     return;
   }
   NOTREACHED();
   if (is_showing_)
     actor_->ShowFatalEnrollmentError();
 }
 
 }  // namespace chromeos