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

Unified Diff: media/filters/source_buffer_state_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/filters/source_buffer_state.cc ('k') | media/filters/source_buffer_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/source_buffer_state_unittest.cc
diff --git a/media/filters/source_buffer_state_unittest.cc b/media/filters/source_buffer_state_unittest.cc
index f0ed97d64c96b1a5e46d85ca89497dbdb3211778..3cd7759eece81d11c4aa0616cee22d0506e0a35f 100644
--- a/media/filters/source_buffer_state_unittest.cc
+++ b/media/filters/source_buffer_state_unittest.cc
@@ -55,21 +55,19 @@ void InvokeCbAndSaveResult(const base::Callback<bool()>& cb, bool* result) {
class SourceBufferStateTest : public ::testing::Test {
public:
- SourceBufferStateTest()
- : media_log_(new testing::StrictMock<MockMediaLog>()),
- mock_stream_parser_(nullptr) {}
+ SourceBufferStateTest() : mock_stream_parser_(nullptr) {}
std::unique_ptr<SourceBufferState> CreateSourceBufferState() {
std::unique_ptr<FrameProcessor> frame_processor = base::WrapUnique(
new FrameProcessor(base::Bind(&SourceBufferStateTest::OnUpdateDuration,
base::Unretained(this)),
- media_log_));
+ &media_log_));
mock_stream_parser_ = new testing::StrictMock<MockStreamParser>();
return base::WrapUnique(new SourceBufferState(
base::WrapUnique(mock_stream_parser_), std::move(frame_processor),
base::Bind(&SourceBufferStateTest::CreateDemuxerStream,
base::Unretained(this)),
- media_log_));
+ &media_log_));
}
std::unique_ptr<SourceBufferState> CreateAndInitSourceBufferState(
@@ -132,7 +130,7 @@ class SourceBufferStateTest : public ::testing::Test {
return demuxer_streams_.back().get();
}
- scoped_refptr<testing::StrictMock<MockMediaLog>> media_log_;
+ testing::StrictMock<MockMediaLog> media_log_;
std::vector<std::unique_ptr<ChunkDemuxerStream>> demuxer_streams_;
MockStreamParser* mock_stream_parser_;
StreamParser::NewConfigCB new_config_cb_;
« no previous file with comments | « media/filters/source_buffer_state.cc ('k') | media/filters/source_buffer_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698