summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-26 18:01:21 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-26 18:01:21 +0000
commit6ee5cf1519016517362ff6fe2e3a87f9a3c31e0a (patch)
tree2a29b0bbdaa39847030e7146875c119368210c5f
parent5f11a2d654cb3e8bffad2f710145d74def829b4d (diff)
downloadchromium_src-6ee5cf1519016517362ff6fe2e3a87f9a3c31e0a.zip
chromium_src-6ee5cf1519016517362ff6fe2e3a87f9a3c31e0a.tar.gz
chromium_src-6ee5cf1519016517362ff6fe2e3a87f9a3c31e0a.tar.bz2
remove now-unnecessary ScopedAllowIO in google_update_settings
Registry access isn't considered file access any longer. R=robertshield@chromium.org BUG=62121 Review URL: https://chromiumcodereview.appspot.com/17880004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208729 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/installer/util/google_update_settings.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc
index 338d499..f834110 100644
--- a/chrome/installer/util/google_update_settings.cc
+++ b/chrome/installer/util/google_update_settings.cc
@@ -39,9 +39,6 @@ const GoogleUpdateSettings::UpdatePolicy kGoogleUpdateDefaultUpdatePolicy =
#endif
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);
@@ -108,10 +105,6 @@ bool GetChromeChannelInternal(bool system_install,
return true;
}
- // 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;
-
HKEY root_key = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
string16 reg_path = dist->GetStateKey();
RegKey key(root_key, reg_path.c_str(), KEY_READ);