diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 23:07:08 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 23:07:08 +0000 |
| commit | 20d296ddc770d1bdb547bab4485ad7cb8c124085 (patch) | |
| tree | 176c789a9b7a456c825c41be0d921a43537c2447 /net/proxy/proxy_service.h | |
| parent | 0e64095b374f53899df0a88fefc1e60b062b88de (diff) | |
| download | chromium_src-20d296ddc770d1bdb547bab4485ad7cb8c124085.zip chromium_src-20d296ddc770d1bdb547bab4485ad7cb8c124085.tar.gz chromium_src-20d296ddc770d1bdb547bab4485ad7cb8c124085.tar.bz2 | |
NULL out the ProxyScriptFetcher used by ProxyService when the URLRequestContext it was using for downloads is destroyed.
This avoids the possibility of accessing freed memory when sharing ProxyService amongst request context, and the main context is destroyed first.
BUG=25338
Review URL: http://codereview.chromium.org/387065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32427 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_service.h')
| -rw-r--r-- | net/proxy/proxy_service.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index 194ad7b..4324e40 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -90,6 +90,7 @@ class ProxyService : public base::RefCountedThreadSafe<ProxyService> { // is of type ProxyResolverWithoutFetch. ProxyService takes ownership of // |proxy_script_fetcher|. void SetProxyScriptFetcher(ProxyScriptFetcher* proxy_script_fetcher); + ProxyScriptFetcher* GetProxyScriptFetcher() const; // Tells this ProxyService to start using a new ProxyConfigService to // retrieve its ProxyConfig from. The new ProxyConfigService will immediately @@ -180,6 +181,10 @@ class ProxyService : public base::RefCountedThreadSafe<ProxyService> { // Assign |config| as the current configuration. void SetConfig(const ProxyConfig& config); + // Starts downloading and testing the various PAC choices. + // Calls OnInitProxyResolverComplete() when completed. + void StartInitProxyResolver(); + // Tries to update the configuration if it hasn't been checked in a while. void UpdateConfigIfOld(); |