Added new gmock-based MockFilterHost and deprecated the old one.

media/filters/ffmpeg_demuxer_unittest.cc

 // Copyright (c) 2009 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 "media/base/filters.h"
 #include "media/base/mock_ffmpeg.h"
 #include "media/base/mock_filter_host.h"
 #include "media/base/mock_filters.h"
@@ skipping 53 matching lines @@
     media_format.SetAsString(MediaFormat::kMimeType,
                              mime_type::kApplicationOctetStream);
     demuxer_ = factory_->Create<FFmpegDemuxer>(media_format);
     DCHECK(demuxer_);
 
     // Provide a message loop.
     demuxer_->SetMessageLoop(&message_loop_);
 
     // Prepare a filter host and data source for the demuxer.
     pipeline_.reset(new MockPipeline());
-    filter_host_.reset(new MockFilterHost<Demuxer>(pipeline_.get(), demuxer_));
+    filter_host_.reset(new old_mocks::MockFilterHost<Demuxer>(pipeline_.get(),
+                                                              demuxer_));
     data_source_ = new StrictMock<MockDataSource>();
 
     // Initialize FFmpeg fixtures.
     memset(&format_context_, 0, sizeof(format_context_));
     memset(&streams_, 0, sizeof(streams_));
     memset(&codecs_, 0, sizeof(codecs_));
 
     // Initialize AVCodexContext structures.
     codecs_[AV_STREAM_DATA].codec_type = CODEC_TYPE_DATA;
     codecs_[AV_STREAM_DATA].codec_id = CODEC_ID_NONE;
@@ skipping 56 matching lines @@
     message_loop_.RunAllPending();
     EXPECT_TRUE(filter_host_->WaitForInitialized());
     EXPECT_TRUE(filter_host_->IsInitialized());
     EXPECT_EQ(PIPELINE_OK, pipeline_->GetError());
   }
 
   // Fixture members.
   scoped_refptr<FilterFactory> factory_;
   scoped_refptr<FFmpegDemuxer> demuxer_;
   scoped_ptr<MockPipeline> pipeline_;
-  scoped_ptr<MockFilterHost<Demuxer> > filter_host_;
+  scoped_ptr<old_mocks::MockFilterHost<Demuxer> > filter_host_;
   scoped_refptr<StrictMock<MockDataSource> > data_source_;
   MessageLoop message_loop_;
 
   // FFmpeg fixtures.
   AVFormatContext format_context_;
   AVCodecContext codecs_[AV_STREAM_MAX];
   AVStream streams_[AV_STREAM_MAX];
   MockFFmpeg mock_ffmpeg_;
 
  private:
@@ skipping 487 matching lines @@
 
   // Attempt the read...
   audio->Read(callback.release());
   message_loop_.RunAllPending();
 
   // ...and verify that |callback| was deleted.
   MockFFmpeg::get()->CheckPoint(1);
 }
 
 }  // namespace media