1 files changed, 4 insertions, 53 deletions
diff --git a/content/renderer/media/android/webmediaplayer_proxy_android.cc b/content/renderer/media/android/webmediaplayer_proxy_android.cc
index 3b44680..d371c99 100644
--- a/content/renderer/media/android/webmediaplayer_proxy_android.cc
+++ b/content/renderer/media/android/webmediaplayer_proxy_android.cc
@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "content/common/media/media_player_messages_android.h"
+#include "content/renderer/media/android/renderer_demuxer_android.h"
 #include "content/renderer/media/android/renderer_media_player_manager.h"
 #include "content/renderer/media/android/webmediaplayer_android.h"
 
@@ -15,7 +16,9 @@ namespace content {
 WebMediaPlayerProxyAndroid::WebMediaPlayerProxyAndroid(
     RenderView* render_view,
     RendererMediaPlayerManager* manager)
-    : RenderViewObserver(render_view), manager_(manager) {}
+    : RenderViewObserver(render_view),
+      renderer_demuxer_android_(new RendererDemuxerAndroid(render_view)),
+      manager_(manager) {}
 
 WebMediaPlayerProxyAndroid::~WebMediaPlayerProxyAndroid() {
   Send(new MediaPlayerHostMsg_DestroyAllMediaPlayers(routing_id()));
@@ -41,9 +44,6 @@ bool WebMediaPlayerProxyAndroid::OnMessageReceived(const IPC::Message& msg) {
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPlay, OnPlayerPlay)
     IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause)
-    IPC_MESSAGE_HANDLER(MediaPlayerMsg_ReadFromDemuxer, OnReadFromDemuxer)
-    IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaSeekRequest, OnMediaSeekRequest)
-    IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaConfigRequest, OnMediaConfigRequest)
     IPC_MESSAGE_HANDLER(MediaKeysMsg_KeyAdded, OnKeyAdded)
     IPC_MESSAGE_HANDLER(MediaKeysMsg_KeyError, OnKeyError)
     IPC_MESSAGE_HANDLER(MediaKeysMsg_KeyMessage, OnKeyMessage)
@@ -176,19 +176,6 @@ void WebMediaPlayerProxyAndroid::ExitFullscreen(int player_id) {
   Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id));
 }
 
-void WebMediaPlayerProxyAndroid::ReadFromDemuxerAck(
-    int player_id,
-    const media::DemuxerData& data) {
-  Send(new MediaPlayerHostMsg_ReadFromDemuxerAck(
-      routing_id(), player_id, data));
-}
-
-void WebMediaPlayerProxyAndroid::SeekRequestAck(int player_id,
-                                                unsigned seek_request_id) {
-  Send(new MediaPlayerHostMsg_MediaSeekRequestAck(
-      routing_id(), player_id, seek_request_id));
-}
-
 #if defined(GOOGLE_TV)
 void WebMediaPlayerProxyAndroid::RequestExternalSurface(
     int player_id,
@@ -209,27 +196,6 @@ void WebMediaPlayerProxyAndroid::DidCommitCompositorFrame() {
 }
 #endif
 
-void WebMediaPlayerProxyAndroid::OnReadFromDemuxer(
-    int player_id,
-    media::DemuxerStream::Type type) {
-  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
-  if (player)
-    player->OnReadFromDemuxer(type);
-}
-
-void WebMediaPlayerProxyAndroid::DemuxerReady(
-    int player_id,
-    const media::DemuxerConfigs& configs) {
-  Send(new MediaPlayerHostMsg_DemuxerReady(routing_id(), player_id, configs));
-}
-
-void WebMediaPlayerProxyAndroid::DurationChanged(
-    int player_id,
-    const base::TimeDelta& duration) {
-  Send(new MediaPlayerHostMsg_DurationChanged(
-      routing_id(), player_id, duration));
-}
-
 void WebMediaPlayerProxyAndroid::InitializeCDM(int media_keys_id,
                                                const std::vector<uint8>& uuid) {
   Send(new MediaKeysHostMsg_InitializeCDM(routing_id(), media_keys_id, uuid));
@@ -264,21 +230,6 @@ WebMediaPlayerAndroid* WebMediaPlayerProxyAndroid::GetWebMediaPlayer(
       manager_->GetMediaPlayer(player_id));
 }
 
-void WebMediaPlayerProxyAndroid::OnMediaSeekRequest(
-    int player_id,
-    base::TimeDelta time_to_seek,
-    unsigned seek_request_id) {
-  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
-  if (player)
-    player->OnMediaSeekRequest(time_to_seek, seek_request_id);
-}
-
-void WebMediaPlayerProxyAndroid::OnMediaConfigRequest(int player_id) {
-  WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
-  if (player)
-    player->OnMediaConfigRequest();
-}
-
 void WebMediaPlayerProxyAndroid::OnKeyAdded(int media_keys_id,
                                             const std::string& session_id) {
   WebMediaPlayerAndroid* player = GetWebMediaPlayer(media_keys_id);