diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-11 22:31:24 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-11 22:31:24 +0000 |
| commit | c9b32721aeaa1e4933cfc5bb926a398c36a34c6b (patch) | |
| tree | 69d4419e664a18b81685bf3c71958900e0db0b1b | |
| parent | c682e88298d4b52873348bd5b62befdb4c0d4992 (diff) | |
| download | chromium_src-c9b32721aeaa1e4933cfc5bb926a398c36a34c6b.zip chromium_src-c9b32721aeaa1e4933cfc5bb926a398c36a34c6b.tar.gz chromium_src-c9b32721aeaa1e4933cfc5bb926a398c36a34c6b.tar.bz2 | |
Merge 84996 - Allow the Firefox lock to be deleted on the main thread during import.
BUG=77777
TEST=import tests don't complain.
Review URL: http://codereview.chromium.org/6995051
TBR=mirandac@chromium.org
Review URL: http://codereview.chromium.org/6969021
git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85065 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/importer/firefox_profile_lock.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/importer/firefox_profile_lock.cc b/chrome/browser/importer/firefox_profile_lock.cc index fff771d..aa66bff 100644 --- a/chrome/browser/importer/firefox_profile_lock.cc +++ b/chrome/browser/importer/firefox_profile_lock.cc @@ -5,6 +5,7 @@ #include "chrome/browser/importer/firefox_profile_lock.h" #include "base/file_path.h" +#include "base/threading/thread_restrictions.h" // This class is based on Firefox code in: // profile/dirserviceprovider/src/nsProfileLock.cpp @@ -75,5 +76,8 @@ FirefoxProfileLock::FirefoxProfileLock(const FilePath& path) { } FirefoxProfileLock::~FirefoxProfileLock() { + // Because this destructor happens in first run on the profile import thread, + // with no UI to jank, it's ok to allow deletion of the lock here. + base::ThreadRestrictions::ScopedAllowIO allow_io; Unlock(); } |