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

media/blink/key_system_config_selector.h

 // Copyright 2015 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_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_
 #define MEDIA_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_
 
 #include <string>
 #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"
 
 namespace blink {
 
 struct WebMediaKeySystemConfiguration;
 struct WebMediaKeySystemMediaCapability;
 class WebSecurityOrigin;
 class WebString;
 
 }  // namespace blink
 
 namespace media {
 
 class KeySystems;
 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:
   struct SelectionRequest;
   class ConfigState;
 
   enum ConfigurationSupport {
     CONFIGURATION_NOT_SUPPORTED,
     CONFIGURATION_REQUIRES_PERMISSION,
     CONFIGURATION_SUPPORTED,
@@ skipping 28 matching lines @@
   const KeySystems* key_systems_;
   MediaPermission* media_permission_;
   base::WeakPtrFactory<KeySystemConfigSelector> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(KeySystemConfigSelector);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_KEY_SYSTEM_CONFIG_SELECTOR_H_