Remove deprecated NonThreadSafe usage in net\socket.

net/socket/tcp_socket_win.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_SOCKET_TCP_SOCKET_WIN_H_
 #define NET_SOCKET_TCP_SOCKET_WIN_H_
 
 #include <stdint.h>
 #include <winsock2.h>
 
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/threading/non_thread_safe.h"
+#include "base/threading/thread_checker.h"
 #include "base/win/object_watcher.h"
 #include "net/base/address_family.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
 #include "net/log/net_log_with_source.h"
 #include "net/socket/socket_descriptor.h"
 #include "net/socket/socket_performance_watcher.h"
 
 namespace net {
 
 class AddressList;
 class IOBuffer;
 class IPEndPoint;
 class NetLog;
 struct NetLogSource;
 
-class NET_EXPORT TCPSocketWin : NON_EXPORTED_BASE(public base::NonThreadSafe),
-                                public base::win::ObjectWatcher::Delegate  {
+class NET_EXPORT TCPSocketWin : public base::win::ObjectWatcher::Delegate {
  public:
   TCPSocketWin(
       std::unique_ptr<SocketPerformanceWatcher> socket_performance_watcher,
       NetLog* net_log,
       const NetLogSource& source);
   ~TCPSocketWin() override;
 
   int Open(AddressFamily family);
 
   // Takes ownership of |socket|, which is known to already be connected to the
@@ skipping 134 matching lines @@
   CompletionCallback write_callback_;
 
   std::unique_ptr<IPEndPoint> peer_address_;
   // The OS error that a connect attempt last completed with.
   int connect_os_error_;
 
   bool logging_multiple_connect_attempts_;
 
   NetLogWithSource net_log_;
 
+  THREAD_CHECKER(thread_checker_);
+
   DISALLOW_COPY_AND_ASSIGN(TCPSocketWin);
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_TCP_SOCKET_WIN_H_