Move MockFFmpeg instance setting into the constructor/destructor.

media/base/mock_ffmpeg.h

-// 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.
 
 #ifndef MEDIA_BASE_MOCK_FFMPEG_H_
 #define MEDIA_BASE_MOCK_FFMPEG_H_
 
 // TODO(scherkus): See if we can remove ffmpeg_common from this file.
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ skipping 46 matching lines @@
   MOCK_METHOD2(AVNewPacket, int(AVPacket* packet, int size));
   MOCK_METHOD1(AVFreePacket, void(AVPacket* packet));
   MOCK_METHOD1(AVFree, void(void* ptr));
   MOCK_METHOD1(AVDupPacket, int(AVPacket* packet));
 
   MOCK_METHOD1(AVLogSetLevel, void(int level));
 
   // Used for verifying check points during tests.
   MOCK_METHOD1(CheckPoint, void(int id));
 
-  // Setter/getter for the global instance of MockFFmpeg.
-  static void set(MockFFmpeg* instance);
-  static MockFFmpeg* get();
-
   // Returns the URLProtocol registered by the FFmpegGlue singleton.
   static URLProtocol* protocol();
 
   // AVPacket destructor for packets allocated by av_new_packet().
   static void DestructPacket(AVPacket* packet);
 
   // Modifies the number of outstanding packets.
   void inc_outstanding_packets();
   void dec_outstanding_packets();
 
  private:
-  static MockFFmpeg* instance_;
   static URLProtocol* protocol_;
 
   // Tracks the number of packets allocated by calls to av_read_frame() and
   // av_free_packet().  We crash the unit test if this is not zero at time of
   // destruction.
   int outstanding_packets_;
 };
 
 // Used for simulating av_read_frame().
 ACTION_P3(CreatePacket, stream_index, data, size) {
@@ skipping 46 matching lines @@
     arg0->destruct(arg0);
   }
 
   // Decrement number of packets allocated.
   MockFFmpeg::get()->dec_outstanding_packets();
 }
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MOCK_FFMPEG_H_