Encrypted Media: Confine UUID code to MediaDrmBridge.

chrome/browser/media/encrypted_media_message_filter_android.cc

Index: chrome/browser/media/encrypted_media_message_filter_android.cc
diff --git a/chrome/browser/media/encrypted_media_message_filter_android.cc b/chrome/browser/media/encrypted_media_message_filter_android.cc
index 73d147a2f8cf2cb397782a99d48ffbebb3d2235b..6edd79548bf0db94b7a3f7feccb69d96c06599cb 100644
--- a/chrome/browser/media/encrypted_media_message_filter_android.cc
+++ b/chrome/browser/media/encrypted_media_message_filter_android.cc
@@ -17,6 +17,8 @@ using media::MediaDrmBridge;
 
 namespace chrome {
 
+const size_t kEmeMaxKeySystemLength = 256;

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

nit: "Max" should be first IMO.
nit: "Eme" is redundant in this file, and probably not necessary in the other
one either.

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

Done.

+
 // Check whether the available codecs are supported.
 static android::SupportedCodecs GetSupportedCodecs(
     android::SupportedCodecs requested_codecs,
@@ -72,21 +74,29 @@ void EncryptedMediaMessageFilterAndroid::OverrideThreadForMessage(
 void EncryptedMediaMessageFilterAndroid::OnGetSupportedKeySystems(
     const SupportedKeySystemRequest& request,
     SupportedKeySystemResponse* response) {
+  if (!response) {
+    NOTREACHED() << "NULL response pointer provided.";
+    return;
+  }
+
+  if (request.key_system.size() > kEmeMaxKeySystemLength) {
+    NOTREACHED() << "Invalid key system: " << request.key_system;
+    return;
+  }
+
   if (!MediaDrmBridge::IsAvailable() || !MediaCodecBridge::IsAvailable())
     return;
 
   // TODO(qinmin): Convert codecs to container types and check whether they
   // are supported with the key system.
-  if (!MediaDrmBridge::IsCryptoSchemeSupported(request.uuid, ""))
+  if (!MediaDrmBridge::IsKeySystemSupportedWithType(request.key_system, ""))
     return;
 
   DCHECK_EQ(request.codecs >> 3, 0) << "unrecognized codec";
-  response->uuid = request.uuid;
+  response->key_system = request.key_system;
   // TODO(qinmin): check composition is supported or not.
-  response->compositing_codecs =
-      GetSupportedCodecs(request.codecs, true);
-  response->non_compositing_codecs =
-      GetSupportedCodecs(request.codecs, false);
+  response->compositing_codecs = GetSupportedCodecs(request.codecs, true);
+  response->non_compositing_codecs = GetSupportedCodecs(request.codecs, false);
 }
 
 }  // namespace chrome