diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-15 12:16:48 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-15 12:16:48 +0000 |
| commit | 9ef6e9e2b54707a686e22ad7ea328e8745d82ce3 (patch) | |
| tree | 272ade56d9ba5dbfbe55e6be9ddf286ba9c26cab /chrome/browser/io_thread.cc | |
| parent | c42bef0b1e7ec7e3d4aca4f0b27074a8c88c1c9d (diff) | |
| download | chromium_src-9ef6e9e2b54707a686e22ad7ea328e8745d82ce3.zip chromium_src-9ef6e9e2b54707a686e22ad7ea328e8745d82ce3.tar.gz chromium_src-9ef6e9e2b54707a686e22ad7ea328e8745d82ce3.tar.bz2 | |
Remove the HostResolverImpl::Shutdown() method.
This was originally needed to avoid crashing when the HostResolverImpl was being leaked, by forcing things to a "shutdown" state.
However since HostResolverImpl is no longer reference counted, this work-around is no longer necessary.
The other place that HostResolver::Shutdown() was used, was in SyncHostResolverBridge. It overrode it to unblock synchronous host resolves and avoid deadlock during shutdown. To accomodate this user, I added a separate interface (SyncHostResolver) to expose the shutdown method.
Lastly, fixed a leak of SyncHostResolverBridge by moving ownership of the dependency into ProxyResolverJSBindings.
BUG=74572,76427,18373
Review URL: http://codereview.chromium.org/7046097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89167 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/io_thread.cc')
| -rw-r--r-- | chrome/browser/io_thread.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index aa22c105..32386c9 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -545,11 +545,6 @@ void IOThread::CleanUp() { delete speculative_interceptor_; speculative_interceptor_ = NULL; - // TODO(eroman): hack for http://crbug.com/15513 - if (globals_->host_resolver->GetAsHostResolverImpl()) { - globals_->host_resolver.get()->GetAsHostResolverImpl()->Shutdown(); - } - system_proxy_config_service_.reset(); delete globals_; |