diff options
Diffstat (limited to 'net/proxy/proxy_service.h')
| -rw-r--r-- | net/proxy/proxy_service.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index 8146470..5f6cbf2 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -34,8 +34,7 @@ class URLRequestContext; // 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 ProxyResolverV8 for example. -class ProxyService : public base::RefCounted<ProxyService>, - public NetworkChangeNotifier::IPAddressObserver, +class ProxyService : public NetworkChangeNotifier::IPAddressObserver, public ProxyConfigService::Observer, public base::NonThreadSafe { public: @@ -46,6 +45,8 @@ class ProxyService : public base::RefCounted<ProxyService>, ProxyResolver* resolver, NetLog* net_log); + virtual ~ProxyService(); + // Used internally to handle PAC queries. // TODO(eroman): consider naming this simply "Request". class PacRequest; @@ -217,7 +218,6 @@ class ProxyService : public base::RefCounted<ProxyService>, #endif private: - friend class base::RefCounted<ProxyService>; FRIEND_TEST_ALL_PREFIXES(ProxyServiceTest, UpdateConfigAfterFailedAutodetect); FRIEND_TEST_ALL_PREFIXES(ProxyServiceTest, UpdateConfigFromPACToDirect); friend class PacRequest; @@ -235,8 +235,6 @@ class ProxyService : public base::RefCounted<ProxyService>, STATE_READY, }; - virtual ~ProxyService(); - // Resets all the variables associated with the current proxy configuration, // and rewinds the current state to |STATE_NONE|. Returns the previous value // of |current_state_|. If |reset_fetched_config| is true then |