Updated FFmpegDemuxerTest and FFmpegVideoDecoderTest to use the gmock-based MockFilterHost.

media/base/mock_filter_host.h

Index: media/base/mock_filter_host.h
diff --git a/media/base/mock_filter_host.h b/media/base/mock_filter_host.h
index 3cc58607bb66c2af337cabd0d156d60892f87795..c926437200cf52bd73403b5cb8fcfd13f901766b 100644
--- a/media/base/mock_filter_host.h
+++ b/media/base/mock_filter_host.h
@@ -5,9 +5,6 @@
 // A FilterHost implementation based on gmock.  Combined with setting a message
 // loop on a filter, permits single-threaded testing of filters without
 // requiring a pipeline.
-//
-// TODO(scherkus): Remove old_mocks::MockFilterHost as soon as other tests have
-// transitioned over to the new gmock-based MockFilterHost.
 
 #ifndef MEDIA_BASE_MOCK_FILTER_HOST_H_
 #define MEDIA_BASE_MOCK_FILTER_HOST_H_
@@ -20,7 +17,6 @@
 #include "media/base/filter_host.h"
 #include "media/base/filters.h"
 #include "media/base/media_format.h"
-#include "media/base/mock_pipeline.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -45,109 +41,6 @@ class MockFilterHost : public FilterHost {
   DISALLOW_COPY_AND_ASSIGN(MockFilterHost);
 };
 
-namespace old_mocks {
-
-// This version is deprecated.
-template <class Filter>
-class MockFilterHost : public FilterHost {
- public:
-  MockFilterHost(MockPipeline* mock_pipeline, Filter* filter)
-      : mock_pipeline_(mock_pipeline),
-        filter_(filter),
-        initialized_(false),
-        error_(PIPELINE_OK),
-        wait_for_initialized_(false, false),
-        wait_for_error_(false, false) {
-    EXPECT_TRUE(mock_pipeline_);
-    EXPECT_TRUE(filter_);
-    filter_->SetFilterHost(this);
-  }
-
-  virtual ~MockFilterHost() {}
-
-  virtual void InitializationComplete() {
-    EXPECT_FALSE(initialized_);
-    initialized_ = true;
-    wait_for_initialized_.Signal();
-  }
-
-  virtual void Error(PipelineError error) {
-    error_ = error;
-    mock_pipeline_->Error(error);
-    wait_for_error_.Signal();
-  }
-
-  virtual base::TimeDelta GetTime() const {
-    return mock_pipeline_->GetTime();
-  }
-
-  virtual void SetTime(base::TimeDelta time) {
-    mock_pipeline_->SetTime(time);
-  }
-
-  virtual void SetDuration(base::TimeDelta duration) {
-    mock_pipeline_->SetDuration(duration);
-  }
-
-  virtual void SetBufferedTime(base::TimeDelta buffered_time) {
-    mock_pipeline_->SetBufferedTime(buffered_time);
-  }
-
-  virtual void SetTotalBytes(int64 total_bytes) {
-    mock_pipeline_->SetTotalBytes(total_bytes);
-  }
-
-  virtual void SetBufferedBytes(int64 buffered_bytes) {
-    mock_pipeline_->SetBufferedBytes(buffered_bytes);
-  }
-
-  virtual void SetVideoSize(size_t width, size_t height) {
-    mock_pipeline_->SetVideoSize(width, height);
-  }
-
-  bool IsInitialized() const {
-    return initialized_;
-  }
-
-  bool WaitForInitialized() {
-    const base::TimeDelta kTimedWait = base::TimeDelta::FromMilliseconds(500);
-    while (!initialized_) {
-      if (!wait_for_initialized_.TimedWait(kTimedWait)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  bool WaitForError(PipelineError error) {
-    const base::TimeDelta kTimedWait = base::TimeDelta::FromMilliseconds(500);
-    while (error_ != error) {
-      if (!wait_for_error_.TimedWait(kTimedWait)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
- private:
-  MockPipeline* mock_pipeline_;
-  scoped_refptr<Filter> filter_;
-
-  // Tracks if the filter has executed InitializationComplete().
-  bool initialized_;
-
-  // Tracks the last pipeline error set by the filter.
-  PipelineError error_;
-
-  // Allows unit tests to wait for particular conditions before asserting.
-  base::WaitableEvent wait_for_initialized_;
-  base::WaitableEvent wait_for_error_;
-
-  DISALLOW_COPY_AND_ASSIGN(MockFilterHost);
-};
-
-}  // namespace old_mocks
-
 }  // namespace media
 
 #endif  // MEDIA_BASE_MOCK_FILTER_HOST_H_