Move MockFFmpeg instance setting into the constructor/destructor.

media/filters/ffmpeg_glue_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 "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "media/base/mock_ffmpeg.h"
 #include "media/base/mock_filters.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_glue.h"
@@ skipping 18 matching lines @@
   MOCK_METHOD1(SetPosition, bool(int64 position));
   MOCK_METHOD1(GetSize, bool(int64* size_out));
   MOCK_METHOD0(IsStreaming, bool());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockProtocol);
 };
 
 class FFmpegGlueTest : public ::testing::Test {
  public:
-  FFmpegGlueTest() {
-  }
+  FFmpegGlueTest() {}
 
   virtual void SetUp() {
-    MockFFmpeg::set(&mock_ffmpeg_);
-
     // Singleton should initialize FFmpeg.
     CHECK(FFmpegGlue::GetInstance());
 
     // Assign our static copy of URLProtocol for the rest of the tests.
     protocol_ = MockFFmpeg::protocol();
     CHECK(protocol_);
   }
 
-  virtual void TearDown() {
-    MockFFmpeg::set(NULL);
-  }
+  virtual void TearDown() {}

[acolwell GONE FROM CHROMIUM, 2011/02/18 00:41:55]

Can we remove this?

[scherkus (not reviewing), 2011/02/18 20:48:12]

Sure can!

 
   // 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) {
     // IsStreaming() is called when opening.
     EXPECT_CALL(*protocol, IsStreaming()).WillOnce(Return(true));
 
     // Add the protocol to the glue layer and open a context.
     std::string key = FFmpegGlue::GetInstance()->AddProtocol(protocol);
     memset(context, 0, sizeof(*context));
@@ skipping 255 matching lines @@
 
   // Remove our own reference, we shouldn't be destroyed yet.
   mock_ffmpeg_.CheckPoint(0);
   protocol.reset();
 
   // ~FFmpegGlue() will be called when this unit test finishes execution.  By
   // leaving something inside FFmpegGlue's map we get to test our cleanup code.
 }
 
 }  // namespace media