Remove VideoDecoder::PrepareForShutdownHack() and friends.

content/renderer/media/rtc_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 "content/renderer/media/rtc_video_decoder.h"
 
 #include <deque>
 
 #include "base/bind.h"
 #include "base/memory/singleton.h"
@@ skipping 177 matching lines @@
     read_cb_ = base::Bind(&RTCVideoDecoderTest::FrameReady,
                           base::Unretained(this));
 
     DCHECK(decoder_);
 
     EXPECT_CALL(statistics_cb_, OnStatistics(_))
         .Times(AnyNumber());
   }
 
   virtual void TearDown() OVERRIDE {
-    EXPECT_CALL(*video_track_, RemoveRenderer(decoder_.get()));
-    decoder_->Stop(media::NewExpectedClosure());
-
-    message_loop_.RunAllPending();
-    EXPECT_EQ(RTCVideoDecoder::kStopped, decoder_->state_);
+    if (decoder_->state_ == RTCVideoDecoder::kStopped)
+      return;
+    Stop();
   }
 
   void InitializeDecoderSuccessfully() {
     EXPECT_CALL(*video_track_, AddRenderer(decoder_.get()));
     // Test successful initialization.
     decoder_->Initialize(
         NULL, NewExpectedStatusCB(PIPELINE_OK), NewStatisticsCB());
     message_loop_.RunAllPending();
   }
 
+  void Stop() {
+    EXPECT_CALL(*video_track_, RemoveRenderer(decoder_.get()));
+    decoder_->Stop(media::NewExpectedClosure());
+
+    message_loop_.RunAllPending();
+    EXPECT_EQ(RTCVideoDecoder::kStopped, decoder_->state_);
+  }
+
   StatisticsCB NewStatisticsCB() {
     return base::Bind(&MockStatisticsCB::OnStatistics,
                       base::Unretained(&statistics_cb_));
   }
 
   void RenderFrame() {
     NullVideoFrame video_frame;
     decoder_->RenderFrame(&video_frame);
   }
 
@@ skipping 77 matching lines @@
   RenderFrame();
   message_loop_.RunAllPending();
 }
 
 TEST_F(RTCVideoDecoderTest, 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.
   InitializeDecoderSuccessfully();
 
   EXPECT_CALL(*this, FrameReady(media::VideoDecoder::kOk,
-                                scoped_refptr<media::VideoFrame>())).Times(2);
+                                scoped_refptr<media::VideoFrame>()));
   decoder_->Read(read_cb_);
-  EXPECT_FALSE(decoder_->shutting_down_);
-  decoder_->PrepareForShutdownHack();
-  EXPECT_TRUE(decoder_->shutting_down_);
+  Stop();
+
+  // Any read after stopping should be immediately satisfied.
+  EXPECT_CALL(*this, FrameReady(media::VideoDecoder::kOk,
+                                scoped_refptr<media::VideoFrame>()));
   decoder_->Read(read_cb_);
-
   message_loop_.RunAllPending();
 }