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

media/filters/ffmpeg_glue.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/string_util.h"
 #include "media/base/filters.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_glue.h"
 
 namespace {
 
 media::FFmpegURLProtocol* ToProtocol(void* data) {
   return reinterpret_cast<media::FFmpegURLProtocol*>(data);
 }
 
 // FFmpeg protocol interface.
 int OpenContext(URLContext* h, const char* filename, int flags) {
   media::FFmpegURLProtocol* protocol;
-  media::FFmpegGlue::get()->GetProtocol(filename, &protocol);
+  media::FFmpegGlue::GetInstance()->GetProtocol(filename, &protocol);
   if (!protocol)
     return AVERROR_IO;
 
   h->priv_data = protocol;
   h->flags = URL_RDONLY;
   h->is_streamed = protocol->IsStreaming();
   return 0;
 }
 
 int ReadContext(URLContext* h, unsigned char* buf, int size) {
@@ skipping 108 matching lines @@
   av_lockmgr_register(&LockManagerOperation);
 
   // Now register the rest of FFmpeg.
   av_register_all();
 }
 
 FFmpegGlue::~FFmpegGlue() {
   av_lockmgr_register(NULL);
 }
 
+// static
+FFmpegGlue* FFmpegGlue::GetInstance() {
+  return Singleton<FFmpegGlue>::get();
+}
+
 std::string FFmpegGlue::AddProtocol(FFmpegURLProtocol* protocol) {
   AutoLock auto_lock(lock_);
   std::string key = GetProtocolKey(protocol);
   if (protocols_.find(key) == protocols_.end()) {
     protocols_[key] = protocol;
   }
   return key;
 }
 
 void FFmpegGlue::RemoveProtocol(FFmpegURLProtocol* protocol) {
@@ skipping 20 matching lines @@
 }
 
 std::string FFmpegGlue::GetProtocolKey(FFmpegURLProtocol* protocol) {
   // Use the FFmpegURLProtocol's memory address to generate the unique string.
   // This also has the nice property that adding the same FFmpegURLProtocol
   // reference will not generate duplicate entries.
   return StringPrintf("%s://%p", kProtocol, static_cast<void*>(protocol));
 }
 
 }  // namespace media