Add a new GetInstance() method for singleton classes, take 2.

media/filters/ffmpeg_glue.h

 // Copyright (c) 2009 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.
 
 // FFmpegGlue is an adapter for FFmpeg's URLProtocol interface that allows us to
 // use a DataSource implementation with FFmpeg. For convenience we use FFmpeg's
 // av_open_input_file function, which analyzes the filename given to it and
 // automatically initializes the appropriate URLProtocol.
 //
 // Since the DataSource is already open by time we call av_open_input_file, we
@@ skipping 46 matching lines @@
   // retrieved.
   virtual bool GetSize(int64* size_out) = 0;
 
   // Returns false if this protocol supports random seeking.
   virtual bool IsStreaming() = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FFmpegURLProtocol);
 };
 
-class FFmpegGlue : public Singleton<FFmpegGlue> {
+class FFmpegGlue {
  public:
+  // Returns the singleton instance.
+  static FFmpegGlue* GetInstance();
+
   // Adds a FFmpegProtocol to the FFmpeg glue layer and returns a unique string
   // that can be passed to FFmpeg to identify the data source.
   std::string AddProtocol(FFmpegURLProtocol* protocol);
 
   // Removes a FFmpegProtocol from the FFmpeg glue layer.  Using strings from
   // previously added FFmpegProtocols will no longer work.
   void RemoveProtocol(FFmpegURLProtocol* protocol);
 
   // Assigns the FFmpegProtocol identified with by the given key to
   // |protocol|, or assigns NULL if no such FFmpegProtocol could be found.
@@ skipping 16 matching lines @@
   // Map between keys and FFmpegProtocol references.
   typedef std::map<std::string, FFmpegURLProtocol*> ProtocolMap;
   ProtocolMap protocols_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegGlue);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_GLUE_H_