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..5ed09fd4ec70f0748228a204175912c1f93398c5 100644
--- a/media/base/android/media_drm_bridge.h
+++ b/media/base/android/media_drm_bridge.h
@@ -41,23 +41,24 @@ 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 tests for MediaDrmBridge. See http://crbug.com/303864
+  static bool IsSecurityLevelSupported(const std::string& key_system,
                                        SecurityLevel security_level);
 
-  static bool IsCryptoSchemeSupported(const std::vector<uint8>& scheme_uuid,
-                                      const std::string& container_mime_type);
+  static bool IsKeySystemSupportedWithType(

[ddorwin, 2014/03/06 18:28:48]

I now realize this name is a little misleading vs. some of the other functions
that actually take a full content type. We can resolve this once the spec issue
with initData type is resolved.

[xhwang, 2014/03/06 18:53:49]

Added TODO.

+      const std::string& key_system,
+      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 GURL& frame_url,
-      MediaPlayerManager* manager);
+  static scoped_ptr<MediaDrmBridge> Create(int cdm_id,
+                                           const std::string& key_system,
+                                           const GURL& frame_url,
+                                           MediaPlayerManager* manager);
 
   // Returns true if |security_level| is successfully set, or false otherwise.
   // Call this function right after Create() and before any other calls.