Chromium Code Reviews| Index: net/proxy/proxy_service.h |
| =================================================================== |
| --- net/proxy/proxy_service.h (revision 31079) |
| +++ net/proxy/proxy_service.h (working copy) |
| @@ -36,8 +36,6 @@ |
| // The instance takes ownership of |config_service| and |resolver|. |
| ProxyService(ProxyConfigService* config_service, ProxyResolver* resolver); |
| - ~ProxyService(); |
| - |
| // Used internally to handle PAC queries. |
| // TODO(eroman): consider naming this simply "Request". |
| class PacRequest; |
| @@ -154,10 +152,14 @@ |
| MessageLoop* io_loop, MessageLoop* file_loop); |
| private: |
| + friend class base::RefCountedThreadSafe<ProxyService>; |
| FRIEND_TEST(ProxyServiceTest, IsLocalName); |
| FRIEND_TEST(ProxyServiceTest, UpdateConfigAfterFailedAutodetect); |
| FRIEND_TEST(ProxyServiceTest, UpdateConfigFromPACToDirect); |
| friend class PacRequest; |
| + |
| + ~ProxyService(); |
|
eroman
2009/11/05 20:52:19
nit: move this below the typedef
jam
2009/11/05 21:56:02
Done.
|
| + |
| // TODO(eroman): change this to a std::set. Note that this requires updating |
| // some tests in proxy_service_unittest.cc such as: |
| // ProxyServiceTest.InitialPACScriptDownload |
| @@ -283,6 +285,10 @@ |
| ProxyInfo* proxy_info, LoadLog* load_log); |
| private: |
| + friend class base::RefCountedThreadSafe<SyncProxyServiceHelper>; |
| + |
| + ~SyncProxyServiceHelper() {} |
| + |
| void StartAsyncResolve(const GURL& url, LoadLog* load_log); |
| void StartAsyncReconsider(const GURL& url, LoadLog* load_log); |