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

components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc

 // 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.
 
 // TODO(akalin): This file is basically just a unit test for
 // BookmarkChangeProcessor.  Write unit tests for
 // BookmarkModelAssociator separately.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <queue>
 #include <stack>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/test_message_loop.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/managed/managed_bookmark_service.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "components/bookmarks/test/test_bookmark_client.h"
 #include "components/browser_sync/browser/profile_sync_test_util.h"
+#include "components/sync/api/data_type_error_handler.h"
+#include "components/sync/api/data_type_error_handler_mock.h"
 #include "components/sync/api/sync_error.h"
 #include "components/sync/api/sync_merge_result.h"
 #include "components/sync/core/change_record.h"
-#include "components/sync/core/data_type_error_handler.h"
 #include "components/sync/core/read_node.h"
 #include "components/sync/core/read_transaction.h"
-#include "components/sync/core/test/data_type_error_handler_mock.h"
 #include "components/sync/core/test/test_user_share.h"
 #include "components/sync/core/write_node.h"
 #include "components/sync/core/write_transaction.h"
 #include "components/sync/core_impl/syncapi_internal.h"
 #include "components/sync/driver/fake_sync_client.h"
 #include "components/sync/syncable/mutable_entry.h"
 #include "components/sync/syncable/syncable_id.h"
 #include "components/sync/syncable/syncable_util.h"
 #include "components/sync/syncable/syncable_write_transaction.h"
 #include "components/sync_bookmarks/bookmark_change_processor.h"
@@ skipping 482 matching lines @@
     }
     return true;
   }
 
   bool AssociateModels() {
     DCHECK(!model_associator_);
 
     // Set up model associator.
     model_associator_.reset(new BookmarkModelAssociator(
         model_.get(), sync_client_.get(), test_user_share_.user_share(),
-        &mock_error_handler_, kExpectMobileBookmarks));
+        base::MakeUnique<syncer::DataTypeErrorHandlerMock>(),
+        kExpectMobileBookmarks));
 
     local_merge_result_ = syncer::SyncMergeResult(syncer::BOOKMARKS);
     syncer_merge_result_ = syncer::SyncMergeResult(syncer::BOOKMARKS);
     int local_count_before = model_->root_node()->GetTotalNodeCount();
     int syncer_count_before = GetSyncBookmarkCount();
 
     syncer::SyncError error = model_associator_->AssociateModels(
         &local_merge_result_, &syncer_merge_result_);
     if (error.IsSet())
       return false;
@@ skipping 221 matching lines @@
 
   syncer::TestUserShare* test_user_share() { return &test_user_share_; }
 
   BookmarkChangeProcessor* change_processor() {
     return change_processor_.get();
   }
 
   void delete_change_processor() { change_processor_.reset(); }
 
   void ResetChangeProcessor() {
+    std::unique_ptr<syncer::DataTypeErrorHandlerMock> error_handler =
+        base::MakeUnique<syncer::DataTypeErrorHandlerMock>();
+    mock_error_handler_ = error_handler.get();
     change_processor_ = base::MakeUnique<BookmarkChangeProcessor>(
-        sync_client_.get(), model_associator_.get(), &mock_error_handler_);
+        sync_client_.get(), model_associator_.get(), std::move(error_handler));
   }
 
   syncer::DataTypeErrorHandlerMock* mock_error_handler() {
-    return &mock_error_handler_;
+    return mock_error_handler_;
   }
 
   void delete_model_associator() { model_associator_.reset(); }
 
   BookmarkModelAssociator* model_associator() {
     return model_associator_.get();
   }
 
   bookmarks::ManagedBookmarkService* managed_bookmark_service() {
     return managed_bookmark_service_.get();
   }
 
  private:
+  base::TestMessageLoop message_loop_;
   base::ScopedTempDir data_dir_;
-  base::MessageLoop message_loop_;
   browser_sync::ProfileSyncServiceBundle profile_sync_service_bundle_;
 
   std::unique_ptr<sync_driver::FakeSyncClient> sync_client_;
   std::unique_ptr<BookmarkModel> model_;
   syncer::TestUserShare test_user_share_;
   std::unique_ptr<BookmarkChangeProcessor> change_processor_;
-  StrictMock<syncer::DataTypeErrorHandlerMock> mock_error_handler_;
+  syncer::DataTypeErrorHandlerMock* mock_error_handler_;
   std::unique_ptr<BookmarkModelAssociator> model_associator_;
   std::unique_ptr<bookmarks::ManagedBookmarkService> managed_bookmark_service_;
 
   syncer::SyncMergeResult local_merge_result_;
   syncer::SyncMergeResult syncer_merge_result_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceBookmarkTest);
 };
 
 TEST_F(ProfileSyncServiceBookmarkTest, InitialState) {
@@ skipping 1757 matching lines @@
   EXPECT_EQ(syncer::kInvalidId, sync_id);
 
   // Verify that Sync ignores deleting this node.
   model()->Remove(node);
   EXPECT_EQ(sync_bookmark_count, GetSyncBookmarkCount());
 }
 
 }  // namespace
 
 }  // namespace browser_sync