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

net/ssl/channel_id_service.h

 // Copyright 2014 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_SSL_CHANNEL_ID_SERVICE_H_
 #define NET_SSL_CHANNEL_ID_SERVICE_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #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"
 
 namespace crypto {
 class ECPrivateKey;
 }  // namespace crypto
 
 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:
     Request();
     ~Request();
 
     // Cancel the request.  Does nothing if the request finished or was already
     // cancelled.
     void Cancel();
 
@@ skipping 120 matching lines @@
 
   // inflight_ maps from a server to an active generation which is taking
   // place.
   std::map<std::string, std::unique_ptr<ChannelIDServiceJob>> inflight_;
 
   uint64_t requests_;
   uint64_t key_store_hits_;
   uint64_t inflight_joins_;
   uint64_t workers_created_;
 
+  THREAD_CHECKER(thread_checker_);
+
   base::WeakPtrFactory<ChannelIDService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelIDService);
 };
 
 }  // namespace net
 
 #endif  // NET_SSL_CHANNEL_ID_SERVICE_H_