diff options
| author | georgey@chromium.org <georgey@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 21:47:56 +0000 |
|---|---|---|
| committer | georgey@chromium.org <georgey@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 21:47:56 +0000 |
| commit | 630b71e9f360151fa934d4b8eab7ecf987211239 (patch) | |
| tree | 4c6b37265bea809b2692d947c61d879b852382c3 | |
| parent | 4838a3b259cfdecca771ed388026febaa1b9b733 (diff) | |
| download | chromium_src-630b71e9f360151fa934d4b8eab7ecf987211239.zip chromium_src-630b71e9f360151fa934d4b8eab7ecf987211239.tar.gz chromium_src-630b71e9f360151fa934d4b8eab7ecf987211239.tar.bz2 | |
Add base::ThreadRestrictions::ScopedAllowIO allow_io;
to google_update_settings.cc until the bug is fixed
BUG=62121
TEST=none
Review URL: http://codereview.chromium.org/4655005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65573 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/installer/util/google_update_settings.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc index 5bc3541..c542aac 100644 --- a/chrome/installer/util/google_update_settings.cc +++ b/chrome/installer/util/google_update_settings.cc @@ -9,6 +9,7 @@ #include "base/command_line.h" #include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/thread_restrictions.h" #include "base/time.h" #include "base/win/registry.h" #include "chrome/common/chrome_switches.h" @@ -21,6 +22,9 @@ using base::win::RegKey; namespace { bool ReadGoogleUpdateStrKey(const wchar_t* const name, std::wstring* value) { + // The registry functions below will end up going to disk. Do this on another + // thread to avoid slowing the IO thread. http://crbug.com/62121 + base::ThreadRestrictions::ScopedAllowIO allow_io; BrowserDistribution* dist = BrowserDistribution::GetDistribution(); std::wstring reg_path = dist->GetStateKey(); RegKey key(HKEY_CURRENT_USER, reg_path.c_str(), KEY_READ); |