Eliminate MediaPlayer & MediaPlayerClient abstractions

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 "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/key_systems.h"
 #include "media/blink/webcontentdecryptionmodule_impl.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"
-#include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"
+#include "third_party/WebKit/public/platform/WebMediaPlayerEncryptedMediaClient.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 
 using blink::WebMediaPlayer;
-using blink::WebMediaPlayerClient;
+using blink::WebMediaPlayerEncryptedMediaClient;
 using blink::WebString;
 
 namespace media {
 
 #define BIND_TO_RENDER_LOOP(function)            \
   (BindToCurrentLoop(base::Bind(function, AsWeakPtr())))
 
 #define BIND_TO_RENDER_LOOP1(function, arg1)     \
   (BindToCurrentLoop(base::Bind(function, AsWeakPtr(), arg1)))
 
@@ skipping 73 matching lines @@
   // Most WebM files use KeyId of 16 bytes. CENC init data is always >16 bytes.
   if (init_data_length > 16)
     return EmeInitDataType::CENC;
 #endif
 
   return EmeInitDataType::WEBM;
 }
 
 EncryptedMediaPlayerSupport::EncryptedMediaPlayerSupport(
     CdmFactory* cdm_factory,
-    blink::WebMediaPlayerClient* client,
+    WebMediaPlayerEncryptedMediaClient* client,
     MediaPermission* media_permission,
     const CdmContextReadyCB& cdm_context_ready_cb)
     : cdm_factory_(cdm_factory),
       client_(client),
       media_permission_(media_permission),
       init_data_type_(EmeInitDataType::UNKNOWN),
       cdm_context_ready_cb_(cdm_context_ready_cb) {
 }
 
 EncryptedMediaPlayerSupport::~EncryptedMediaPlayerSupport() {
@@ skipping 169 matching lines @@
   if (system_code > std::numeric_limits<uint16>::max()) {
     LOG(WARNING) << "system_code exceeds unsigned short limit.";
     short_system_code = std::numeric_limits<uint16>::max();
   } else {
     short_system_code = static_cast<uint16>(system_code);
   }
 
   client_->keyError(
       WebString::fromUTF8(GetPrefixedKeySystemName(current_key_system_)),
       WebString::fromUTF8(session_id),
-      static_cast<WebMediaPlayerClient::MediaKeyErrorCode>(error_code),
+      static_cast<WebMediaPlayerEncryptedMediaClient::MediaKeyErrorCode>(
+          error_code),
       short_system_code);
 }
 
 void EncryptedMediaPlayerSupport::OnKeyMessage(
     const std::string& session_id,
     const std::vector<uint8>& message,
     const GURL& destination_url) {
   DCHECK(destination_url.is_empty() || destination_url.is_valid());
 
   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