Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(226)

Unified Diff: media/blink/webmediaplayer_impl_unittest.cc

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Rebase. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/blink/webmediaplayer_params.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/blink/webmediaplayer_params.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698