Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index 54972feabefcc319e1758e46937b7a1ce1d11736..c180ff28a9e128bfa25c05b90a1cfbcd8cbfa72d 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; |
@@ -2717,14 +2714,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()) |
@@ -6198,12 +6187,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() { |