From 61f93215693a7f4f416b1aab7cfe3ed530428e55 Mon Sep 17 00:00:00 2001 From: "nkostylev@chromium.org" Date: Mon, 24 Jan 2011 14:37:08 +0000 Subject: 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 --- base/nss_util.cc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'base/nss_util.cc') 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"); -- cgit v1.1