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

ceee/ie/broker/api_dispatcher.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.
 //
 // Dispatcher and registry for Chrome Extension APIs.
 
 #include "ceee/ie/broker/api_dispatcher.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 124 matching lines @@
       if (list_iter->handler(converted_event_args,
                              list_iter->user_data, this) == S_FALSE) {
         map_iter->second.push_back(*list_iter);
       }
     }
   }
 }
 
 void ApiDispatcher::GetExecutor(HWND window, REFIID iid, void** executor) {
   DWORD thread_id = ::GetWindowThreadProcessId(window, NULL);
-  HRESULT hr = Singleton<ExecutorsManager,
-                         ExecutorsManager::SingletonTraits>::get()->
-                            GetExecutor(thread_id, window, iid, executor);
+  HRESULT hr = ExecutorsManager::GetInstance()->GetExecutor(thread_id, window,
+                                                            iid, executor);
   DLOG_IF(INFO, FAILED(hr)) << "Failed to get executor for window: " <<
       window << ". In thread: " << thread_id << ". " << com::LogHr(hr);
 }
 
 bool ApiDispatcher::IsTabIdValid(int tab_id) const {
-  return Singleton<ExecutorsManager, ExecutorsManager::SingletonTraits>::get()->
-      IsTabIdValid(tab_id);
+  return ExecutorsManager::GetInstance()->IsTabIdValid(tab_id);
 }
 
 HWND ApiDispatcher::GetTabHandleFromId(int tab_id) const {
-  return Singleton<ExecutorsManager, ExecutorsManager::SingletonTraits>::get()->
-      GetTabHandleFromId(tab_id);
+  return ExecutorsManager::GetInstance()->GetTabHandleFromId(tab_id);
 }
 
 HWND ApiDispatcher::GetTabHandleFromToolBandId(int tool_band_id) const {
-  return Singleton<ExecutorsManager, ExecutorsManager::SingletonTraits>::get()->
-      GetTabHandleFromToolBandId(tool_band_id);
+  return ExecutorsManager::GetInstance()->GetTabHandleFromToolBandId(
+      tool_band_id);
 }
 
 HWND ApiDispatcher::GetWindowHandleFromId(int window_id) const {
   return reinterpret_cast<HWND>(window_id);
 }
 
 bool ApiDispatcher::IsTabHandleValid(HWND tab_handle) const {
-  return Singleton<ExecutorsManager, ExecutorsManager::SingletonTraits>::get()->
-      IsTabHandleValid(tab_handle);
+  return ExecutorsManager::GetInstance()->IsTabHandleValid(tab_handle);
 }
 
 int ApiDispatcher::GetTabIdFromHandle(HWND tab_handle) const {
-  return Singleton<ExecutorsManager, ExecutorsManager::SingletonTraits>::get()->
-      GetTabIdFromHandle(tab_handle);
+  return ExecutorsManager::GetInstance()->GetTabIdFromHandle(tab_handle);
 }
 
 int ApiDispatcher::GetWindowIdFromHandle(HWND window_handle) const {
   return reinterpret_cast<int>(window_handle);
 }
 
 void ApiDispatcher::DeleteTabHandle(HWND handle) {
-  Singleton<ExecutorsManager, ExecutorsManager::SingletonTraits>::get()->
-      DeleteTabHandle(handle);
+  ExecutorsManager::GetInstance()->DeleteTabHandle(handle);
 }
 
 void ApiDispatcher::RegisterInvocation(const char* function_name,
                                        InvocationFactory factory) {
   DCHECK(function_name && factory);
   // Re-registration is not expected.
   DCHECK(function_name && factories_.find(function_name) == factories_.end());
   if (function_name && factory)
     factories_[function_name] = factory;
 }
@@ skipping 92 matching lines @@
     return NULL;
 
   Value* value = NULL;
   bool success = temp_values_->Get(name, &value);
   // Make sure that success means NotNull and vice versa.
   DCHECK((value != NULL || !success) && (success || value == NULL));
   return value;
 }
 
 ApiDispatcher* ApiDispatcher::InvocationResult::GetDispatcher() {
-  return ProductionApiDispatcher::get();
+  return ProductionApiDispatcher::GetInstance();
 }
 
 ApiDispatcher* ApiDispatcher::Invocation::GetDispatcher() {
-  return ProductionApiDispatcher::get();
+  return ProductionApiDispatcher::GetInstance();
 }
 
 // Function registration preprocessor magic. See api_registration.h for details.
 #ifdef REGISTER_ALL_API_FUNCTIONS
 #error Must not include api_registration.h previously in this compilation unit.
 #endif  // REGISTER_ALL_API_FUNCTIONS
 #define PRODUCTION_API_DISPATCHER
 #define REGISTER_TAB_API_FUNCTIONS() tab_api::RegisterInvocations(this)
 #define REGISTER_WINDOW_API_FUNCTIONS() window_api::RegisterInvocations(this)
 #define REGISTER_COOKIE_API_FUNCTIONS() cookie_api::RegisterInvocations(this)
 #define REGISTER_INFOBAR_API_FUNCTIONS() infobar_api::RegisterInvocations(this)
 #define REGISTER_WEBNAVIGATION_API_FUNCTIONS() \
     webnavigation_api::RegisterInvocations(this)
 #define REGISTER_WEBREQUEST_API_FUNCTIONS() \
     webrequest_api::RegisterInvocations(this)
 #include "ceee/ie/common/api_registration.h"
 
 ProductionApiDispatcher::ProductionApiDispatcher() {
   REGISTER_ALL_API_FUNCTIONS();
 }
+
+// static
+ProductionApiDispatcher* ProductionApiDispatcher::GetInstance() {
+  return Singleton<ProductionApiDispatcher>::get();
+}