summaryrefslogtreecommitdiffstats
path: root/ceee
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 21:25:38 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 21:25:38 +0000
commit82e8e2b5b879cd414e48e6418fb1a693093866e2 (patch)
tree513b4c2186f8be29e2d8a7d56e76a75d96dbf437 /ceee
parent48a5faa6500b6c6055348abf1540cbb06c721f33 (diff)
downloadchromium_src-82e8e2b5b879cd414e48e6418fb1a693093866e2.zip
chromium_src-82e8e2b5b879cd414e48e6418fb1a693093866e2.tar.gz
chromium_src-82e8e2b5b879cd414e48e6418fb1a693093866e2.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65996 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee')
-rw-r--r--ceee/ie/broker/executors_manager.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/ceee/ie/broker/executors_manager.h b/ceee/ie/broker/executors_manager.h
index 3b9ac3b..cba7b3f 100644
--- a/ceee/ie/broker/executors_manager.h
+++ b/ceee/ie/broker/executors_manager.h
@@ -90,14 +90,10 @@ class ExecutorsManager {
// 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: