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

ceee/ie/broker/executors_manager.h

 // 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.
 //
 // @file
 // ExecutorsManager implementation, an object to keep track of the
 // CeeeExecutor objects that were instantiated in destination threads.
 
 #ifndef CEEE_IE_BROKER_EXECUTORS_MANAGER_H_
 #define CEEE_IE_BROKER_EXECUTORS_MANAGER_H_
@@ skipping 16 matching lines @@
 // the instance of the Broker object does.
 //
 // See the @ref ExecutorsManagerDoc page for more details.
 
 // Manages a map of destination threads to CeeeExecutor interfaces.
 class ExecutorsManager {
  public:
   // Identifiers for destination threads where to run executors.
   typedef DWORD ThreadId;
 
+  // Returns the singleton instance.
+  static ExecutorsManager* GetInstance();
+
   // To avoid lint errors, even though we are only virtual for unittests.
   virtual ~ExecutorsManager() {}
 
   // Temporary until we have a better structure to recognize known windows.
   // TODO(mad@chromium.org): Find a better structure.
   static bool IsKnownWindow(HWND window);
   virtual bool IsKnownWindowImpl(HWND window);
   static HWND FindTabChild(HWND window);
   virtual HWND FindTabChildImpl(HWND window);
 
@@ skipping 71 matching lines @@
   // Register the relation between a tool band tab ID and an HWND.
   virtual void SetTabToolBandIdForHandle(int tool_band_id, HWND tab_handle);
 
   // Unregister the HWND and its corresponding tab ID and tool band tab ID.
   virtual void DeleteTabHandle(HWND handle);
 
   // Cleans up the maps from all handles that would be associated to the given
   // thread id.
   virtual void CleanupMapsForThread(DWORD thread_id);
 
+ protected:
   // Traits for Singleton<ExecutorsManager> so that we can pass an argument
   // to the constructor.
   struct SingletonTraits : public DefaultSingletonTraits<ExecutorsManager> {
     static ExecutorsManager* New() {
       if (test_instance_)
         return test_instance_;
       else
         return new ExecutorsManager(false);  // By default, we want a thread.
     }
   };
 
- protected:
   // The data we pass to start our worker thread.
   // THERE IS A COPY OF THIS CLASS IN THE UNITTEST WHICH YOU NEED TO UPDATE IF
   // you change this one...
   struct ThreadStartData {
     ExecutorsManager* me;
     CHandle thread_started_gate;
   };
 
   // A structures holding on the info about an executor and thread it runs in.
   struct ExecutorInfo {
@@ skipping 107 matching lines @@
     return windows_events_funnel_;
   }
 
   // Test seam too.
   static ExecutorsManager* test_instance_;
 
   DISALLOW_COPY_AND_ASSIGN(ExecutorsManager);
 };
 
 #endif  // CEEE_IE_BROKER_EXECUTORS_MANAGER_H_