summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-12 23:25:11 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-12 23:25:11 +0000
commit2974a806165d55fca9f5a32d4fb057203ddd99d6 (patch)
tree21cde04231b967a1cf88218295df7c7c11fe3d3e /net
parent79b8bbd5a8fec5568c77429a4e49f6bbd5d21d78 (diff)
downloadchromium_src-2974a806165d55fca9f5a32d4fb057203ddd99d6.zip
chromium_src-2974a806165d55fca9f5a32d4fb057203ddd99d6.tar.gz
chromium_src-2974a806165d55fca9f5a32d4fb057203ddd99d6.tar.bz2
Widen file access restriction suppressions in SSLConfigServiceWin. Changing the enabled SSL/TLS versions or revocation checking require writing to the registry, and unfortunately may happen from the GUI thread.
BUG=61455 TEST=none Review URL: http://codereview.chromium.org/5707005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68978 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/ssl_config_service_win.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/base/ssl_config_service_win.cc b/net/base/ssl_config_service_win.cc
index 2f0fad7..aca0626 100644
--- a/net/base/ssl_config_service_win.cc
+++ b/net/base/ssl_config_service_win.cc
@@ -94,6 +94,7 @@ bool SSLConfigServiceWin::GetSSLConfigNow(SSLConfig* config) {
void SSLConfigServiceWin::SetRevCheckingEnabled(bool enabled) {
// This registry access goes to disk and will slow down the IO thread.
// http://crbug.com/61455
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
DWORD value = enabled;
RegKey internet_settings(HKEY_CURRENT_USER, kInternetSettingsSubKeyName,
KEY_WRITE);
@@ -116,6 +117,7 @@ void SSLConfigServiceWin::SetTLS1Enabled(bool enabled) {
void SSLConfigServiceWin::SetSSLVersionEnabled(int version, bool enabled) {
// This registry access goes to disk and will slow down the IO thread.
// http://crbug.com/61455
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
RegKey internet_settings(HKEY_CURRENT_USER, kInternetSettingsSubKeyName,
KEY_READ | KEY_WRITE);
DWORD value;