| Index: media/formats/mp4/box_reader_unittest.cc
|
| diff --git a/media/formats/mp4/box_reader_unittest.cc b/media/formats/mp4/box_reader_unittest.cc
|
| index 62284e8a52b5cec873e1f8febb243cf11c8cfb55..e4fff265b54c1c49ed34918f2255317c32b5b311 100644
|
| --- a/media/formats/mp4/box_reader_unittest.cc
|
| +++ b/media/formats/mp4/box_reader_unittest.cc
|
| @@ -86,7 +86,7 @@ TEST_F(BoxReaderTest, ExpectedOperationTest) {
|
| std::vector<uint8> buf = GetBuf();
|
| bool err;
|
| scoped_ptr<BoxReader> reader(
|
| - BoxReader::ReadTopLevelBox(&buf[0], buf.size(), LogCB(), &err));
|
| + BoxReader::ReadTopLevelBox(&buf[0], buf.size(), new MediaLog(), &err));
|
| EXPECT_FALSE(err);
|
| EXPECT_TRUE(reader.get());
|
|
|
| @@ -113,8 +113,8 @@ TEST_F(BoxReaderTest, OuterTooShortTest) {
|
| bool err;
|
|
|
| // Create a soft failure by truncating the outer box.
|
| - scoped_ptr<BoxReader> r(
|
| - BoxReader::ReadTopLevelBox(&buf[0], buf.size() - 2, LogCB(), &err));
|
| + scoped_ptr<BoxReader> r(BoxReader::ReadTopLevelBox(&buf[0], buf.size() - 2,
|
| + new MediaLog(), &err));
|
|
|
| EXPECT_FALSE(err);
|
| EXPECT_FALSE(r.get());
|
| @@ -127,7 +127,7 @@ TEST_F(BoxReaderTest, InnerTooLongTest) {
|
| // Make an inner box too big for its outer box.
|
| buf[25] = 1;
|
| scoped_ptr<BoxReader> reader(
|
| - BoxReader::ReadTopLevelBox(&buf[0], buf.size(), LogCB(), &err));
|
| + BoxReader::ReadTopLevelBox(&buf[0], buf.size(), new MediaLog(), &err));
|
|
|
| SkipBox box;
|
| EXPECT_FALSE(box.Parse(reader.get()));
|
| @@ -140,7 +140,7 @@ TEST_F(BoxReaderTest, WrongFourCCTest) {
|
| // Set an unrecognized top-level FourCC.
|
| buf[5] = 1;
|
| scoped_ptr<BoxReader> reader(
|
| - BoxReader::ReadTopLevelBox(&buf[0], buf.size(), LogCB(), &err));
|
| + BoxReader::ReadTopLevelBox(&buf[0], buf.size(), new MediaLog(), &err));
|
| EXPECT_FALSE(reader.get());
|
| EXPECT_TRUE(err);
|
| }
|
| @@ -149,7 +149,7 @@ TEST_F(BoxReaderTest, ScanChildrenTest) {
|
| std::vector<uint8> buf = GetBuf();
|
| bool err;
|
| scoped_ptr<BoxReader> reader(
|
| - BoxReader::ReadTopLevelBox(&buf[0], buf.size(), LogCB(), &err));
|
| + BoxReader::ReadTopLevelBox(&buf[0], buf.size(), new MediaLog(), &err));
|
|
|
| EXPECT_TRUE(reader->SkipBytes(16) && reader->ScanChildren());
|
|
|
| @@ -173,7 +173,7 @@ TEST_F(BoxReaderTest, ReadAllChildrenTest) {
|
| buf[3] = 0x38;
|
| bool err;
|
| scoped_ptr<BoxReader> reader(
|
| - BoxReader::ReadTopLevelBox(&buf[0], buf.size(), LogCB(), &err));
|
| + BoxReader::ReadTopLevelBox(&buf[0], buf.size(), new MediaLog(), &err));
|
|
|
| std::vector<PsshBox> kids;
|
| EXPECT_TRUE(reader->SkipBytes(16) && reader->ReadAllChildren(&kids));
|
| @@ -187,7 +187,7 @@ static void TestTopLevelBox(const uint8* data, int size, uint32 fourCC) {
|
|
|
| bool err;
|
| scoped_ptr<BoxReader> reader(
|
| - BoxReader::ReadTopLevelBox(&buf[0], buf.size(), LogCB(), &err));
|
| + BoxReader::ReadTopLevelBox(&buf[0], buf.size(), new MediaLog(), &err));
|
|
|
| EXPECT_FALSE(err);
|
| EXPECT_TRUE(reader);
|
|
|