Revert 75444 - Move MockFFmpeg instance setting into the constructor/destruct...

media/filters/ffmpeg_glue_unittest.cc

Index: media/filters/ffmpeg_glue_unittest.cc
===================================================================
--- media/filters/ffmpeg_glue_unittest.cc	(revision 75447)
+++ media/filters/ffmpeg_glue_unittest.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -36,9 +36,12 @@
 
 class FFmpegGlueTest : public ::testing::Test {
  public:
-  FFmpegGlueTest() {}
+  FFmpegGlueTest() {
+  }
 
   virtual void SetUp() {
+    MockFFmpeg::set(&mock_ffmpeg_);
+
     // Singleton should initialize FFmpeg.
     CHECK(FFmpegGlue::GetInstance());
 
@@ -47,6 +50,10 @@
     CHECK(protocol_);
   }
 
+  virtual void TearDown() {
+    MockFFmpeg::set(NULL);
+  }
+
   // Helper to open a URLContext pointing to the given mocked protocol.
   // Callers are expected to close the context at the end of their test.
   virtual void OpenContext(MockProtocol* protocol, URLContext* context) {