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

media/filters/ffmpeg_glue.h

Index: media/filters/ffmpeg_glue.h
diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
index 1ae4ded16ac1afce1a0641c47fc023a642140d72..4f991d16c8686321f1ddb6bf2cf9f4391bb4e2f4 100644
--- a/media/filters/ffmpeg_glue.h
+++ b/media/filters/ffmpeg_glue.h
@@ -64,8 +64,11 @@ class FFmpegURLProtocol {
   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);