Merge 70669 - Don't uninitialize FFmpegVideoDecodeEngine if we haven't initia...

media/filters/ffmpeg_video_decoder_unittest.cc

 // Copyright (c) 2010 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 <deque>
 
 #include "base/callback.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "media/base/data_buffer.h"
@@ skipping 142 matching lines @@
     stream_.r_frame_rate.num = 1;
     stream_.r_frame_rate.den = 1;
     buffer_ = new DataBuffer(1);
     end_of_stream_buffer_ = new DataBuffer(0);
 
     // Initialize MockFFmpeg.
     MockFFmpeg::set(&mock_ffmpeg_);
   }
 
   virtual ~FFmpegVideoDecoderTest() {
-    // We had to set this because not all tests had initialized the engine.
-    engine_->event_handler_ = decoder_.get();
     EXPECT_CALL(callback_, OnFilterCallback());
     EXPECT_CALL(callback_, OnCallbackDestroyed());
-    EXPECT_CALL(*engine_, Uninitialize())
-        .WillOnce(EngineUninitialize(engine_));
+
+    // The presence of an event handler means we need to uninitialize.
+    if (engine_->event_handler_) {
+      EXPECT_CALL(*engine_, Uninitialize())
+          .WillOnce(EngineUninitialize(engine_));
+    }
+
     decoder_->Stop(callback_.NewCallback());
 
     // Finish up any remaining tasks.
     message_loop_.RunAllPending();
 
     // Reset MockFFmpeg.
     MockFFmpeg::set(NULL);
   }
 
   void InitializeDecoderSuccessfully() {
@@ skipping 325 matching lines @@
     EXPECT_CALL(seek_done_cb, OnCallbackDestroyed());
     decoder_->Seek(kZero, seek_done_cb.NewCallback());
 
 
     EXPECT_TRUE(decoder_->pts_heap_.IsEmpty());
     EXPECT_EQ(FFmpegVideoDecoder::kNormal, decoder_->state_);
   }
 }
 
 }  // namespace media