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

media/blink/key_system_config_selector.h

Index: media/blink/key_system_config_selector.h
diff --git a/media/blink/key_system_config_selector.h b/media/blink/key_system_config_selector.h
index 86eec7efaa28baca9805311d8332ed92262c54a1..a6ac874ee6499615f503ae6dc7d43e1cbd267e58 100644
--- a/media/blink/key_system_config_selector.h
+++ b/media/blink/key_system_config_selector.h
@@ -9,8 +9,10 @@
 #include <vector>
 
 #include "base/bind.h"
+#include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "build/build_config.h"
 #include "media/base/eme_constants.h"
 #include "media/base/media_export.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
@@ -31,18 +33,30 @@ class MediaPermission;
 
 class MEDIA_EXPORT KeySystemConfigSelector {
  public:
-  KeySystemConfigSelector(const KeySystems* key_systems,
-                          MediaPermission* media_permission);
+  KeySystemConfigSelector(
+      const KeySystems* key_systems,
+      MediaPermission* media_permission);
 
   ~KeySystemConfigSelector();
 
+#if defined(OS_ANDROID)
+  typedef base::Callback<void(const blink::WebMediaKeySystemConfiguration&,
+                              const bool)>
+      SucceededCB;
+#else
+  typedef base::Callback<void(const blink::WebMediaKeySystemConfiguration&)>
+      SucceededCB;
+#endif  // defined(OS_ANDROID)
+
   void SelectConfig(
       const blink::WebString& key_system,
+#if defined(OS_ANDROID)

[ddorwin, 2015/05/06 02:17:11]

So may ifdefs. Perhaps we should just note that this only applies to platforms
that support it and should be false otherwise. We can then DCHECK(!allow) in the
implementation.

[sandersd (OOO until July 31), 2015/05/08 00:37:42]

Done.

+      const bool allow_secure_surfaces,

[ddorwin, 2015/05/06 02:17:12]

is_...

[sandersd (OOO until July 31), 2015/05/08 00:37:42]

Done.

+#endif  // defined(OS_ANDROID)
       const blink::WebVector<blink::WebMediaKeySystemConfiguration>&
           candidate_configurations,
       const blink::WebSecurityOrigin& security_origin,
-      base::Callback<void(const blink::WebMediaKeySystemConfiguration&)>
-          succeeded_cb,
+      SucceededCB succeeded_cb,
       base::Callback<void(const blink::WebString&)> not_supported_cb);
 
  private: