diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 01:53:38 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 01:53:38 +0000 |
| commit | e87b8bbba3be2889489f5b4a94b708e67d0b8c67 (patch) | |
| tree | 9c2b2210ab14fbc784b04cd0467d8f8b5bf42c68 /net/base/keygen_handler_unittest.cc | |
| parent | 244c1077eef720364e988b013c1b9b7bd5776a92 (diff) | |
| download | chromium_src-e87b8bbba3be2889489f5b4a94b708e67d0b8c67.zip chromium_src-e87b8bbba3be2889489f5b4a94b708e67d0b8c67.tar.gz chromium_src-e87b8bbba3be2889489f5b4a94b708e67d0b8c67.tar.bz2 | |
Reland r65996. Disallows Singletons on non-joinable thread.
Test breakages caused by this change have been fixed here or in other changelists.
BUG=61753
TEST=none
Review URL: http://codereview.chromium.org/5024003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66719 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/keygen_handler_unittest.cc')
| -rw-r--r-- | net/base/keygen_handler_unittest.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc index 62c5191..d3bf4f5 100644 --- a/net/base/keygen_handler_unittest.cc +++ b/net/base/keygen_handler_unittest.cc @@ -16,6 +16,7 @@ #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" @@ -90,6 +91,9 @@ 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. |