diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 19:17:08 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 19:17:08 +0000 |
| commit | ee432ee0a565736be395b8729bc811212fd88bf3 (patch) | |
| tree | 4922e685fc7e392d3b67029d4a821adc9d323f1a /chrome/browser/browser_thread.cc | |
| parent | 1d14ba55e2472ad65b41423a6b8ed13b32dc206d (diff) | |
| download | chromium_src-ee432ee0a565736be395b8729bc811212fd88bf3.zip chromium_src-ee432ee0a565736be395b8729bc811212fd88bf3.tar.gz chromium_src-ee432ee0a565736be395b8729bc811212fd88bf3.tar.bz2 | |
Revert 66719 - 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
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/5206005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66791 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_thread.cc')
| -rw-r--r-- | chrome/browser/browser_thread.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/chrome/browser/browser_thread.cc b/chrome/browser/browser_thread.cc index e6edfd0..7ba53e0 100644 --- a/chrome/browser/browser_thread.cc +++ b/chrome/browser/browser_thread.cc @@ -6,7 +6,6 @@ #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "base/thread_restrictions.h" // Friendly names for the well-known threads. static const char* browser_thread_names[BrowserThread::ID_COUNT] = { @@ -113,11 +112,6 @@ bool BrowserThread::IsWellKnownThread(ID identifier) { // static bool BrowserThread::CurrentlyOn(ID identifier) { - // We shouldn't use MessageLoop::current() since it uses LazyInstance which - // may be deleted by ~AtExitManager when a WorkerPool thread calls this - // function. - // http://crbug.com/63678 - base::ThreadRestrictions::ScopedAllowSingleton allow_singleton; AutoLock lock(lock_); DCHECK(identifier >= 0 && identifier < ID_COUNT); return browser_threads_[identifier] && @@ -166,11 +160,6 @@ bool BrowserThread::PostNonNestableDelayedTask( // static bool BrowserThread::GetCurrentThreadIdentifier(ID* identifier) { - // We shouldn't use MessageLoop::current() since it uses LazyInstance which - // may be deleted by ~AtExitManager when a WorkerPool thread calls this - // function. - // http://crbug.com/63678 - base::ThreadRestrictions::ScopedAllowSingleton allow_singleton; MessageLoop* cur_message_loop = MessageLoop::current(); for (int i = 0; i < ID_COUNT; ++i) { if (browser_threads_[i] && |