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

ceee/ie/broker/broker.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.
 //
 // ICeeeBroker implementation
 
 #include "ceee/ie/broker/broker.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "ceee/common/com_utils.h"
 #include "ceee/ie/broker/api_dispatcher.h"
 #include "ceee/ie/broker/chrome_postman.h"
 #include "ceee/ie/broker/executors_manager.h"
 #include "ceee/ie/common/ceee_module_util.h"
 
 HRESULT CeeeBroker::FinalConstruct() {
   // So that we get a pointer to the ExecutorsManager and let tests override it.
-  executors_manager_ = Singleton<ExecutorsManager,
-                                 ExecutorsManager::SingletonTraits>::get();
-  api_dispatcher_ = ProductionApiDispatcher::get();
+  executors_manager_ = ExecutorsManager::GetInstance();
+  api_dispatcher_ = ProductionApiDispatcher::GetInstance();
   return S_OK;
 }
 
 void CeeeBroker::OnAddConnection(bool first_lock) {
   if (first_lock)
     ceee_module_util::LockModule();
 }
 
 void CeeeBroker::OnReleaseConnection(bool last_unlock,
                                      bool last_unlock_releases) {
@@ skipping 45 matching lines @@
 
 STDMETHODIMP CeeeBroker::SetTabToolBandIdForHandle(long tool_band_id,
                                                    CeeeWindowHandle handle) {
   // TODO(mad@chromium.org): Add security check here.
   DCHECK(tool_band_id != kInvalidChromeSessionId &&
       handle != reinterpret_cast<CeeeWindowHandle>(INVALID_HANDLE_VALUE));
   executors_manager_->SetTabToolBandIdForHandle(
       static_cast<int>(tool_band_id), reinterpret_cast<HWND>(handle));
   return S_OK;
 }