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

net/ssl/channel_id_store.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_STORE_H_
 #define NET_SSL_CHANNEL_ID_STORE_H_
 
 #include <list>
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
-#include "base/threading/non_thread_safe.h"
+#include "base/threading/thread_checker.h"
 #include "base/time/time.h"
 #include "crypto/ec_private_key.h"
 #include "net/base/net_export.h"
 
 namespace net {
 
 // An interface for storing and retrieving channel ID keypairs.
 // See https://tools.ietf.org/html/draft-balfanz-tls-channelid-01
 
 // Owned only by a single ChannelIDService object, which is responsible
 // for deleting it.
-class NET_EXPORT ChannelIDStore
-    : NON_EXPORTED_BASE(public base::NonThreadSafe) {
+class NET_EXPORT ChannelIDStore {
  public:
   // The ChannelID class contains a keypair, along with the corresponding
   // hostname (server identifier) and creation time.
   class NET_EXPORT ChannelID {
    public:
     ChannelID();
     ChannelID(const std::string& server_identifier,
               base::Time creation_time,
               std::unique_ptr<crypto::ECPrivateKey> key);
     ChannelID(const ChannelID& other);
@@ skipping 15 matching lines @@
     std::unique_ptr<crypto::ECPrivateKey> key_;
   };
 
   typedef std::list<ChannelID> ChannelIDList;
 
   typedef base::Callback<
       void(int, const std::string&, std::unique_ptr<crypto::ECPrivateKey>)>
       GetChannelIDCallback;
   typedef base::Callback<void(const ChannelIDList&)> GetChannelIDListCallback;
 
-  virtual ~ChannelIDStore() {}
+  virtual ~ChannelIDStore();
 
   // GetChannelID may return the result synchronously through the
   // output parameters, in which case it will return either OK if a keypair is
   // found in the store, or ERR_FILE_NOT_FOUND if none is found.  If the
   // result cannot be returned synchronously, GetChannelID will
   // return ERR_IO_PENDING and the callback will be called with the result
   // asynchronously.
   virtual int GetChannelID(const std::string& server_identifier,
                            std::unique_ptr<crypto::ECPrivateKey>* key_result,
                            const GetChannelIDCallback& callback) = 0;
@@ skipping 33 matching lines @@
   // Public only for unit testing.
   virtual int GetChannelIDCount() = 0;
 
   // When invoked, instructs the store to keep session related data on
   // destruction.
   virtual void SetForceKeepSessionState() = 0;
 
   // Returns true if this ChannelIDStore is ephemeral, and false if it is
   // persistent.
   virtual bool IsEphemeral() = 0;
+
+ protected:
+  THREAD_CHECKER(thread_checker_);
 };
 
 }  // namespace net
 
 #endif  // NET_SSL_CHANNEL_ID_STORE_H_