[Sync] Convert DTCs to be not RefCounted and NonThreadSafe.

components/sync_bookmarks/bookmark_model_associator.h

 // Copyright (c) 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_BOOKMARKS_BOOKMARK_MODEL_ASSOCIATOR_H_
 #define COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_MODEL_ASSOCIATOR_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
+#include <memory>
 #include <set>
 #include <stack>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/hash.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/threading/thread_checker.h"
+#include "components/sync/api/data_type_error_handler.h"
 #include "components/sync/base/unrecoverable_error_handler.h"
-#include "components/sync/core/data_type_error_handler.h"
 #include "components/sync/driver/model_associator.h"
 
 class GURL;
 
 namespace bookmarks {
 class BookmarkModel;
 class BookmarkNode;
 }
 
 namespace syncer {
@@ skipping 18 matching lines @@
           PerDataTypeAssociatorInterface<bookmarks::BookmarkNode, int64_t> {
  public:
   static syncer::ModelType model_type() { return syncer::BOOKMARKS; }
   // |expect_mobile_bookmarks_folder| controls whether or not we
   // expect the mobile bookmarks permanent folder to be created.
   // Should be set to true only by mobile clients.
   BookmarkModelAssociator(
       bookmarks::BookmarkModel* bookmark_model,
       sync_driver::SyncClient* sync_client,
       syncer::UserShare* user_share,
-      syncer::DataTypeErrorHandler* unrecoverable_error_handler,
+      std::unique_ptr<syncer::DataTypeErrorHandler> unrecoverable_error_handler,
       bool expect_mobile_bookmarks_folder);
   ~BookmarkModelAssociator() override;
 
   // AssociatorInterface implementation.
   //
   // AssociateModels iterates through both the sync and the browser
   // bookmark model, looking for matched pairs of items.  For any pairs it
   // finds, it will call AssociateSyncID.  For any unmatched items,
   // MergeAndAssociateModels will try to repair the match, e.g. by adding a new
   // node.  After successful completion, the models should be identical and
@@ skipping 212 matching lines @@
   // Check whether bookmark model and sync model are synced by comparing
   // their transaction versions.
   // Returns a PERSISTENCE_ERROR if a transaction mismatch was detected where
   // the native model has a newer transaction verison.
   syncer::SyncError CheckModelSyncState(Context* context) const;
 
   base::ThreadChecker thread_checker_;
   bookmarks::BookmarkModel* bookmark_model_;
   sync_driver::SyncClient* sync_client_;
   syncer::UserShare* user_share_;
-  syncer::DataTypeErrorHandler* unrecoverable_error_handler_;
+  std::unique_ptr<syncer::DataTypeErrorHandler> unrecoverable_error_handler_;
   const bool expect_mobile_bookmarks_folder_;
   BookmarkIdToSyncIdMap id_map_;
   SyncIdToBookmarkNodeMap id_map_inverse_;
   // Stores sync ids for dirty associations.
   DirtyAssociationsSyncIds dirty_associations_sync_ids_;
 
   // Used to post PersistAssociation tasks to the current message loop and
   // guarantees no invocations can occur if |this| has been deleted. (This
   // allows this class to be non-refcounted).
   base::WeakPtrFactory<BookmarkModelAssociator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_MODEL_ASSOCIATOR_H_