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

ceee/ie/broker/tab_api_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.
 //
 // Tab API implementation.
 //
 // Tab IDs are the window handle of the "TabWindowClass" window class
 // of the whole tab.
 //
 // To find the chrome.window.* "window ID" we can just get the top-level parent
@@ skipping 135 matching lines @@
   *handle = reinterpret_cast<HWND>(tab_handle);
   return true;
 }
 
 bool CeeeMapTabIdToHandle(const std::string& input_args,
                           std::string* converted_args,
                           ApiDispatcher* dispatcher) {
   int tab_id = kInvalidChromeSessionId;
   HWND tab_handle = NULL;
   if (GetIdAndHandleFromArgs(input_args, &tab_id, &tab_handle)) {
-    Singleton<ExecutorsManager, ExecutorsManager::SingletonTraits>::get()->
-        SetTabIdForHandle(tab_id, tab_handle);
+    ExecutorsManager::GetInstance()->SetTabIdForHandle(tab_id, tab_handle);
     return true;
   }
   return false;
 }
 
 bool CeeeMapToolbandIdToHandle(const std::string& input_args,
                                std::string* converted_args,
                                ApiDispatcher* dispatcher) {
   int toolband_id = kInvalidChromeSessionId;
   HWND tab_handle = NULL;
   if (GetIdAndHandleFromArgs(input_args, &toolband_id, &tab_handle)) {
-    Singleton<ExecutorsManager, ExecutorsManager::SingletonTraits>::get()->
-        SetTabToolBandIdForHandle(toolband_id, tab_handle);
+    ExecutorsManager::GetInstance()->SetTabToolBandIdForHandle(toolband_id,
+                                                               tab_handle);
     return true;
   }
   return false;
 }
 
 }  // namespace
 
 void RegisterInvocations(ApiDispatcher* dispatcher) {
 #define REGISTER_API_FUNCTION(func) do { dispatcher->RegisterInvocation(\
     func##Function::function_name(), NewApiInvocation< func >); }\
@@ skipping 1151 matching lines @@
   ::SysFreeString(title);
   title = NULL;
   ::SysFreeString(fav_icon_url);
   fav_icon_url = NULL;
 
   status = kCeeeTabStatusLoading;
   protected_mode = FALSE;
 }
 
 }  // namespace tab_api