| Index: chrome/service/service_process.cc
|
| diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc
|
| index 3699555e9efc7b24bd97cce7baa7c5a51b94bad6..e826c1f80b92d1396d698dd292b371ebc60dbb86 100644
|
| --- a/chrome/service/service_process.cc
|
| +++ b/chrome/service/service_process.cc
|
| @@ -136,7 +136,7 @@ bool ServiceProcess::Initialize(MessageLoop* message_loop,
|
|
|
| // 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.
|
| @@ -162,7 +162,7 @@ bool ServiceProcess::Teardown() {
|
| // might use it have been shut down.
|
| network_change_notifier_.reset();
|
|
|
| - Singleton<ServiceProcessState>::get()->SignalStopped();
|
| + ServiceProcessState::GetInstance()->SignalStopped();
|
| return true;
|
| }
|
|
|
| @@ -207,7 +207,7 @@ void ServiceProcess::OnCloudPrintProxyDisabled() {
|
| void ServiceProcess::OnServiceEnabled() {
|
| enabled_services_++;
|
| if (1 == enabled_services_) {
|
| - Singleton<ServiceProcessState>::get()->AddToAutoRun();
|
| + ServiceProcessState::GetInstance()->AddToAutoRun();
|
| }
|
| }
|
|
|
| @@ -215,7 +215,7 @@ 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();
|
| }
|
|
|