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

components/policy/core/common/cloud/cloud_policy_validator.h

Index: components/policy/core/common/cloud/cloud_policy_validator.h
diff --git a/components/policy/core/common/cloud/cloud_policy_validator.h b/components/policy/core/common/cloud/cloud_policy_validator.h
index 7e88a268432c00f479c410ae980496c79a245db8..fd1677bf6c63a313c155d735a7b450d1c2cb228b 100644
--- a/components/policy/core/common/cloud/cloud_policy_validator.h
+++ b/components/policy/core/common/cloud/cloud_policy_validator.h
@@ -80,8 +80,6 @@
     // Policy key signature could not be verified using the hard-coded
     // verification key.
     VALIDATION_BAD_KEY_VERIFICATION_SIGNATURE,
-    // Device id doesn't match.
-    VALIDATION_WRONG_DEVICE_ID,
     VALIDATION_STATUS_SIZE  // MUST BE LAST
   };
 
@@ -146,10 +144,6 @@
   // validation if it does not have a non-empty request_token field.
   void ValidateDMToken(const std::string& dm_token,
                        ValidateDMTokenOption dm_token_option);
-
-  // Makes sure the device id on the policy is non-empty and matches
-  // |expected_device_id| unless |expected_device_id| is empty.
-  void ValidateDeviceId(const std::string& dm_token);
 
   // Validates the policy type.
   void ValidatePolicyType(const std::string& policy_type);
@@ -228,7 +222,6 @@
     VALIDATE_SIGNATURE   = 1 << 7,
     VALIDATE_INITIAL_KEY = 1 << 8,
     VALIDATE_CACHED_KEY  = 1 << 9,
-    VALIDATE_DEVICE_ID   = 1 << 10,
   };
 
   enum SignatureType {
@@ -274,7 +267,6 @@
   Status CheckUsername();
   Status CheckDomain();
   Status CheckToken();
-  Status CheckDeviceId();
   Status CheckPolicyType();
   Status CheckEntityId();
   Status CheckPayload();
@@ -303,7 +295,6 @@
   bool canonicalize_user_;
   std::string domain_;
   std::string token_;
-  std::string device_id_;
   std::string policy_type_;
   std::string settings_entity_id_;
   std::string key_;