| Index: net/proxy/proxy_service.h
|
| diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h
|
| index c3a211ca2e886f40388364982dcb9aa7a7ab923a..c739f5aa336090541f1203546cdbc24e6dd66677 100644
|
| --- a/net/proxy/proxy_service.h
|
| +++ b/net/proxy/proxy_service.h
|
| @@ -15,8 +15,8 @@
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| +#include "base/sequence_checker.h"
|
| #include "base/synchronization/waitable_event.h"
|
| -#include "base/threading/non_thread_safe.h"
|
| #include "net/base/completion_callback.h"
|
| #include "net/base/load_states.h"
|
| #include "net/base/net_export.h"
|
| @@ -49,8 +49,7 @@ class ProxyScriptFetcher;
|
| // resolution. See ProxyResolverV8 for example.
|
| class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
|
| public NetworkChangeNotifier::DNSObserver,
|
| - public ProxyConfigService::Observer,
|
| - NON_EXPORTED_BASE(public base::NonThreadSafe) {
|
| + public ProxyConfigService::Observer {
|
| public:
|
| // Enumerates the policy to use when sanitizing URLs for proxy resolution
|
| // (before passing them off to PAC scripts).
|
| @@ -482,6 +481,8 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
|
| // The method to use for sanitizing URLs seen by the proxy resolver.
|
| SanitizeUrlPolicy sanitize_url_policy_;
|
|
|
| + SEQUENCE_CHECKER(sequence_checker_);
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ProxyService);
|
| };
|
|
|
|
|