| Index: net/dns/mock_host_resolver.h
|
| diff --git a/net/dns/mock_host_resolver.h b/net/dns/mock_host_resolver.h
|
| index d61002c56e543b5932658bcf3b95073a5786a90d..1fa32c73f77219e50d8579443bf47ac878d9100c 100644
|
| --- a/net/dns/mock_host_resolver.h
|
| +++ b/net/dns/mock_host_resolver.h
|
| @@ -15,7 +15,7 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/synchronization/lock.h"
|
| #include "base/synchronization/waitable_event.h"
|
| -#include "base/threading/non_thread_safe.h"
|
| +#include "base/threading/thread_checker.h"
|
| #include "net/dns/host_resolver.h"
|
| #include "net/dns/host_resolver_proc.h"
|
|
|
| @@ -56,9 +56,9 @@ int ParseAddressList(const std::string& host_list,
|
| // 127.0.0.1.
|
|
|
| // Base class shared by MockHostResolver and MockCachingHostResolver.
|
| -class MockHostResolverBase : public HostResolver,
|
| - public base::SupportsWeakPtr<MockHostResolverBase>,
|
| - public base::NonThreadSafe {
|
| +class MockHostResolverBase
|
| + : public HostResolver,
|
| + public base::SupportsWeakPtr<MockHostResolverBase> {
|
| private:
|
| class RequestImpl;
|
|
|
| @@ -147,6 +147,8 @@ class MockHostResolverBase : public HostResolver,
|
| size_t num_resolve_;
|
| size_t num_resolve_from_cache_;
|
|
|
| + THREAD_CHECKER(thread_checker_);
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(MockHostResolverBase);
|
| };
|
|
|
|
|