Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index bfdbd00b584f1cc29e3d072122a635888e052669..3bad3c7095b65759ea943a6e0205f69e77414b4b 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -2496,7 +2496,7 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( |
render_thread->compositor_task_runner(), context_3d_cb, |
base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory, |
base::Unretained(blink::mainThreadIsolate())), |
- GetMediaPermission(), initial_cdm, media_surface_manager_); |
+ initial_cdm, media_surface_manager_); |
#if defined(OS_ANDROID) |
if (!CanUseWebMediaPlayerImpl(load_type, url)) { |
@@ -2543,7 +2543,7 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( |
media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( |
frame_, client, encrypted_client, |
GetWebMediaPlayerDelegate()->AsWeakPtr(), |
- std::move(media_renderer_factory), GetCdmFactory(), url_index_, params); |
+ std::move(media_renderer_factory), url_index_, params); |
#if defined(OS_ANDROID) // WMPI_CAST |
media_player->SetMediaPlayerManager(GetMediaPlayerManager()); |
@@ -5942,11 +5942,10 @@ WebMediaPlayer* RenderFrameImpl::CreateAndroidWebMediaPlayer( |
bool enable_texture_copy = |
RenderThreadImpl::current()->EnableStreamTextureCopy(); |
- return new WebMediaPlayerAndroid(frame_, client, encrypted_client, |
- GetWebMediaPlayerDelegate()->AsWeakPtr(), |
- GetMediaPlayerManager(), GetCdmFactory(), |
- stream_texture_factory, routing_id_, |
- enable_texture_copy, params); |
+ return new WebMediaPlayerAndroid( |
+ frame_, client, encrypted_client, |
+ GetWebMediaPlayerDelegate()->AsWeakPtr(), GetMediaPlayerManager(), |
+ stream_texture_factory, routing_id_, enable_texture_copy, params); |
} |
RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() { |