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

chrome/gpu/gpu_channel.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 "chrome/gpu/gpu_channel.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 188 matching lines @@
 #if defined(ENABLE_GPU)
   router_.RemoveRoute(route_id);
   stubs_.Remove(route_id);
 #endif
 }
 
 void GpuChannel::OnCreateVideoDecoder(int32 context_route_id,
                                       int32 decoder_host_id) {
 #if defined(ENABLE_GPU)
   VLOG(1) << "GpuChannel::OnCreateVideoDecoder";
-  GpuVideoService* service = GpuVideoService::get();
+  GpuVideoService* service = GpuVideoService::GetInstance();
   if (service == NULL) {
     // TODO(hclam): Need to send a failure message.
     return;
   }
 
   // The context ID corresponds to the command buffer used.
   GpuCommandBufferStub* stub = stubs_.Lookup(context_route_id);
   int32 decoder_id = GenerateRouteID();
 
   // TODO(hclam): Need to be careful about the lifetime of the command buffer
   // decoder.
   bool ret = service->CreateVideoDecoder(
       this, &router_, decoder_host_id, decoder_id,
       stub->processor()->decoder());
   DCHECK(ret) << "Failed to create a GpuVideoDecoder";
 #endif
 }
 
 void GpuChannel::OnDestroyVideoDecoder(int32 decoder_id) {
 #if defined(ENABLE_GPU)
   LOG(ERROR) << "GpuChannel::OnDestroyVideoDecoder";
-  GpuVideoService* service = GpuVideoService::get();
+  GpuVideoService* service = GpuVideoService::GetInstance();
   if (service == NULL)
     return;
   service->DestroyVideoDecoder(&router_, decoder_id);
 #endif
 }
 
 bool GpuChannel::Init() {
   // Check whether we're already initialized.
   if (channel_.get())
     return true;
@@ skipping 13 matching lines @@
       channel_name, IPC::Channel::MODE_SERVER, this,
       ChildProcess::current()->io_message_loop(), false,
       ChildProcess::current()->GetShutDownEvent()));
 
   return true;
 }
 
 std::string GpuChannel::GetChannelName() {
   return StringPrintf("%d.r%d", base::GetCurrentProcId(), renderer_id_);
 }