Revert of Restrict use of hardware-secure codecs based on the RendererPreference.

media/base/eme_constants.h

 // Copyright 2014 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.
 
 #ifndef MEDIA_BASE_EME_CONSTANTS_H_
 #define MEDIA_BASE_EME_CONSTANTS_H_
 
 #include <stdint.h>
 
 namespace media {
@@ skipping 111 matching lines @@
   // The configuration option is supported, but the user experience may be
   // improved if a distinctive identifier is available.
   IDENTIFIER_RECOMMENDED,
   // The configuration option prevents use of persistent state.
   PERSISTENCE_NOT_ALLOWED,
   // The configuration option is supported if persistent state is available.
   PERSISTENCE_REQUIRED,
   // The configuration option is supported if both a distinctive identifier and
   // persistent state are available.
   IDENTIFIER_AND_PERSISTENCE_REQUIRED,
-  // The configuration option prevents use of hardware-secure codecs.
-  // This rule only has meaning on platforms that distinguish hardware-secure
-  // codecs (ie. Android).
+#if defined(OS_ANDROID)
+  // The configuration option is supported if no hardware-secure codecs are used
+  // (as they would be for video if secure surfaces are enabled).
   SECURE_CODECS_NOT_ALLOWED,
-  // The configuration option is supported if hardware-secure codecs are used.
-  // This rule only has meaning on platforms that distinguish hardware-secure
-  // codecs (ie. Android).
+  // The configuration option is supported if only hardware-secure codecs are
+  // used. This implies that secure surfaces (hole-punching) are required for
+  // video.
   SECURE_CODECS_REQUIRED,
+#endif  // defined(OS_ANDROID)
   // The configuration option is supported without conditions.
   SUPPORTED,
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_EME_CONSTANTS_H_