Explicitly differentiate key system support functions by EME version.

media/blink/encrypted_media_player_support.cc

 // Copyright 2014 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/blink/encrypted_media_player_support.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 133 matching lines @@
   ReportMediaKeyExceptionToUMA("generateKeyRequest", ascii_key_system, e);
   return e;
 }
 
 WebMediaPlayer::MediaKeyException
 EncryptedMediaPlayerSupport::GenerateKeyRequestInternal(
     blink::WebLocalFrame* frame,
     const std::string& key_system,
     const unsigned char* init_data,
     unsigned init_data_length) {
-  if (!IsConcreteSupportedKeySystem(key_system))
+  if (!PrefixedIsSupportedConcreteKeySystem(key_system))
     return WebMediaPlayer::MediaKeyExceptionKeySystemNotSupported;
 
   // We do not support run-time switching between key systems for now.
   if (current_key_system_.empty()) {
     if (!proxy_decryptor_) {
       proxy_decryptor_.reset(new ProxyDecryptor(
           media_permission_,
           BIND_TO_RENDER_LOOP(&EncryptedMediaPlayerSupport::OnKeyAdded),
           BIND_TO_RENDER_LOOP(&EncryptedMediaPlayerSupport::OnKeyError),
           BIND_TO_RENDER_LOOP(&EncryptedMediaPlayerSupport::OnKeyMessage)));
@@ skipping 62 matching lines @@
 EncryptedMediaPlayerSupport::AddKeyInternal(
     const std::string& key_system,
     const unsigned char* key,
     unsigned key_length,
     const unsigned char* init_data,
     unsigned init_data_length,
     const std::string& session_id) {
   DCHECK(key);
   DCHECK_GT(key_length, 0u);
 
-  if (!IsConcreteSupportedKeySystem(key_system))
+  if (!PrefixedIsSupportedConcreteKeySystem(key_system))
     return WebMediaPlayer::MediaKeyExceptionKeySystemNotSupported;
 
   if (current_key_system_.empty() || key_system != current_key_system_)
     return WebMediaPlayer::MediaKeyExceptionInvalidPlayerState;
 
   proxy_decryptor_->AddKey(
       key, key_length, init_data, init_data_length, session_id);
   return WebMediaPlayer::MediaKeyExceptionNoError;
 }
 
@@ skipping 11 matching lines @@
   WebMediaPlayer::MediaKeyException e =
       CancelKeyRequestInternal(ascii_key_system, ascii_session_id);
   ReportMediaKeyExceptionToUMA("cancelKeyRequest", ascii_key_system, e);
   return e;
 }
 
 WebMediaPlayer::MediaKeyException
 EncryptedMediaPlayerSupport::CancelKeyRequestInternal(
     const std::string& key_system,
     const std::string& session_id) {
-  if (!IsConcreteSupportedKeySystem(key_system))
+  if (!PrefixedIsSupportedConcreteKeySystem(key_system))
     return WebMediaPlayer::MediaKeyExceptionKeySystemNotSupported;
 
   if (current_key_system_.empty() || key_system != current_key_system_)
     return WebMediaPlayer::MediaKeyExceptionInvalidPlayerState;
 
   proxy_decryptor_->CancelKeyRequest(session_id);
   return WebMediaPlayer::MediaKeyExceptionNoError;
 }
 
 void EncryptedMediaPlayerSupport::SetInitDataType(
@@ skipping 46 matching lines @@
 
   client_->keyMessage(
       WebString::fromUTF8(GetPrefixedKeySystemName(current_key_system_)),
       WebString::fromUTF8(session_id),
       message.empty() ? NULL : &message[0],
       base::saturated_cast<unsigned int>(message.size()),
       destination_url);
 }
 
 }  // namespace media