diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-13 23:44:20 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-13 23:44:20 +0000 |
| commit | 2902738f2a36d4f0ef22e25369e653f4eda2a7aa (patch) | |
| tree | 582ce3d66406a222edb686625227c1eea475d285 /ceee | |
| parent | 2d39894da98b2ae12b4052776c4fcf23d1bf2442 (diff) | |
| download | chromium_src-2902738f2a36d4f0ef22e25369e653f4eda2a7aa.zip chromium_src-2902738f2a36d4f0ef22e25369e653f4eda2a7aa.tar.gz chromium_src-2902738f2a36d4f0ef22e25369e653f4eda2a7aa.tar.bz2 | |
Revert 65996 (test breakage) - Disallow Singleton and LazyInstance on non-joinable threads.
Fix all known instances or explicitly allow them. Usually the fix involves switching from Default traits to Lazy traits.
BUG=61753
TEST=none
Review URL: http://codereview.chromium.org/4635012
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/4980001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee')
| -rw-r--r-- | ceee/ie/broker/executors_manager.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ceee/ie/broker/executors_manager.h b/ceee/ie/broker/executors_manager.h index cba7b3f..3b9ac3b 100644 --- a/ceee/ie/broker/executors_manager.h +++ b/ceee/ie/broker/executors_manager.h @@ -90,10 +90,14 @@ class ExecutorsManager { // Traits for Singleton<ExecutorsManager> so that we can pass an argument // to the constructor. - struct SingletonTraits : public DefaultSingletonTraits<ExecutorsManager> { + struct SingletonTraits { 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: |