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

ceee/ie/broker/broker_module.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.
 //
 // Declaration of ATL module object for EXE module.
 
 #include <atlbase.h>
 #include <atlhost.h>
 
 #include "base/at_exit.h"
@@ skipping 179 matching lines @@
 }
 
 HRESULT CeeeBrokerModule::PostMessageLoop() {
   HRESULT hr = CAtlExeModuleT<CeeeBrokerModule>::PostMessageLoop();
   TearDown();
   return hr;
 }
 
 void CeeeBrokerModule::TearDown() {
   rpc_server_.Stop();
-  Singleton<ExecutorsManager,
-            ExecutorsManager::SingletonTraits>()->Terminate();
+  ExecutorsManager::GetInstance()->Terminate();
   WindowEventsFunnel::Terminate();
 
   // Upload data if necessary.
   MetricsService::Stop();
 
   chrome_postman_.Term();
 }
 
 CeeeBrokerModule::~CeeeBrokerModule() {
   crash_reporter_.ShutdownCrashReporting();
   logging::CloseLogFile();
   TRACE_EVENT_END("ceee.broker", this, "");
 }
 
 HRESULT WINAPI CeeeBrokerModule::UpdateRegistryAppId(BOOL reg) throw() {
   return com::ModuleRegistrationWithoutAppid(IDR_BROKER_MODULE, reg);
 }
 
 namespace ceee_module_util {
 
 LONG LockModule() {
   return module.LockModule();
 }
 
 LONG UnlockModule() {
   return module.UnlockModule();
 }
 
 }  // namespace