Encrypted Media: Confine UUID code to MediaDrmBridge.

media/base/android/media_drm_bridge.h

Index: media/base/android/media_drm_bridge.h
diff --git a/media/base/android/media_drm_bridge.h b/media/base/android/media_drm_bridge.h
index 58b947bdc0685dfa4bd7b529ed03431c049e3a7f..2fc6f9c15bae69cf2e148a768590a8d579ae4f84 100644
--- a/media/base/android/media_drm_bridge.h
+++ b/media/base/android/media_drm_bridge.h
@@ -41,21 +41,22 @@ class MEDIA_EXPORT MediaDrmBridge : public MediaKeys {
   // Checks whether MediaDRM is available.
   static bool IsAvailable();
 
-  static bool IsSecurityLevelSupported(const std::vector<uint8>& scheme_uuid,
+  // TODO(xhwang): Add unit tests for MediaDrmBridge.

[ddorwin, 2014/03/05 22:11:29]

Would we be better off just filing a bug?

[xhwang, 2014/03/06 18:09:57]

Done.

+  static bool IsSecurityLevelSupported(const std::string& key_system,
                                        SecurityLevel security_level);
 
-  static bool IsCryptoSchemeSupported(const std::vector<uint8>& scheme_uuid,
+  static bool IsKeySystemSupported(const std::string& key_system,

[ddorwin, 2014/03/05 22:11:29]

...WithType?

[xhwang, 2014/03/06 18:09:57]

Done.

                                       const std::string& container_mime_type);
 
   static bool IsSecureDecoderRequired(SecurityLevel security_level);
 
   static bool RegisterMediaDrmBridge(JNIEnv* env);
 
-  // Returns a MediaDrmBridge instance if |scheme_uuid| is supported, or a NULL
+  // Returns a MediaDrmBridge instance if |key_system| is supported, or a NULL
   // pointer otherwise.
   static scoped_ptr<MediaDrmBridge> Create(
       int cdm_id,
-      const std::vector<uint8>& scheme_uuid,
+      const std::string& key_system,
       const GURL& frame_url,
       MediaPlayerManager* manager);