| Index: media/blink/webmediaplayer_impl_unittest.cc
|
| diff --git a/media/blink/webmediaplayer_impl_unittest.cc b/media/blink/webmediaplayer_impl_unittest.cc
|
| index 0d4e6f87e5afbe066c5e73f6a562803e78337fa5..f607b65c5c85919a5709700a14dae45cd0c7501c 100644
|
| --- a/media/blink/webmediaplayer_impl_unittest.cc
|
| +++ b/media/blink/webmediaplayer_impl_unittest.cc
|
| @@ -204,21 +204,24 @@ class WebMediaPlayerImplTest : public testing::Test {
|
| &web_frame_client_,
|
| nullptr,
|
| nullptr)),
|
| - media_log_(new MediaLog()),
|
| audio_parameters_(TestAudioParameters::Normal()) {
|
| web_view_->SetMainFrame(web_local_frame_);
|
| media_thread_.StartAndWaitForTesting();
|
| }
|
|
|
| void InitializeWebMediaPlayerImpl(bool allow_suspend) {
|
| + std::unique_ptr<MediaLog> media_log(new MediaLog());
|
| + std::unique_ptr<RendererFactory> renderer_factory(
|
| + new DefaultRendererFactory(
|
| + media_log.get(), nullptr,
|
| + DefaultRendererFactory::GetGpuFactoriesCB()));
|
| +
|
| wmpi_ = base::MakeUnique<WebMediaPlayerImpl>(
|
| web_local_frame_, &client_, nullptr, &delegate_,
|
| - base::MakeUnique<DefaultRendererFactory>(
|
| - media_log_, nullptr, DefaultRendererFactory::GetGpuFactoriesCB()),
|
| - url_index_,
|
| - WebMediaPlayerParams(
|
| - WebMediaPlayerParams::DeferLoadCB(),
|
| - scoped_refptr<SwitchableAudioRendererSink>(), media_log_,
|
| + std::move(renderer_factory), url_index_,
|
| + base::MakeUnique<WebMediaPlayerParams>(
|
| + std::move(media_log), WebMediaPlayerParams::DeferLoadCB(),
|
| + scoped_refptr<SwitchableAudioRendererSink>(),
|
| media_thread_.task_runner(), message_loop_.task_runner(),
|
| message_loop_.task_runner(), WebMediaPlayerParams::Context3DCB(),
|
| base::Bind(&OnAdjustAllocatedMemory), nullptr, nullptr, nullptr,
|
| @@ -356,7 +359,6 @@ class WebMediaPlayerImplTest : public testing::Test {
|
| blink::WebView* web_view_;
|
| blink::WebLocalFrame* web_local_frame_;
|
|
|
| - scoped_refptr<MediaLog> media_log_;
|
| linked_ptr<media::UrlIndex> url_index_;
|
|
|
| // Audio hardware configuration.
|
|
|