Add a new GetInstance() method for singleton classes under chrome/service and /net.

chrome/service/service_process.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/service/service_process.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 118 matching lines @@
   if (cloud_print_proxy_enabled) {
     GetCloudPrintProxy()->EnableForUser(lsid);
   }
 
   VLOG(1) << "Starting Service Process IPC Server";
   ipc_server_.reset(new ServiceIPCServer(GetServiceProcessChannelName()));
   ipc_server_->Init();
 
   // After the IPC server has started we signal that the service process is
   // ready.
-  Singleton<ServiceProcessState>::get()->SignalReady(
+  ServiceProcessState::GetInstance()->SignalReady(
       NewRunnableMethod(this, &ServiceProcess::Shutdown));
 
   // See if we need to stay running.
   ScheduleShutdownCheck();
   return true;
 }
 
 bool ServiceProcess::Teardown() {
   service_prefs_.reset();
   cloud_print_proxy_.reset();
 
 #if defined(ENABLE_REMOTING)
   ShutdownChromotingHost();
 #endif
 
   ipc_server_.reset();
   // Signal this event before shutting down the service process. That way all
   // background threads can cleanup.
   shutdown_event_.Signal();
   io_thread_.reset();
   file_thread_.reset();
   // The NetworkChangeNotifier must be destroyed after all other threads that
   // might use it have been shut down.
   network_change_notifier_.reset();
 
-  Singleton<ServiceProcessState>::get()->SignalStopped();
+  ServiceProcessState::GetInstance()->SignalStopped();
   return true;
 }
 
 void ServiceProcess::Shutdown() {
   // Quit the main message loop.
   main_message_loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask());
 }
 
 bool ServiceProcess::HandleClientDisconnect() {
   // If there are no enabled services or if there is an update available
@@ skipping 24 matching lines @@
 void ServiceProcess::OnCloudPrintProxyDisabled() {
   // Save the preference that we have disabled the cloud print proxy.
   service_prefs_->prefs()->SetBoolean(prefs::kCloudPrintProxyEnabled, false);
   service_prefs_->WritePrefs();
   OnServiceDisabled();
 }
 
 void ServiceProcess::OnServiceEnabled() {
   enabled_services_++;
   if (1 == enabled_services_) {
-    Singleton<ServiceProcessState>::get()->AddToAutoRun();
+    ServiceProcessState::GetInstance()->AddToAutoRun();
   }
 }
 
 void ServiceProcess::OnServiceDisabled() {
   DCHECK_NE(enabled_services_, 0);
   enabled_services_--;
   if (0 == enabled_services_) {
-    Singleton<ServiceProcessState>::get()->RemoveFromAutoRun();
+    ServiceProcessState::GetInstance()->RemoveFromAutoRun();
     // We will wait for some time to respond to IPCs before shutting down.
     ScheduleShutdownCheck();
   }
 }
 
 void ServiceProcess::ScheduleShutdownCheck() {
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       NewRunnableMethod(this, &ServiceProcess::ShutdownIfNeeded),
       kShutdownDelay);
@@ skipping 159 matching lines @@
 #endif
 
 ServiceProcess::~ServiceProcess() {
   Teardown();
   g_service_process = NULL;
 }
 
 // Disable refcounting for runnable method because it is really not needed
 // when we post tasks on the main message loop.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(ServiceProcess);