Index: net/base/network_change_notifier_win.h |
diff --git a/net/base/network_change_notifier_win.h b/net/base/network_change_notifier_win.h |
index 687149945d162637e77e5f53c48c119e024d2e18..beef6bad9f75f944a703827cc84fdca08a58454d 100644 |
--- a/net/base/network_change_notifier_win.h |
+++ b/net/base/network_change_notifier_win.h |
@@ -13,7 +13,7 @@ |
#include "base/compiler_specific.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/timer/timer.h" |
#include "base/win/object_watcher.h" |
#include "net/base/net_export.h" |
@@ -21,13 +21,12 @@ |
namespace net { |
-// NetworkChangeNotifierWin inherits from NonThreadSafe, as all its internal |
+// NetworkChangeNotifierWin uses a ThreadChecker, as all its internal |
// notification code must be called on the thread it is created and destroyed |
// on. All the NetworkChangeNotifier methods it implements are threadsafe. |
class NET_EXPORT_PRIVATE NetworkChangeNotifierWin |
: public NetworkChangeNotifier, |
- public base::win::ObjectWatcher::Delegate, |
- NON_EXPORTED_BASE(public base::NonThreadSafe) { |
+ public base::win::ObjectWatcher::Delegate { |
public: |
NetworkChangeNotifierWin(); |
@@ -115,6 +114,8 @@ class NET_EXPORT_PRIVATE NetworkChangeNotifierWin |
// Number of times polled to check if still offline. |
int offline_polls_; |
+ THREAD_CHECKER(thread_checker_); |
+ |
// Used for calling WatchForAddressChange again on failure. |
base::WeakPtrFactory<NetworkChangeNotifierWin> weak_factory_; |