Encrypted Media: Confine UUID code to MediaDrmBridge.

media/base/android/media_drm_bridge.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.

[ddorwin, 2014/03/04 20:00:56]

There are no tests for this class. :(

Now that it is doing conversion to UUID, we should definitely have tests. (That
also means exposing GetUUID in this file, or via a -internal.h.)

[xhwang, 2014/03/05 21:52:33]

I'll add tests (mainly for the static methods) in a follow up CL.
UUID is an internal concept and GetUUID() just does the one-to-one mapping. I am
not sure whether it's worth exposing GetUUID() to test it.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
 
 #include <jni.h>
 #include <map>
 #include <queue>
 #include <string>
@@ skipping 22 matching lines @@
     SECURITY_LEVEL_3 = 3,
   };
 
   typedef base::Callback<void(bool)> ResetCredentialsCB;
 
   virtual ~MediaDrmBridge();
 
   // Checks whether MediaDRM is available.
   static bool IsAvailable();
 
-  static bool IsSecurityLevelSupported(const std::vector<uint8>& scheme_uuid,
+  static bool IsSecurityLevelSupported(const std::string& key_system,
                                        SecurityLevel security_level);
 
-  static bool IsCryptoSchemeSupported(const std::vector<uint8>& scheme_uuid,
+  static bool IsCryptoSchemeSupported(const std::string& key_system,

[ddorwin, 2014/03/04 20:00:56]

This function name no longer makes sense. I assume "Crypto Scheme" comes from
Android and is identified by the UUID.

[xhwang, 2014/03/05 21:52:33]

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);
 
   // Returns true if |security_level| is successfully set, or false otherwise.
   // Call this function right after Create() and before any other calls.
   // Note:
   // - If this function is not called, the default security level of the device
   //   will be used.
   // - It's recommended to call this function only once on a MediaDrmBridge
   //   object. Calling this function multiples times may cause errors.
@@ skipping 77 matching lines @@
   base::Closure media_crypto_ready_cb_;
 
   ResetCredentialsCB reset_credentials_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_