VideoRenderer: Fires all pending callbacks in dtor.

media/filters/video_renderer_impl_unittest.cc

Index: media/filters/video_renderer_impl_unittest.cc
diff --git a/media/filters/video_renderer_impl_unittest.cc b/media/filters/video_renderer_impl_unittest.cc
index 5bb5f30809756fda6bd77c5c297f5883d9f7b8b2..27a2bfe9552e9746719021de04fc563ee99877c4 100644
--- a/media/filters/video_renderer_impl_unittest.cc
+++ b/media/filters/video_renderer_impl_unittest.cc
@@ -26,10 +26,8 @@
 
 using ::testing::_;
 using ::testing::AnyNumber;
-using ::testing::AtLeast;
 using ::testing::Invoke;
 using ::testing::NiceMock;
-using ::testing::NotNull;
 using ::testing::Return;
 using ::testing::SaveArg;
 using ::testing::StrictMock;
@@ -357,13 +355,8 @@ TEST_F(VideoRendererImplTest, InitializeAndStartPlaying) {
   Destroy();
 }
 
-static void ExpectNotCalled(PipelineStatus) {
-  base::debug::StackTrace stack;
-  ADD_FAILURE() << "Expected callback not to be called\n" << stack.ToString();
-}
-
 TEST_F(VideoRendererImplTest, DestroyWhileInitializing) {
-  CallInitialize(base::Bind(&ExpectNotCalled), false, PIPELINE_OK);
+  CallInitialize(NewExpectedStatusCB(PIPELINE_ERROR_ABORT), false, PIPELINE_OK);
   Destroy();
 }
 
@@ -374,7 +367,7 @@ TEST_F(VideoRendererImplTest, DestroyWhileFlushing) {
   EXPECT_CALL(mock_cb_, BufferingStateChange(BUFFERING_HAVE_ENOUGH));
   StartPlaying();
   EXPECT_CALL(mock_cb_, BufferingStateChange(BUFFERING_HAVE_NOTHING));
-  renderer_->Flush(base::Bind(&ExpectNotCalled, PIPELINE_OK));
+  renderer_->Flush(NewExpectedClosure());
   Destroy();
 }