Move MockFFmpeg instance setting into the constructor/destructor.

media/filters/bitstream_converter_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "media/base/mock_ffmpeg.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/bitstream_converter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::DoAll;
 using ::testing::Mock;
 using ::testing::Return;
 using ::testing::ReturnNull;
 using ::testing::SetArgumentPointee;
 using ::testing::StrEq;
 using ::testing::StrictMock;
 using ::testing::_;
 
 namespace media {
 
 class BitstreamConverterTest : public testing::Test {
  protected:
   BitstreamConverterTest() {
-    // Initialize MockFFmpeg.
-    MockFFmpeg::set(&mock_ffmpeg_);
-
     memset(&test_stream_context_, 0, sizeof(test_stream_context_));
     memset(&test_filter_, 0, sizeof(test_filter_));
     memset(&test_packet_, 0, sizeof(test_packet_));
     test_packet_.data = kData1;
     test_packet_.size = kTestSize1;
   }
 
-  virtual ~BitstreamConverterTest() {
-    // Reset MockFFmpeg.
-    MockFFmpeg::set(NULL);
-  }
+  virtual ~BitstreamConverterTest() {}
 
   AVCodecContext test_stream_context_;
   AVBitStreamFilterContext test_filter_;
   AVPacket test_packet_;
 
   StrictMock<MockFFmpeg> mock_ffmpeg_;
 
   static const char kTestFilterName[];
   static uint8_t kData1[];
   static uint8_t kData2[];
@@ skipping 110 matching lines @@
   EXPECT_EQ(kData1, test_packet_.data);
   EXPECT_EQ(kTestSize1, test_packet_.size);
   EXPECT_TRUE(test_packet_.destruct == NULL);
 
   // Uninject mock filter instance to avoid cleanup code on destruction of
   // converter.
   converter.stream_filter_ = NULL;
 }
 
 }  // namespace media