Move Renderer permanent callbacks into RendererClient interface.

media/renderers/renderer_impl_unittest.cc

Index: media/renderers/renderer_impl_unittest.cc
diff --git a/media/renderers/renderer_impl_unittest.cc b/media/renderers/renderer_impl_unittest.cc
index 38748577e8ea97f2fd58e55454751c2bb3d13410..531001f34b5b8d65bebe03586b893c8a63427d95 100644
--- a/media/renderers/renderer_impl_unittest.cc
+++ b/media/renderers/renderer_impl_unittest.cc
@@ -42,18 +42,21 @@ class RendererImplTest : public ::testing::Test {
  public:
   // Used for setting expectations on pipeline callbacks. Using a StrictMock
   // also lets us test for missing callbacks.
-  class CallbackHelper {
+  class CallbackHelper : public RendererClient {
    public:
     CallbackHelper() {}
     virtual ~CallbackHelper() {}
 
-    MOCK_METHOD1(OnInitialize, void(PipelineStatus));
-    MOCK_METHOD0(OnFlushed, void());
+    // RendererClient implementation.
+    MOCK_METHOD1(OnError, void(PipelineStatus status));
     MOCK_METHOD0(OnEnded, void());
-    MOCK_METHOD1(OnError, void(PipelineStatus));
-    MOCK_METHOD1(OnUpdateStatistics, void(const PipelineStatistics&));
+    MOCK_METHOD1(OnStatistics, void(const PipelineStatistics&));
     MOCK_METHOD1(OnBufferingStateChange, void(BufferingState));
     MOCK_METHOD0(OnWaitingForDecryptionKey, void());

[xhwang, 2016/05/09 18:13:23]

Can you use the new MockRendererClient with StrictMock?

[alokp, 2016/05/09 21:31:44]

Do you mean derive from MockRendererClient instead of RendererClient so that we
do not have to mock these functions again?

[xhwang, 2016/05/12 20:51:18]

The reason we use CallbackHelper is that we can use StrictMock on it to check
missing callbacks. Now we already have a MockRendererClient, we should be able
to use StrictMock<MockRendererClient> member directly, similar to these below:

std::unique_ptr<StrictMock<MockDemuxer>> demuxer_;
StrictMock<MockVideoRenderer>* video_renderer_;

Please use MockRendererClient in other tests as well where applicable.

+
+    // Completion callbacks.
+    MOCK_METHOD1(OnInitialize, void(PipelineStatus));
+    MOCK_METHOD0(OnFlushed, void());
     MOCK_METHOD1(OnCdmAttached, void(bool));
 
    private:
@@ -105,8 +108,7 @@ class RendererImplTest : public ::testing::Test {
 
   // Sets up expectations to allow the video renderer to initialize.
   void SetVideoRendererInitializeExpectations(PipelineStatus status) {
-    EXPECT_CALL(*video_renderer_,
-                Initialize(video_stream_.get(), _, _, _, _, _, _, _, _))
+    EXPECT_CALL(*video_renderer_, Initialize(_, video_stream_.get(), _, _, _))
         .WillOnce(DoAll(SaveArg<4>(&video_buffering_state_cb_),
                         SaveArg<5>(&video_ended_cb_), RunCallback<1>(status)));
   }