Support Android secure codecs in requestMediaKeySystemAccess().

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,
+#if defined(OS_ANDROID)

[ddorwin, 2015/05/01 20:39:11]

I think this comment block is confusing and possibly inaccurate wrt audio now.
Suggestions for fixing below.

[sandersd (OOO until July 31), 2015/05/01 21:57:01]

Acknowledged.

+  // The configuration option is supported if hardware-secure video codecs are

[ddorwin, 2015/05/01 20:39:11]

remove "video"

[sandersd (OOO until July 31), 2015/05/01 21:57:01]

Done.

+  // not used.
+  SECURE_CODECS_NOT_ALLOWED,
+  // The configuration option is supported if only hardware-secure video codecs

[ddorwin, 2015/05/01 20:39:11]

remove "video"

[sandersd (OOO until July 31), 2015/05/01 21:57:01]

Done.

+  // are used. In this mode only secure surfaces (hole-punching) will be
+  // functional.

[ddorwin, 2015/05/01 20:39:11]

...for video.

(or something like that)

[sandersd (OOO until July 31), 2015/05/01 21:57:01]

Done.

+  SECURE_CODECS_REQUIRED,
+#endif  // defined(OS_ANDROID)
   // The configuration option is supported without conditions.
   SUPPORTED,
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_EME_CONSTANTS_H_