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

Unified Diff: media/formats/webm/webm_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/webm/webm_stream_parser.cc ('k') | media/formats/webm/webm_tracks_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/webm/webm_stream_parser_unittest.cc
diff --git a/media/formats/webm/webm_stream_parser_unittest.cc b/media/formats/webm/webm_stream_parser_unittest.cc
index 1251f2d8a4f3cc458ea5da1cd93e82a4f18de9a4..b1d3eaa506f18ac5b1b3fab6911e4d06b2f9bc37 100644
--- a/media/formats/webm/webm_stream_parser_unittest.cc
+++ b/media/formats/webm/webm_stream_parser_unittest.cc
@@ -23,8 +23,7 @@ namespace media {
class WebMStreamParserTest : public testing::Test {
public:
- WebMStreamParserTest()
- : media_log_(new testing::StrictMock<MockMediaLog>()) {}
+ WebMStreamParserTest() {}
protected:
void ParseWebMFile(const std::string& filename,
@@ -52,7 +51,7 @@ class WebMStreamParserTest : public testing::Test {
base::Unretained(this)),
base::Bind(&WebMStreamParserTest::EndMediaSegmentCB,
base::Unretained(this)),
- media_log_);
+ &media_log_);
bool result = parser_->Parse(buffer->data(), buffer->data_size());
EXPECT_TRUE(result);
}
@@ -86,7 +85,7 @@ class WebMStreamParserTest : public testing::Test {
MOCK_METHOD0(NewMediaSegmentCB, void());
MOCK_METHOD0(EndMediaSegmentCB, void());
- scoped_refptr<testing::StrictMock<MockMediaLog>> media_log_;
+ testing::StrictMock<MockMediaLog> media_log_;
std::unique_ptr<WebMStreamParser> parser_;
std::unique_ptr<MediaTracks> media_tracks_;
};
« no previous file with comments | « media/formats/webm/webm_stream_parser.cc ('k') | media/formats/webm/webm_tracks_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698