Moves video frame callbacks from VideoFrameCompositor to Renderer.

media/base/pipeline_impl_unittest.cc

Index: media/base/pipeline_impl_unittest.cc
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
index e6c062146e451c1628bf9c66c8b73b8cdf92a5e6..db4bda1fdbfdc99ecafdf49d06d03e8c42ad5427 100644
--- a/media/base/pipeline_impl_unittest.cc
+++ b/media/base/pipeline_impl_unittest.cc
@@ -77,7 +77,7 @@ class PipelineImplTest : public ::testing::Test {
  public:
   // Used for setting expectations on pipeline callbacks.  Using a StrictMock
   // also lets us test for missing callbacks.
-  class CallbackHelper : public Pipeline::Client {
+  class CallbackHelper : public MockPipelineClient {
    public:
     CallbackHelper() {}
     virtual ~CallbackHelper() {}
@@ -87,16 +87,6 @@ class PipelineImplTest : public ::testing::Test {
     MOCK_METHOD1(OnSuspend, void(PipelineStatus));
     MOCK_METHOD1(OnResume, void(PipelineStatus));
 
-    // Pipeline::Client overrides.
-    MOCK_METHOD1(OnError, void(PipelineStatus));
-    MOCK_METHOD0(OnEnded, void());
-    MOCK_METHOD1(OnMetadata, void(PipelineMetadata));
-    MOCK_METHOD1(OnBufferingStateChange, void(BufferingState));
-    MOCK_METHOD0(OnDurationChange, void());
-    MOCK_METHOD2(OnAddTextTrack,
-                 void(const TextTrackConfig&, const AddTextTrackDoneCB&));
-    MOCK_METHOD0(OnWaitingForDecryptionKey, void());
-
    private:
     DISALLOW_COPY_AND_ASSIGN(CallbackHelper);
   };