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

net/cert/multi_threaded_cert_verifier.h

Index: net/cert/multi_threaded_cert_verifier.h
diff --git a/net/cert/multi_threaded_cert_verifier.h b/net/cert/multi_threaded_cert_verifier.h
index 6b9dfadb7ae24263796c89eca20e34e2f59366df..72ec488a0c7ab7c92d9f5c468fdc616242489582 100644
--- a/net/cert/multi_threaded_cert_verifier.h
+++ b/net/cert/multi_threaded_cert_verifier.h
@@ -16,7 +16,7 @@
 #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 "net/base/completion_callback.h"
 #include "net/base/net_export.h"
 #include "net/cert/cert_verifier.h"
@@ -29,9 +29,7 @@ class CertVerifyProc;
 
 // MultiThreadedCertVerifier is a CertVerifier implementation that runs
 // synchronous CertVerifier implementations on worker threads.
-class NET_EXPORT_PRIVATE MultiThreadedCertVerifier
-    : public CertVerifier,
-      NON_EXPORTED_BASE(public base::NonThreadSafe) {
+class NET_EXPORT_PRIVATE MultiThreadedCertVerifier : public CertVerifier {
  public:
   explicit MultiThreadedCertVerifier(CertVerifyProc* verify_proc);
 
@@ -87,6 +85,8 @@ class NET_EXPORT_PRIVATE MultiThreadedCertVerifier
 
   scoped_refptr<CertVerifyProc> verify_proc_;
 
+  THREAD_CHECKER(thread_checker_);
+
   DISALLOW_COPY_AND_ASSIGN(MultiThreadedCertVerifier);
 };