Remove deprecated NonThreadSafe usage in net\socket.

net/socket/udp_socket_win.h

 // Copyright (c) 2012 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_UDP_SOCKET_WIN_H_
 #define NET_SOCKET_UDP_SOCKET_WIN_H_
 
 #include <qos2.h>
 #include <stdint.h>
 #include <winsock2.h>
 
 #include <memory>
 
 #include "base/gtest_prod_util.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 "base/win/scoped_handle.h"
 #include "net/base/address_family.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_export.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/rand_callback.h"
 #include "net/log/net_log_with_source.h"
 #include "net/socket/datagram_socket.h"
 #include "net/socket/diff_serv_code_point.h"
 
 namespace net {
 
 class IPAddress;
 class NetLog;
 struct NetLogSource;
 
 class NET_EXPORT UDPSocketWin
-    : NON_EXPORTED_BASE(public base::NonThreadSafe),
-      NON_EXPORTED_BASE(public base::win::ObjectWatcher::Delegate) {
+    : NON_EXPORTED_BASE(public base::win::ObjectWatcher::Delegate) {
  public:
   UDPSocketWin(DatagramSocket::BindType bind_type,
                const RandIntCallback& rand_int_cb,
                net::NetLog* net_log,
                const net::NetLogSource& source);
   ~UDPSocketWin() override;
 
   // Opens the socket.
   // Returns a net error code.
   int Open(AddressFamily address_family);
@@ skipping 268 matching lines @@
 
   // External callback; called when write is complete.
   CompletionCallback write_callback_;
 
   NetLogWithSource net_log_;
 
   // QWAVE data. Used to set DSCP bits on outgoing packets.
   HANDLE qos_handle_;
   QOS_FLOWID qos_flow_id_;
 
+  THREAD_CHECKER(thread_checker_);
+
   DISALLOW_COPY_AND_ASSIGN(UDPSocketWin);
 };
 
 //-----------------------------------------------------------------------------
 
 // QWAVE (Quality Windows Audio/Video Experience) is the latest windows
 // library for setting packet priorities (and other things). Unfortunately,
 // Microsoft has decided that setting the DSCP bits with setsockopt() no
 // longer works, so we have to use this API instead.
 // This class is meant to be used as a singleton. It exposes a few dynamically
@@ skipping 43 matching lines @@
   SetFlowFn set_flow_func_;
 
   FRIEND_TEST_ALL_PREFIXES(UDPSocketTest, SetDSCPFake);
   DISALLOW_COPY_AND_ASSIGN(QwaveAPI);
 };
 
 
 }  // namespace net
 
 #endif  // NET_SOCKET_UDP_SOCKET_WIN_H_