diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 22:56:27 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 22:56:27 +0000 |
| commit | 8da3067b27f52b4413c0aad3ad5da721766e2129 (patch) | |
| tree | b87070e259c0137ea7715847319d54761d919cc1 /chrome/browser/service | |
| parent | 88328f582694565b00ea445c4541f37fa73f3539 (diff) | |
| download | chromium_src-8da3067b27f52b4413c0aad3ad5da721766e2129.zip chromium_src-8da3067b27f52b4413c0aad3ad5da721766e2129.tar.gz chromium_src-8da3067b27f52b4413c0aad3ad5da721766e2129.tar.bz2 | |
Revert "Thread IO safety: annotate file_util, and block IO thread from doing IO"
This reverts commit r63580, build breakage.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63586 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/service')
| -rw-r--r-- | chrome/browser/service/service_process_control.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/browser/service/service_process_control.cc b/chrome/browser/service/service_process_control.cc index 6a41395..534cc5a 100644 --- a/chrome/browser/service/service_process_control.cc +++ b/chrome/browser/service/service_process_control.cc @@ -9,7 +9,6 @@ #include "base/process_util.h" #include "base/stl_util-inl.h" #include "base/thread.h" -#include "base/thread_restrictions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/io_thread.h" @@ -56,14 +55,7 @@ class ServiceProcessControl::Launcher void DoDetectLaunched(Task* task) { const uint32 kMaxLaunchDetectRetries = 10; - { - // We should not be doing blocking disk IO from this thread! - // Temporarily allowed until we fix - // http://code.google.com/p/chromium/issues/detail?id=60207 - base::ThreadRestrictions::ScopedAllowIO allow_io; - launched_ = CheckServiceProcessReady(); - } - + launched_ = CheckServiceProcessReady(); if (launched_ || (retry_count_ >= kMaxLaunchDetectRetries)) { BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, NewRunnableMethod(this, &Launcher::Notify, task)); |