Revert "Add error message for domain mismatch on re-enrollment."

components/policy/core/browser/cloud/message_util.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 "components/policy/core/browser/cloud/message_util.h"
 
 #include "base/logging.h"
 #include "grit/component_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 24 matching lines @@
     case DM_STATUS_SERVICE_ACTIVATION_PENDING:
       return IDS_POLICY_DM_STATUS_SERVICE_ACTIVATION_PENDING;
     case DM_STATUS_SERVICE_INVALID_SERIAL_NUMBER:
       return IDS_POLICY_DM_STATUS_SERVICE_INVALID_SERIAL_NUMBER;
     case DM_STATUS_SERVICE_DEVICE_ID_CONFLICT:
       return IDS_POLICY_DM_STATUS_SERVICE_DEVICE_ID_CONFLICT;
     case DM_STATUS_SERVICE_MISSING_LICENSES:
       return IDS_POLICY_DM_STATUS_SERVICE_MISSING_LICENSES;
     case DM_STATUS_SERVICE_DEPROVISIONED:
       return IDS_POLICY_DM_STATUS_SERVICE_DEPROVISIONED;
-    case DM_STATUS_SERVICE_DOMAIN_MISMATCH:
-      return IDS_POLICY_DM_STATUS_SERVICE_DOMAIN_MISMATCH;
     case DM_STATUS_SERVICE_POLICY_NOT_FOUND:
       return IDS_POLICY_DM_STATUS_SERVICE_POLICY_NOT_FOUND;
   }
   NOTREACHED() << "Unhandled DM status " << status;
   return IDS_POLICY_DM_STATUS_UNKNOWN_ERROR;
 }
 
 int GetIDSForValidationStatus(CloudPolicyValidatorBase::Status status) {
   switch (status) {
     case CloudPolicyValidatorBase::VALIDATION_OK:
@@ skipping 68 matching lines @@
     return l10n_util::GetStringFUTF16(
         IDS_POLICY_STORE_STATUS_VALIDATION_ERROR,
         l10n_util::GetStringUTF16(
             GetIDSForValidationStatus(validation_status)));
   }
 
   return l10n_util::GetStringUTF16(GetIDSForStoreStatus(store_status));
 }
 
 }  // namespace policy