| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 59744b0aeab929bfaacf17af84890c70b2d58437..e46cadeaba1ed01ad738fdb2b6656ad8c6ff97eb 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -218,11 +218,9 @@
|
|
|
| #include "content/renderer/java/gin_java_bridge_dispatcher.h"
|
| #include "content/renderer/media/android/renderer_media_player_manager.h"
|
| -#include "content/renderer/media/android/renderer_media_session_manager.h"
|
| #include "content/renderer/media/android/renderer_surface_view_manager.h"
|
| #include "content/renderer/media/android/stream_texture_factory.h"
|
| #include "content/renderer/media/android/webmediaplayer_android.h"
|
| -#include "content/renderer/media/android/webmediasession_android.h"
|
| #include "media/base/android/media_codec_util.h"
|
| #include "third_party/WebKit/public/platform/WebFloatPoint.h"
|
| #endif
|
| @@ -276,7 +274,6 @@ using blink::WebLocalFrame;
|
| using blink::WebMediaPlayer;
|
| using blink::WebMediaPlayerClient;
|
| using blink::WebMediaPlayerEncryptedMediaClient;
|
| -using blink::WebMediaSession;
|
| using blink::WebNavigationPolicy;
|
| using blink::WebNavigationType;
|
| using blink::WebNode;
|
| @@ -2718,14 +2715,6 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
|
| return media_player;
|
| }
|
|
|
| -blink::WebMediaSession* RenderFrameImpl::createMediaSession() {
|
| -#if defined(OS_ANDROID)
|
| - return new WebMediaSessionAndroid(GetMediaSessionManager());
|
| -#else
|
| - return nullptr;
|
| -#endif // defined(OS_ANDROID)
|
| -}
|
| -
|
| blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(
|
| blink::WebApplicationCacheHostClient* client) {
|
| if (!frame_ || !frame_->view())
|
| @@ -6187,12 +6176,6 @@ RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() {
|
| return media_player_manager_;
|
| }
|
|
|
| -RendererMediaSessionManager* RenderFrameImpl::GetMediaSessionManager() {
|
| - if (!media_session_manager_)
|
| - media_session_manager_ = new RendererMediaSessionManager(this);
|
| - return media_session_manager_;
|
| -}
|
| -
|
| #endif // defined(OS_ANDROID)
|
|
|
| media::MediaPermission* RenderFrameImpl::GetMediaPermission() {
|
|
|