Revert of Added policy device id validation similar to the existing DM token validation.

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/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 53 matching lines @@
     case CloudPolicyValidatorBase::VALIDATION_PAYLOAD_PARSE_ERROR:
       return IDS_POLICY_VALIDATION_PAYLOAD_PARSE_ERROR;
     case CloudPolicyValidatorBase::VALIDATION_WRONG_POLICY_TYPE:
       return IDS_POLICY_VALIDATION_WRONG_POLICY_TYPE;
     case CloudPolicyValidatorBase::VALIDATION_WRONG_SETTINGS_ENTITY_ID:
       return IDS_POLICY_VALIDATION_WRONG_SETTINGS_ENTITY_ID;
     case CloudPolicyValidatorBase::VALIDATION_BAD_TIMESTAMP:
       return IDS_POLICY_VALIDATION_BAD_TIMESTAMP;
     case CloudPolicyValidatorBase::VALIDATION_WRONG_TOKEN:
       return IDS_POLICY_VALIDATION_WRONG_TOKEN;
-    case CloudPolicyValidatorBase::VALIDATION_WRONG_DEVICE_ID:
-      return IDS_POLICY_VALIDATION_WRONG_DEVICE_ID;
     case CloudPolicyValidatorBase::VALIDATION_BAD_USERNAME:
       return IDS_POLICY_VALIDATION_BAD_USERNAME;
     case CloudPolicyValidatorBase::VALIDATION_POLICY_PARSE_ERROR:
       return IDS_POLICY_VALIDATION_POLICY_PARSE_ERROR;
     case CloudPolicyValidatorBase::VALIDATION_BAD_KEY_VERIFICATION_SIGNATURE:
       return IDS_POLICY_VALIDATION_BAD_KEY_VERIFICATION_SIGNATURE;
     case CloudPolicyValidatorBase::VALIDATION_STATUS_SIZE:
       NOTREACHED();
   }
   NOTREACHED() << "Unhandled validation status " << status;
@@ skipping 41 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