Deprecate NonThreadSafe in components/sync in favor of SequenceChecker.

components/sync/syncable/directory_backing_store.h

 // Copyright 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 COMPONENTS_SYNC_SYNCABLE_DIRECTORY_BACKING_STORE_H_
 #define COMPONENTS_SYNC_SYNCABLE_DIRECTORY_BACKING_STORE_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
-#include "base/threading/non_thread_safe.h"
+#include "base/sequence_checker.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/syncable/dir_open_result.h"
 #include "components/sync/syncable/directory.h"
 #include "components/sync/syncable/metahandle_set.h"
 #include "sql/connection.h"
 #include "sql/statement.h"
 
 namespace base {
 namespace trace_event {
 class ProcessMemoryDump;
@@ skipping 18 matching lines @@
 //
 // The DirectoryBackingStore will own an sqlite lock on its database for most of
 // its lifetime.  You must not have two DirectoryBackingStore objects accessing
 // the database simultaneously.  Because the lock exists at the database level,
 // not even two separate browser instances would be able to acquire it
 // simultaneously.
 //
 // This class is abstract so that we can extend it in interesting ways for use
 // in tests.  The concrete class used in non-test scenarios is
 // OnDiskDirectoryBackingStore.
-class DirectoryBackingStore : public base::NonThreadSafe {
+class DirectoryBackingStore {
  public:
   explicit DirectoryBackingStore(const std::string& dir_name);
   virtual ~DirectoryBackingStore();
 
   // Loads and drops all currently persisted meta entries into |handles_map|
   // and loads appropriate persisted kernel info into |kernel_load_info|.
   // The function determines which entries can be safely dropped and inserts
   // their keys into |metahandles_to_purge|. It is up to the caller to
   // perform the actual cleanup.
   //
@@ skipping 123 matching lines @@
   bool MigrateVersion88To89();
   bool MigrateVersion89To90();
   bool MigrateVersion90To91();
 
   // Accessor for needs_column_refresh_.  Used in tests.
   bool needs_column_refresh() const;
 
   // Destroys the existing Connection and creates a new one.
   void ResetAndCreateConnection();
 
+  SEQUENCE_CHECKER(sequence_checker_);
+
  private:
   friend class DirectoryBackingStoreTest;
   friend class TestDirectoryBackingStore;
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest,
                            IncreaseDatabasePageSizeFrom4KTo32K);
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest,
                            CatastrophicErrorHandler_KeptAcrossReset);
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest,
                            CatastrophicErrorHandler_InvocationDuringLoad);
   FRIEND_TEST_ALL_PREFIXES(
@@ skipping 61 matching lines @@
   // sql::Connection is destroyed/recreated.
   base::Closure catastrophic_error_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectoryBackingStore);
 };
 
 }  // namespace syncable
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_SYNCABLE_DIRECTORY_BACKING_STORE_H_