diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-05 23:34:24 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-05 23:34:24 +0000 |
commit | 5389bc7ba5360633af04b9cf15497d56ce640ead (patch) | |
tree | 4518c05f3bad18a5b2f4739fc1a1c187651f9799 /net/proxy/proxy_service.h | |
parent | 4070a6b1efcb2dbea12508a0b912cfa3bc86f47e (diff) | |
download | chromium_src-5389bc7ba5360633af04b9cf15497d56ce640ead.zip chromium_src-5389bc7ba5360633af04b9cf15497d56ce640ead.tar.gz chromium_src-5389bc7ba5360633af04b9cf15497d56ce640ead.tar.bz2 |
Second patch in making destructors of refcounted objects private.
BUG=26749
Review URL: http://codereview.chromium.org/368001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_service.h')
-rw-r--r-- | net/proxy/proxy_service.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index d7ed7ab..194ad7b 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -36,8 +36,6 @@ class ProxyService : public base::RefCountedThreadSafe<ProxyService> { // 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,16 +152,20 @@ class ProxyService : public base::RefCountedThreadSafe<ProxyService> { 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; + // TODO(eroman): change this to a std::set. Note that this requires updating // some tests in proxy_service_unittest.cc such as: // ProxyServiceTest.InitialPACScriptDownload // which expects requests to finish in the order they were added. typedef std::vector<scoped_refptr<PacRequest> > PendingRequests; + ~ProxyService(); + // Creates a proxy resolver appropriate for this platform that doesn't rely // on V8. static ProxyResolver* CreateNonV8ProxyResolver(); @@ -283,6 +285,10 @@ class SyncProxyServiceHelper 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); |