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

Side by Side Diff: media/blink/webmediaplayer_impl_unittest.cc

Issue 2253943004: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/blink/webmediaplayer_impl.h" 5 #include "media/blink/webmediaplayer_impl.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 web_local_frame_( 116 web_local_frame_(
117 blink::WebLocalFrame::create(blink::WebTreeScopeType::Document, 117 blink::WebLocalFrame::create(blink::WebTreeScopeType::Document,
118 &web_frame_client_)), 118 &web_frame_client_)),
119 media_log_(new MediaLog()), 119 media_log_(new MediaLog()),
120 audio_parameters_(TestAudioParameters::Normal()) { 120 audio_parameters_(TestAudioParameters::Normal()) {
121 web_view_->setMainFrame(web_local_frame_); 121 web_view_->setMainFrame(web_local_frame_);
122 media_thread_.StartAndWaitForTesting(); 122 media_thread_.StartAndWaitForTesting();
123 123
124 wmpi_.reset(new WebMediaPlayerImpl( 124 wmpi_.reset(new WebMediaPlayerImpl(
125 web_local_frame_, &client_, nullptr, delegate_.AsWeakPtr(), 125 web_local_frame_, &client_, nullptr, delegate_.AsWeakPtr(),
126 base::WrapUnique(new DefaultRendererFactory( 126 base::MakeUnique<DefaultRendererFactory>(
127 media_log_, nullptr, DefaultRendererFactory::GetGpuFactoriesCB())), 127 media_log_, nullptr, DefaultRendererFactory::GetGpuFactoriesCB()),
128 url_index_, 128 url_index_,
129 WebMediaPlayerParams( 129 WebMediaPlayerParams(
130 WebMediaPlayerParams::DeferLoadCB(), 130 WebMediaPlayerParams::DeferLoadCB(),
131 scoped_refptr<SwitchableAudioRendererSink>(), media_log_, 131 scoped_refptr<SwitchableAudioRendererSink>(), media_log_,
132 media_thread_.task_runner(), message_loop_.task_runner(), 132 media_thread_.task_runner(), message_loop_.task_runner(),
133 message_loop_.task_runner(), WebMediaPlayerParams::Context3DCB(), 133 message_loop_.task_runner(), WebMediaPlayerParams::Context3DCB(),
134 base::Bind(&OnAdjustAllocatedMemory), nullptr, nullptr, nullptr))); 134 base::Bind(&OnAdjustAllocatedMemory), nullptr, nullptr, nullptr)));
135 } 135 }
136 136
137 ~WebMediaPlayerImplTest() override { 137 ~WebMediaPlayerImplTest() override {
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 EXPECT_CALL(delegate_, IsPlayingBackgroundVideo()).WillOnce(Return(false)); 579 EXPECT_CALL(delegate_, IsPlayingBackgroundVideo()).WillOnce(Return(false));
580 EXPECT_CALL(delegate_, IsHidden()).WillRepeatedly(Return(true)); 580 EXPECT_CALL(delegate_, IsHidden()).WillRepeatedly(Return(true));
581 581
582 state = ComputeBackgroundedPlayState(); 582 state = ComputeBackgroundedPlayState();
583 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PAUSED, state.delegate_state); 583 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PAUSED, state.delegate_state);
584 EXPECT_FALSE(state.is_memory_reporting_enabled); 584 EXPECT_FALSE(state.is_memory_reporting_enabled);
585 EXPECT_TRUE(state.is_suspended); 585 EXPECT_TRUE(state.is_suspended);
586 } 586 }
587 587
588 } // namespace media 588 } // namespace media
OLDNEW
« no previous file with comments | « media/base/stream_parser_buffer.cc ('k') | media/capture/video/fake_video_capture_device_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698