diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-13 04:52:01 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-13 04:52:01 +0000 |
| commit | db8f44cb41f402a9145bace60f6097410f46881d (patch) | |
| tree | e1a403ae9c38a7b5671133185ddc1ac936a89edf /net/proxy/proxy_service.h | |
| parent | d49801990067e7fe9a3caf141f31c6e6ba58fcfc (diff) | |
| download | chromium_src-db8f44cb41f402a9145bace60f6097410f46881d.zip chromium_src-db8f44cb41f402a9145bace60f6097410f46881d.tar.gz chromium_src-db8f44cb41f402a9145bace60f6097410f46881d.tar.bz2 | |
Reverting 6966.
this failed UI tests catastrophically
Review URL: http://codereview.chromium.org/14103
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6968 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_service.h')
| -rw-r--r-- | net/proxy/proxy_service.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index 6ab6a1b..bea4aef 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -83,7 +83,7 @@ typedef std::map<std::string, ProxyRetryInfo> ProxyRetryInfoMap; // This class can be used to resolve the proxy server to use when loading a // HTTP(S) URL. It uses the given ProxyResolver to handle the actual proxy // resolution. See ProxyResolverWinHttp for example. -class ProxyService : public base::RefCounted<ProxyService> { +class ProxyService { public: // The instance takes ownership of |resolver|. explicit ProxyService(ProxyResolver* resolver); @@ -138,10 +138,6 @@ class ProxyService : public base::RefCounted<ProxyService> { // use IE's settings). static ProxyService* Create(const ProxyInfo* pi); - // Create a ProxyService which fails every request, causing fallback to a - // direct connection. Convenience function used by unit tests. - static ProxyService* CreateNull(); - // TODO(eroman): remove once WinHTTP is gone. // Get the ProxyInfo used to create this proxy service (only used by WinHTTP). const ProxyInfo* proxy_info() const { |