| Index: net/proxy/dhcp_proxy_script_adapter_fetcher_win.h
|
| diff --git a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h
|
| index 7d72537a77e065f13c776fa71309f4df9a50dc42..d95fe60df0395d091e8b782db492c4c5177b4893 100644
|
| --- a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h
|
| +++ b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h
|
| @@ -13,8 +13,8 @@
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| +#include "base/sequence_checker.h"
|
| #include "base/strings/string16.h"
|
| -#include "base/threading/non_thread_safe.h"
|
| #include "base/timer/timer.h"
|
| #include "net/base/completion_callback.h"
|
| #include "net/base/net_export.h"
|
| @@ -32,8 +32,7 @@ class URLRequestContext;
|
| // For a given adapter, this class takes care of first doing a DHCP lookup
|
| // to get the PAC URL, then if there is one, trying to fetch it.
|
| class NET_EXPORT_PRIVATE DhcpProxyScriptAdapterFetcher
|
| - : public base::SupportsWeakPtr<DhcpProxyScriptAdapterFetcher>,
|
| - NON_EXPORTED_BASE(public base::NonThreadSafe) {
|
| + : public base::SupportsWeakPtr<DhcpProxyScriptAdapterFetcher> {
|
| public:
|
| // |url_request_context| must outlive DhcpProxyScriptAdapterFetcher.
|
| // |task_runner| will be used to post tasks to a thread.
|
| @@ -185,6 +184,8 @@ class NET_EXPORT_PRIVATE DhcpProxyScriptAdapterFetcher
|
|
|
| URLRequestContext* const url_request_context_;
|
|
|
| + SEQUENCE_CHECKER(sequence_checker_);
|
| +
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(DhcpProxyScriptAdapterFetcher);
|
| };
|
|
|
|
|