Index: net/http/http_cache.h |
diff --git a/net/http/http_cache.h b/net/http/http_cache.h |
index 635cb92d557d17c6c60ca459f4117deb075f71f7..6aa26ae225f7dc2c2d60b0a4b08593fb40a853bf 100644 |
--- a/net/http/http_cache.h |
+++ b/net/http/http_cache.h |
@@ -23,7 +23,7 @@ |
#include "base/files/file_path.h" |
#include "base/macros.h" |
#include "base/memory/weak_ptr.h" |
-#include "base/threading/non_thread_safe.h" |
+#include "base/threading/thread_checker.h" |
#include "base/time/clock.h" |
#include "base/time/time.h" |
#include "net/base/cache_type.h" |
@@ -57,8 +57,7 @@ class NetLog; |
class ViewCacheHelper; |
struct HttpRequestInfo; |
-class NET_EXPORT HttpCache : public HttpTransactionFactory, |
- NON_EXPORTED_BASE(public base::NonThreadSafe) { |
+class NET_EXPORT HttpCache : public HttpTransactionFactory { |
public: |
// The cache mode of operation. |
enum Mode { |
@@ -434,6 +433,8 @@ class NET_EXPORT HttpCache : public HttpTransactionFactory, |
// A clock that can be swapped out for testing. |
std::unique_ptr<base::Clock> clock_; |
+ THREAD_CHECKER(thread_checker_); |
+ |
base::WeakPtrFactory<HttpCache> weak_factory_; |
DISALLOW_COPY_AND_ASSIGN(HttpCache); |