diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 14:37:08 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 14:37:08 +0000 |
| commit | 61f93215693a7f4f416b1aab7cfe3ed530428e55 (patch) | |
| tree | a184ea61d349d44be82d0c7a6394ed4c38ce6fb3 /base | |
| parent | ee6ded3a3ee81a38ccd4b1691ff87351a9aaf91e (diff) | |
| download | chromium_src-61f93215693a7f4f416b1aab7cfe3ed530428e55.zip chromium_src-61f93215693a7f4f416b1aab7cfe3ed530428e55.tar.gz chromium_src-61f93215693a7f4f416b1aab7cfe3ed530428e55.tar.bz2 | |
Temporary whitelist several cases of disk I/O on the UI threads in cros.
BUG=60211, 70097, 70119, 70131, 62626, 61143, chromium-os:11102, chromium-os:11104, chromium-os:11105, chromium-os:11106, chromium-os:11109
TEST=bots
Review URL: http://codereview.chromium.org/6272012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72331 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/nss_util.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/base/nss_util.cc b/base/nss_util.cc index 8e250c4..fe78fe0 100644 --- a/base/nss_util.cc +++ b/base/nss_util.cc @@ -165,6 +165,9 @@ class NSSInitSingleton { #if defined(OS_CHROMEOS) void OpenPersistentNSSDB() { if (!chromeos_user_logged_in_) { + // GetDefaultConfigDirectory causes us to do blocking IO on UI thread. + // Temporarily allow it until we fix http://crbug.com.70119 + ThreadRestrictions::ScopedAllowIO allow_io; chromeos_user_logged_in_ = true; real_db_slot_ = OpenUserDB(GetDefaultConfigDirectory(), "Real NSS database"); |