diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-14 21:03:42 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-14 21:03:42 +0000 |
commit | 28d42dd690a7785694e7ad4fc2b981cb375b955f (patch) | |
tree | 1d9b1d870a66f467df756102eac03f280d0c1ec0 /net/proxy/proxy_service.h | |
parent | 1f89f352af4edc119a7e63ac920ed32f6c83c884 (diff) | |
download | chromium_src-28d42dd690a7785694e7ad4fc2b981cb375b955f.zip chromium_src-28d42dd690a7785694e7ad4fc2b981cb375b955f.tar.gz chromium_src-28d42dd690a7785694e7ad4fc2b981cb375b955f.tar.bz2 |
Tag ProxyService as NonThreadSafe.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6831018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81639 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_service.h')
-rw-r--r-- | net/proxy/proxy_service.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index edb588d..8146470 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -12,6 +12,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/waitable_event.h" +#include "base/threading/non_thread_safe.h" #include "net/base/completion_callback.h" #include "net/base/net_log.h" #include "net/base/network_change_notifier.h" @@ -33,9 +34,10 @@ 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::RefCountedThreadSafe<ProxyService>, +class ProxyService : public base::RefCounted<ProxyService>, public NetworkChangeNotifier::IPAddressObserver, - public ProxyConfigService::Observer { + public ProxyConfigService::Observer, + public base::NonThreadSafe { public: // The instance takes ownership of |config_service| and |resolver|. // |net_log| is a possibly NULL destination to send log events to. It must @@ -215,7 +217,7 @@ class ProxyService : public base::RefCountedThreadSafe<ProxyService>, #endif private: - friend class base::RefCountedThreadSafe<ProxyService>; + friend class base::RefCounted<ProxyService>; FRIEND_TEST_ALL_PREFIXES(ProxyServiceTest, UpdateConfigAfterFailedAutodetect); FRIEND_TEST_ALL_PREFIXES(ProxyServiceTest, UpdateConfigFromPACToDirect); friend class PacRequest; |