diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-06 19:37:13 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-06 19:37:13 +0000 |
| commit | a2e7635d1041978c2bd9cac44efdc6c9b842e049 (patch) | |
| tree | 73f431c43c404c1c74d639c1d39c5dcf59d150bc /net/proxy/mock_proxy_resolver.h | |
| parent | 1fce002c881f8e6e3645aa1bd3b07c43d497773f (diff) | |
| download | chromium_src-a2e7635d1041978c2bd9cac44efdc6c9b842e049.zip chromium_src-a2e7635d1041978c2bd9cac44efdc6c9b842e049.tar.gz chromium_src-a2e7635d1041978c2bd9cac44efdc6c9b842e049.tar.bz2 | |
Re-order some declarations in ProxyService, to ensure that deletion of InitProxyResolver happens *after* the deletion of ProxyResolver.
BUG=24864
TEST=ProxyServiceTest.DeleteWhileInitProxyResolverHasOutstandingFetch, ProxyServiceTest.DeleteWhileInitProxyResolverHasOutstandingSet
Review URL: http://codereview.chromium.org/519060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35643 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/mock_proxy_resolver.h')
| -rw-r--r-- | net/proxy/mock_proxy_resolver.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/proxy/mock_proxy_resolver.h b/net/proxy/mock_proxy_resolver.h index 67eb925..c284eb1 100644 --- a/net/proxy/mock_proxy_resolver.h +++ b/net/proxy/mock_proxy_resolver.h @@ -124,6 +124,10 @@ class MockAsyncProxyResolverBase : public ProxyResolver { return ERR_IO_PENDING; } + virtual void CancelSetPacScript() { + // Do nothing (caller was responsible for completing the request). + } + const RequestsList& pending_requests() const { return pending_requests_; } |