Big media::Pipeline cleanup.

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 0c1ae43c787ba6f377c178e1c42a5fb6d877ca64..d6fde0bf77e7e26c546975e218c4350812b61bdd 100644
--- a/media/base/mock_filter_host.h
+++ b/media/base/mock_filter_host.h
@@ -40,18 +40,6 @@ class MockFilterHost : public FilterHost {
 
   virtual ~MockFilterHost() {}
 
-  virtual const PipelineStatus* GetPipelineStatus() const {
-    return mock_pipeline_;
-  }
-
-  virtual void SetTimeUpdateCallback(Callback1<base::TimeDelta>::Type* cb) {
-    time_update_callback_.reset(cb);
-  }
-
-  virtual void ScheduleTimeUpdateCallback(base::TimeDelta time) {
-    scheduled_callback_time_ = time;
-  }
-
   virtual void InitializationComplete() {
     EXPECT_FALSE(initialized_);
     initialized_ = true;
@@ -64,6 +52,10 @@ class MockFilterHost : public FilterHost {
     wait_for_error_.Signal();
   }
 
+  virtual base::TimeDelta GetTime() const {
+    return mock_pipeline_->GetTime();
+  }
+
   virtual void SetTime(base::TimeDelta time) {
     mock_pipeline_->SetTime(time);
   }
@@ -88,15 +80,6 @@ class MockFilterHost : public FilterHost {
     mock_pipeline_->SetVideoSize(width, height);
   }
 
-  // Used by unit tests to manipulate the filter.
-  base::TimeDelta GetScheduledCallbackTime() const {
-    return scheduled_callback_time_;
-  }
-
-  Callback1<base::TimeDelta>::Type* GetTimeUpdateCallback() const {
-    return time_update_callback_.get();
-  }
-
   bool IsInitialized() const {
     return initialized_;
   }
@@ -124,10 +107,6 @@ class MockFilterHost : public FilterHost {
  private:
   MockPipeline* mock_pipeline_;
   scoped_refptr<Filter> filter_;
-  scoped_ptr<Callback1<base::TimeDelta>::Type> time_update_callback_;
-
-  // Keeps track of the time passed into ScheduleTimeUpdateCallback().
-  base::TimeDelta scheduled_callback_time_;
 
   // Tracks if the filter has executed InitializationComplete().
   bool initialized_;