Remove VideoDecoder::PrepareForShutdownHack() and friends.

content/renderer/media/capture_video_decoder_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "content/common/child_process.h"
 #include "content/renderer/media/capture_video_decoder.h"
 #include "content/renderer/media/video_capture_impl.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "media/base/limits.h"
@@ skipping 199 matching lines @@
   message_loop_->RunAllPending();
 
   Stop();
 }
 
 TEST_F(CaptureVideoDecoderTest, ReadAndShutdown) {
   // Test all the Read requests can be fullfilled (which is needed in order to
   // teardown the pipeline) even when there's no input frame.
   Initialize();
 
-  EXPECT_CALL(*this, FrameReady(media::VideoDecoder::kOk,
-                                HasSize(0, 0))).Times(2);
+  EXPECT_CALL(*this, FrameReady(media::VideoDecoder::kOk, HasSize(0, 0)));
   decoder_->Read(read_cb_);
-  decoder_->PrepareForShutdownHack();
+  Stop();
+
+  // Any read after stopping should be immediately satisfied.
+  EXPECT_CALL(*this, FrameReady(media::VideoDecoder::kOk, HasSize(0, 0)));
   decoder_->Read(read_cb_);
   message_loop_->RunAllPending();
-
-  Stop();
 }