diff options
| author | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-11 00:12:09 +0000 |
|---|---|---|
| committer | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-11 00:12:09 +0000 |
| commit | 9334b3123f9fc997493e75e08a96776552bf670f (patch) | |
| tree | 574537ed457249920fa6443800ff1a1e4ff6d39f /chrome/browser/browser_process_impl.cc | |
| parent | d88dc775968c60fc8b6af5ef60473d7c4c673e2f (diff) | |
| download | chromium_src-9334b3123f9fc997493e75e08a96776552bf670f.zip chromium_src-9334b3123f9fc997493e75e08a96776552bf670f.tar.gz chromium_src-9334b3123f9fc997493e75e08a96776552bf670f.tar.bz2 | |
Revert 68893 - Consider PlatformThread::Join() to be blocking IO.
Marks PlatformThread::Join() as blocking IO using ThreadRestrictions.
Whitelists existing spots where we join on the UI/IO threads.
Also noteworthy is I allow blocking IO on shutdown.
BUG=65530,66077,66082
TEST=none
Review URL: http://codereview.chromium.org/5693003
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/5743005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 8facb15..ea52797 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -13,7 +13,6 @@ #include "base/path_service.h" #include "base/task.h" #include "base/thread.h" -#include "base/thread_restrictions.h" #include "base/waitable_event.h" #include "chrome/browser/appcache/chrome_appcache_service.h" #include "chrome/browser/automation/automation_provider_list.h" @@ -253,12 +252,6 @@ unsigned int BrowserProcessImpl::ReleaseModule() { DCHECK_NE(0u, module_ref_count_); module_ref_count_--; if (0 == module_ref_count_) { - // Allow UI and IO threads to do blocking IO on shutdown, since we do a lot - // of it on shutdown for valid reasons. - base::ThreadRestrictions::SetIOAllowed(true); - io_thread()->message_loop()->PostTask( - FROM_HERE, - NewRunnableFunction(&base::ThreadRestrictions::SetIOAllowed, true)); MessageLoop::current()->PostTask( FROM_HERE, NewRunnableFunction(DidEndMainMessageLoop)); MessageLoop::current()->Quit(); |