Revert of MSE: Verify MediaLog events created by existing MP4 unit tests

media/formats/mp4/track_run_iterator_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_split.h"
-#include "media/base/mock_media_log.h"
 #include "media/formats/mp4/box_definitions.h"
 #include "media/formats/mp4/rcheck.h"
 #include "media/formats/mp4/track_run_iterator.h"
-#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using ::testing::StrictMock;
-
 // The sum of the elements in a vector initialized with SumAscending,
 // less the value of the last element.
 static const int kSumAscending1 = 45;
 
 static const int kAudioScale = 48000;
 static const int kVideoScale = 25;
 
 static const uint8 kAuxInfo[] = {
   0x41, 0x54, 0x65, 0x73, 0x74, 0x49, 0x76, 0x31,
   0x41, 0x54, 0x65, 0x73, 0x74, 0x49, 0x76, 0x32,
@@ skipping 18 matching lines @@
 };
 
 static const uint8 kFragmentCencSampleGroupKeyId[] = {
   0x6b, 0x46, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e,
   0x74, 0x43, 0x65, 0x6e, 0x63, 0x53, 0x61, 0x6d
 };
 
 namespace media {
 namespace mp4 {
 
-MATCHER(ReservedValueInSampleDependencyInfo, "") {
-  return CONTAINS_STRING(arg, "Reserved value used in sample dependency info.");
-}
-
 class TrackRunIteratorTest : public testing::Test {
  public:
-  TrackRunIteratorTest() : media_log_(new StrictMock<MockMediaLog>()) {
-    CreateMovie();
-  }
+  TrackRunIteratorTest() : media_log_(new MediaLog()) { CreateMovie(); }
 
  protected:
   Movie moov_;
-  scoped_refptr<StrictMock<MockMediaLog>> media_log_;
+  scoped_refptr<MediaLog> media_log_;
   scoped_ptr<TrackRunIterator> iter_;
 
   void CreateMovie() {
     moov_.header.timescale = 1000;
     moov_.tracks.resize(3);
     moov_.extends.tracks.resize(2);
     moov_.tracks[0].header.track_id = 1;
     moov_.tracks[0].media.header.timescale = kAudioScale;
     SampleDescription& desc1 =
         moov_.tracks[0].media.information.sample_table.description;
@@ skipping 313 matching lines @@
 
   ASSERT_TRUE(iter_->Init(moof));
   EXPECT_EQ("1 KR KR KR KR KR KR KR KR KR KR", KeyframeAndRAPInfo(iter_.get()));
 
   iter_->AdvanceRun();
   EXPECT_EQ("2 KR P P P P P P P P P", KeyframeAndRAPInfo(iter_.get()));
 }
 
 // Verify that parsing fails if a reserved value is in the sample flags.
 TEST_F(TrackRunIteratorTest, SampleInfoTest_ReservedInSampleFlags) {
-  EXPECT_MEDIA_LOG(ReservedValueInSampleDependencyInfo());
   iter_.reset(new TrackRunIterator(&moov_, media_log_));
   MovieFragment moof = CreateFragment();
   // Change the "depends on" field on one of the samples to a
   // reserved value.
   moof.tracks[1].runs[0].sample_flags[0] = ToSampleFlags("RS");
   ASSERT_FALSE(iter_->Init(moof));
 }
 
 // Verify that parsing fails if a reserved value is in the default sample flags.
 TEST_F(TrackRunIteratorTest, SampleInfoTest_ReservedInDefaultSampleFlags) {
-  EXPECT_MEDIA_LOG(ReservedValueInSampleDependencyInfo());
   iter_.reset(new TrackRunIterator(&moov_, media_log_));
   MovieFragment moof = CreateFragment();
   // Set the default flag to contain a reserved "depends on" value.
   moof.tracks[0].header.default_sample_flags = ToSampleFlags("RN");
   ASSERT_FALSE(iter_->Init(moof));
 }
 
 TEST_F(TrackRunIteratorTest, ReorderingTest) {
   // Test frame reordering and edit list support. The frames have the following
   // decode timestamps:
@@ skipping 295 matching lines @@
 
   iter_->AdvanceRun();
 
   // Verify that nothing is marked as a random access point.
   EXPECT_EQ("2 KR P PR P KR K", KeyframeAndRAPInfo(iter_.get()));
 }
 
 
 }  // namespace mp4
 }  // namespace media