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

Unified Diff: media/formats/mp4/mp4_stream_parser_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/formats/mp4/mp4_stream_parser.cc ('k') | media/formats/mp4/track_run_iterator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/mp4/mp4_stream_parser_unittest.cc
diff --git a/media/formats/mp4/mp4_stream_parser_unittest.cc b/media/formats/mp4/mp4_stream_parser_unittest.cc
index ba323793e4f65a549ee39691eec718385ff5a325..59a8dcb5aec5372e853d4782bb7da15aef6727d3 100644
--- a/media/formats/mp4/mp4_stream_parser_unittest.cc
+++ b/media/formats/mp4/mp4_stream_parser_unittest.cc
@@ -51,8 +51,7 @@ MATCHER_P(ErrorLog, error_string, "") {
class MP4StreamParserTest : public testing::Test {
public:
MP4StreamParserTest()
- : media_log_(new StrictMock<MockMediaLog>()),
- configs_received_(false),
+ : configs_received_(false),
lower_bound_(
DecodeTimestamp::FromPresentationTime(base::TimeDelta::Max())) {
std::set<int> audio_object_types;
@@ -61,7 +60,7 @@ class MP4StreamParserTest : public testing::Test {
}
protected:
- scoped_refptr<StrictMock<MockMediaLog>> media_log_;
+ StrictMock<MockMediaLog> media_log_;
std::unique_ptr<MP4StreamParser> parser_;
bool configs_received_;
std::unique_ptr<MediaTracks> media_tracks_;
@@ -192,7 +191,7 @@ class MP4StreamParserTest : public testing::Test {
base::Bind(&MP4StreamParserTest::KeyNeededF, base::Unretained(this)),
base::Bind(&MP4StreamParserTest::NewSegmentF, base::Unretained(this)),
base::Bind(&MP4StreamParserTest::EndOfSegmentF, base::Unretained(this)),
- media_log_);
+ &media_log_);
}
StreamParser::InitParameters GetDefaultInitParametersExpectations() {
« no previous file with comments | « media/formats/mp4/mp4_stream_parser.cc ('k') | media/formats/mp4/track_run_iterator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698