Encrypted Media: Confine UUID code to MediaDrmBridge.

media/base/android/media_source_player.cc

 // Copyright (c) 2013 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.
 
 #include "media/base/android/media_source_player.h"
 
 #include <limits>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 15 matching lines @@
 
 // Use 16bit PCM for audio output. Keep this value in sync with the output
 // format we passed to AudioTrack in MediaCodecBridge.
 const int kBytesPerAudioOutputSample = 2;
 }
 
 namespace media {
 
 // static
 bool MediaSourcePlayer::IsTypeSupported(
-    const std::vector<uint8>& scheme_uuid,
+    const std::string& key_system,
     MediaDrmBridge::SecurityLevel security_level,
     const std::string& container,
     const std::vector<std::string>& codecs) {
-  if (!MediaDrmBridge::IsCryptoSchemeSupported(scheme_uuid, container)) {
-    DVLOG(1) << "UUID and container '" << container << "' not supported.";
+  if (!MediaDrmBridge::IsCryptoSchemeSupported(key_system, container)) {
+    DVLOG(1) << "Key system and container '" << container << "' not supported.";
     return false;
   }
 
-  if (!MediaDrmBridge::IsSecurityLevelSupported(scheme_uuid, security_level)) {
-    DVLOG(1) << "UUID and security level '" << security_level
+  if (!MediaDrmBridge::IsSecurityLevelSupported(key_system, security_level)) {
+    DVLOG(1) << "Key system and security level '" << security_level
              << "' not supported.";
     return false;
   }
 
   bool is_secure = MediaDrmBridge::IsSecureDecoderRequired(security_level);
   for (size_t i = 0; i < codecs.size(); ++i) {
     if (!MediaCodecBridge::CanDecode(codecs[i], is_secure)) {
       DVLOG(1) << "Codec '" << codecs[i] << "' "
                << (is_secure ? "in secure mode " : "") << "not supported.";
       return false;
@@ skipping 930 matching lines @@
 
 void MediaSourcePlayer::ClearPendingEvent(PendingEventFlags event) {
   DVLOG(1) << __FUNCTION__ << "(" << GetEventName(event) << ")";
   DCHECK_NE(event, NO_EVENT_PENDING);
   DCHECK(IsEventPending(event)) << GetEventName(event);
 
   pending_event_ &= ~event;
 }
 
 }  // namespace media