| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 71b9e1262ec23eb9a62167bbeec4bfa715532d95..262843d888c34d7bb5b40ec2ef83b2cb307be69b 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -2488,7 +2488,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_, media_session);
|
| + initial_cdm, media_surface_manager_, media_session);
|
|
|
| #if defined(OS_ANDROID)
|
| if (!UseWebMediaPlayerImpl(load_type, url))
|
| @@ -2516,7 +2516,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());
|
| @@ -5932,11 +5932,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() {
|
|
|