diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-14 00:16:15 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-14 00:16:15 +0000 |
| commit | 4cc5a8747adf8327ba0df645237c1d5f52690caf (patch) | |
| tree | 9b0fbabaa157fd1e8221d12b40451d4eee973d1f /chrome/browser/net | |
| parent | 3d66e35568b1ed073bbec5dd489997134c6a7d9f (diff) | |
| download | chromium_src-4cc5a8747adf8327ba0df645237c1d5f52690caf.zip chromium_src-4cc5a8747adf8327ba0df645237c1d5f52690caf.tar.gz chromium_src-4cc5a8747adf8327ba0df645237c1d5f52690caf.tar.bz2 | |
Remove locks from StrictTransportSecurityState.
These locks can cause the IO thread to block on the FILE thread writing to
disk, which is bad news bears.
BUG=21518
TEST=No behavior change.
Review URL: http://codereview.chromium.org/904005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
| -rw-r--r-- | chrome/browser/net/chrome_url_request_context.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/net/chrome_url_request_context.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index 5550496..cc19e5b 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -842,12 +842,8 @@ ChromeURLRequestContextFactory::ChromeURLRequestContextFactory(Profile* profile) referrer_charset_ = default_charset; host_content_settings_map_ = profile->GetHostContentSettingsMap(); - host_zoom_map_ = profile->GetHostZoomMap(); - privacy_blacklist_ = profile->GetPrivacyBlacklist(); - - // TODO(eroman): this doesn't look safe; sharing between IO and UI threads! transport_security_state_ = profile->GetTransportSecurityState(); if (profile->GetExtensionsService()) { diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h index 07e2f0e..8f3c260 100644 --- a/chrome/browser/net/chrome_url_request_context.h +++ b/chrome/browser/net/chrome_url_request_context.h @@ -383,7 +383,7 @@ class ChromeURLRequestContextFactory { scoped_refptr<HostContentSettingsMap> host_content_settings_map_; scoped_refptr<HostZoomMap> host_zoom_map_; scoped_refptr<Blacklist> privacy_blacklist_; - net::TransportSecurityState* transport_security_state_; + scoped_refptr<net::TransportSecurityState> transport_security_state_; scoped_refptr<net::SSLConfigService> ssl_config_service_; FilePath profile_dir_path_; |