Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / content / renderer / media / rtc_video_decoder_unittest.cc

diff --git a/src/content/renderer/media/rtc_video_decoder_unittest.cc b/src/content/renderer/media/rtc_video_decoder_unittest.cc
index 6f91756..240391d 100644 (file)
--- a/src/content/renderer/media/rtc_video_decoder_unittest.cc
+++ b/src/content/renderer/media/rtc_video_decoder_unittest.cc
@@ -43,7 +43,6 @@ class RTCVideoDecoderTest : public ::testing::Test,
     EXPECT_CALL(*mock_gpu_factories_,
                 DoCreateVideoDecodeAccelerator(media::VP8PROFILE_MAIN, _))
         .WillRepeatedly(Return(mock_vda_));
-    EXPECT_CALL(*mock_gpu_factories_, Abort()).WillRepeatedly(Return());
     EXPECT_CALL(*mock_gpu_factories_, CreateSharedMemory(_))
         .WillRepeatedly(Return(static_cast<base::SharedMemory*>(NULL)));
     EXPECT_CALL(*mock_vda_, Destroy());
@@ -53,15 +52,12 @@ class RTCVideoDecoderTest : public ::testing::Test,
 
   virtual void TearDown() OVERRIDE {
     VLOG(2) << "TearDown";
-    if (vda_thread_.IsRunning()) {
-      RunUntilIdle();  // Wait until all callbascks complete.
-      vda_task_runner_->DeleteSoon(FROM_HERE, rtc_decoder_.release());
-      // Make sure the decoder is released before stopping the thread.
-      RunUntilIdle();
-      vda_thread_.Stop();
-    } else {
-      rtc_decoder_.reset();
-    }
+    EXPECT_TRUE(vda_thread_.IsRunning());
+    RunUntilIdle();  // Wait until all callbascks complete.
+    vda_task_runner_->DeleteSoon(FROM_HERE, rtc_decoder_.release());
+    // Make sure the decoder is released before stopping the thread.
+    RunUntilIdle();
+    vda_thread_.Stop();
   }
 
   virtual int32_t Decoded(webrtc::I420VideoFrame& decoded_image) OVERRIDE {
@@ -166,8 +162,6 @@ TEST_F(RTCVideoDecoderTest, InitDecodeAfterRelease) {
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK, rtc_decoder_->Release());
 }
 
-TEST_F(RTCVideoDecoderTest, VdaThreadStops) { vda_thread_.Stop(); }
-
 TEST_F(RTCVideoDecoderTest, IsBufferAfterReset) {
   EXPECT_TRUE(rtc_decoder_->IsBufferAfterReset(0, RTCVideoDecoder::ID_INVALID));
   EXPECT_TRUE(rtc_decoder_->IsBufferAfterReset(RTCVideoDecoder::ID_LAST,