Remove MessageLoop methods from Filter interface

media/filters/ffmpeg_demuxer_unittest.cc

 // Copyright (c) 2010 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 <deque>
 
 #include "base/callback.h"
 #include "base/threading/thread.h"
 #include "media/base/filters.h"
 #include "media/base/mock_ffmpeg.h"
@@ skipping 47 matching lines @@
   static const int kWidth;
   static const int kHeight;
 
   static const size_t kDataSize;
   static const uint8 kAudioData[];
   static const uint8 kVideoData[];
   static const uint8* kNullData;
 
   FFmpegDemuxerTest() {
     // Create an FFmpegDemuxer.
-    demuxer_ = new FFmpegDemuxer();
+    demuxer_ = new FFmpegDemuxer(&message_loop_);
     DCHECK(demuxer_);
 
     // Inject a filter host and message loop and prepare a data source.
     demuxer_->set_host(&host_);
-    demuxer_->set_message_loop(&message_loop_);
     data_source_ = new StrictMock<MockDataSource>();
 
     // Initialize FFmpeg fixtures.
     memset(&format_context_, 0, sizeof(format_context_));
     memset(&input_format_, 0, sizeof(input_format_));
     memset(&streams_, 0, sizeof(streams_));
     memset(&codecs_, 0, sizeof(codecs_));
 
     // Initialize AVCodecContext structures.
     codecs_[AV_STREAM_DATA].codec_type = CODEC_TYPE_DATA;
@@ skipping 547 matching lines @@
   ASSERT_TRUE(video);
 
   // Attempt a read from the video stream and run the message loop until done.
   scoped_refptr<DemuxerStreamReader> reader(new DemuxerStreamReader());
   reader->Read(video);
   message_loop_.RunAllPending();
 }
 
 class MockFFmpegDemuxer : public FFmpegDemuxer {
  public:
-  MockFFmpegDemuxer() {}
+  MockFFmpegDemuxer(MessageLoop* message_loop) :
+      FFmpegDemuxer(message_loop) {
+  }
   virtual ~MockFFmpegDemuxer() {}
 
   MOCK_METHOD0(WaitForRead, size_t());
   MOCK_METHOD1(SignalReadCompleted, void(size_t size));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockFFmpegDemuxer);
 };
 
 // A gmock helper method to execute the callback and deletes it.
 void RunCallback(size_t size, DataSource::ReadCallback* callback) {
   DCHECK(callback);
   callback->RunWithParams(Tuple1<size_t>(size));
   delete callback;
 }
 
 TEST_F(FFmpegDemuxerTest, ProtocolRead) {
   // Creates a demuxer.
-  scoped_refptr<MockFFmpegDemuxer> demuxer(new MockFFmpegDemuxer());
+  scoped_refptr<MockFFmpegDemuxer> demuxer(
+      new MockFFmpegDemuxer(&message_loop_));
   ASSERT_TRUE(demuxer);
   demuxer->set_host(&host_);
-  demuxer->set_message_loop(&message_loop_);
   demuxer->data_source_ = data_source_;
 
   uint8 kBuffer[1];
   InSequence s;
   // Actions taken in the first read.
   EXPECT_CALL(*data_source_, GetSize(_))
       .WillOnce(DoAll(SetArgumentPointee<0>(1024), Return(true)));
   EXPECT_CALL(*data_source_, Read(0, 512, kBuffer, NotNull()))
       .WillOnce(WithArgs<1, 3>(Invoke(&RunCallback)));
   EXPECT_CALL(*demuxer, SignalReadCompleted(512));
@@ skipping 81 matching lines @@
   {
     SCOPED_TRACE("");
     InitializeDemuxer();
   }
   EXPECT_CALL(*data_source_, IsStreaming())
       .WillOnce(Return(false));
   EXPECT_FALSE(demuxer_->IsStreaming());
 }
 
 }  // namespace media