Deprecate NonThreadSafe in net/ in favor of SequenceChecker/ThreadChecker.

net/ssl/channel_id_service.h

Index: net/ssl/channel_id_service.h
diff --git a/net/ssl/channel_id_service.h b/net/ssl/channel_id_service.h
index a3eb15927000d14e5b4d937a228125e9bb02f723..7745841b6b22f4a7c1f309aeeec7dbc24975ca78 100644
--- a/net/ssl/channel_id_service.h
+++ b/net/ssl/channel_id_service.h
@@ -17,7 +17,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/task_runner.h"
-#include "base/threading/non_thread_safe.h"
+#include "base/threading/thread_checker.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
 #include "net/ssl/channel_id_store.h"
@@ -31,11 +31,7 @@ namespace net {
 class ChannelIDServiceJob;
 
 // A class for creating and fetching Channel IDs.
-
-// Inherits from NonThreadSafe in order to use the function
-// |CalledOnValidThread|.
-class NET_EXPORT ChannelIDService
-    : NON_EXPORTED_BASE(public base::NonThreadSafe) {
+class NET_EXPORT ChannelIDService {
  public:
   class NET_EXPORT Request {
    public:
@@ -176,6 +172,8 @@ class NET_EXPORT ChannelIDService
   uint64_t inflight_joins_;
   uint64_t workers_created_;
 
+  THREAD_CHECKER(thread_checker_);
+
   base::WeakPtrFactory<ChannelIDService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelIDService);