From 2902738f2a36d4f0ef22e25369e653f4eda2a7aa Mon Sep 17 00:00:00 2001 From: "willchan@chromium.org" Date: Sat, 13 Nov 2010 23:44:20 +0000 Subject: 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 --- net/base/keygen_handler_unittest.cc | 4 ---- 1 file changed, 4 deletions(-) (limited to 'net/base/keygen_handler_unittest.cc') diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc index d3bf4f5..62c5191 100644 --- a/net/base/keygen_handler_unittest.cc +++ b/net/base/keygen_handler_unittest.cc @@ -16,7 +16,6 @@ #include "base/logging.h" #include "base/nss_util.h" #include "base/task.h" -#include "base/thread_restrictions.h" #include "base/waitable_event.h" #include "base/worker_pool.h" #include "testing/gtest/include/gtest/gtest.h" @@ -91,9 +90,6 @@ class ConcurrencyTestTask : public Task { } virtual void Run() { - // We allow Singleton use on the worker thread here since we use a - // WaitableEvent to synchronize, so it's safe. - base::ThreadRestrictions::ScopedAllowSingleton scoped_allow_singleton; KeygenHandler handler(768, "some challenge", GURL("http://www.example.com")); handler.set_stores_key(false); // Don't leave the key-pair behind. -- cgit v1.1