Reland r65996. Disallows Singletons on non-joinable thread.

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 72 matching lines @@
   virtual int GetTabIdFromHandle(HWND tab_handle);
 
   // Register the relation between a tab_id and a HWND.
   virtual void SetTabIdForHandle(long tab_id, HWND tab_handle);
 
   // Unregister the HWND and its corresponding tab_id.
   virtual void DeleteTabHandle(HWND handle);
 
   // Traits for Singleton<ExecutorsManager> so that we can pass an argument
   // to the constructor.
-  struct SingletonTraits {
+  struct SingletonTraits : public DefaultSingletonTraits<ExecutorsManager> {
     static ExecutorsManager* New() {
       return new ExecutorsManager(false);  // By default, we want a thread.
     }
-    static void Delete(ExecutorsManager* x) {
-      delete x;
-    }
-    static const bool kRegisterAtExit = true;
   };
 
  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;
   };
@@ skipping 90 matching lines @@
   CHandle termination_gate_;
 
   // To protect the access to the maps (ExecutorsManager::executors_ &
   // ExecutorsManager::pending_registrations_ & tab_id_map_/handle_map_).
   Lock lock_;
 
   DISALLOW_EVIL_CONSTRUCTORS(ExecutorsManager);
 };
 
 #endif  // CEEE_IE_BROKER_EXECUTORS_MANAGER_H_