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

media/filters/ffmpeg_demuxer.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/callback.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
@@ skipping 373 matching lines @@
 }
 
 void FFmpegDemuxer::InitializeTask(DataSource* data_source,
                                    FilterCallback* callback) {
   DCHECK_EQ(MessageLoop::current(), message_loop());
   scoped_ptr<FilterCallback> c(callback);
 
   data_source_ = data_source;
 
   // Add ourself to Protocol list and get our unique key.
-  std::string key = FFmpegGlue::get()->AddProtocol(this);
+  std::string key = FFmpegGlue::GetInstance()->AddProtocol(this);
 
   // Open FFmpeg AVFormatContext.
   DCHECK(!format_context_);
   AVFormatContext* context = NULL;
   int result = av_open_input_file(&context, key.c_str(), NULL, 0, NULL);
 
   // Remove ourself from protocol list.
-  FFmpegGlue::get()->RemoveProtocol(this);
+  FFmpegGlue::GetInstance()->RemoveProtocol(this);
 
   if (result < 0) {
     host()->SetError(DEMUXER_ERROR_COULD_NOT_OPEN);
     callback->Run();
     return;
   }
 
   DCHECK(context);
   format_context_ = context;
 
@@ skipping 193 matching lines @@
   read_event_.Wait();
   return last_read_bytes_;
 }
 
 void FFmpegDemuxer::SignalReadCompleted(size_t size) {
   last_read_bytes_ = size;
   read_event_.Signal();
 }
 
 }  // namespace media