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

components/sync/driver/shared_change_processor_unittest.cc

 // 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.
 
 #include "components/sync/driver/shared_change_processor.h"
 
 #include <cstddef>
 #include <memory>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "components/sync/api/attachments/attachment_id.h"
 #include "components/sync/api/attachments/attachment_store.h"
+#include "components/sync/api/data_type_error_handler_mock.h"
 #include "components/sync/api/fake_syncable_service.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/core/attachments/attachment_service_impl.h"
-#include "components/sync/core/test/data_type_error_handler_mock.h"
 #include "components/sync/core/test/test_user_share.h"
 #include "components/sync/device_info/local_device_info_provider.h"
 #include "components/sync/driver/fake_sync_client.h"
 #include "components/sync/driver/generic_change_processor.h"
 #include "components/sync/driver/generic_change_processor_factory.h"
 #include "components/sync/driver/sync_api_component_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sync_driver {
@@ skipping 27 matching lines @@
       const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs,
       const base::FilePath& sync_folder) override {
     return nullptr;
   }
   std::unique_ptr<sync_driver::LocalDeviceInfoProvider>
   CreateLocalDeviceInfoProvider() override {
     return nullptr;
   }
   SyncApiComponentFactory::SyncComponents CreateBookmarkSyncComponents(
       sync_driver::SyncService* sync_service,
-      syncer::DataTypeErrorHandler* error_handler) override {
+      std::unique_ptr<syncer::DataTypeErrorHandler> error_handler) override {
     return SyncApiComponentFactory::SyncComponents(nullptr, nullptr);
   }
   std::unique_ptr<syncer::AttachmentService> CreateAttachmentService(
       std::unique_ptr<syncer::AttachmentStoreForSync> attachment_store,
       const syncer::UserShare& user_share,
       const std::string& store_birthday,
       syncer::ModelType model_type,
       syncer::AttachmentService::Delegate* delegate) override {
     return syncer::AttachmentServiceImpl::CreateForTest();
   }
@@ skipping 101 matching lines @@
   }
 
   // Used by Connect().  The SharedChangeProcessor is passed in
   // because we modify |shared_change_processor_| on the main thread
   // (in TearDown()).
   void ConnectOnDBThread(
       const scoped_refptr<SharedChangeProcessor>& shared_change_processor) {
     DCHECK(backend_thread_.task_runner()->BelongsToCurrentThread());
     EXPECT_TRUE(shared_change_processor->Connect(
         this, &processor_factory_, test_user_share_.user_share(),
-        &error_handler_, base::WeakPtr<syncer::SyncMergeResult>()));
+        base::MakeUnique<syncer::DataTypeErrorHandlerMock>(),
+        base::WeakPtr<syncer::SyncMergeResult>()));
     did_connect_ = true;
   }
 
   void CheckAttachmentServiceOnDBThread(base::WaitableEvent* event) {
     DCHECK(backend_thread_.task_runner()->BelongsToCurrentThread());
     DCHECK(db_syncable_service_.get());
     has_attachment_service_ = !!db_syncable_service_->attachment_service();
     event->Signal();
   }
 
   base::MessageLoop frontend_loop_;
   base::Thread backend_thread_;
   syncer::TestUserShare test_user_share_;
   TestSyncApiComponentFactory factory_;
 
   scoped_refptr<SharedChangeProcessor> shared_change_processor_;
-  StrictMock<syncer::DataTypeErrorHandlerMock> error_handler_;
 
   GenericChangeProcessorFactory processor_factory_;
   bool did_connect_;
   bool has_attachment_service_;
 
   // Used only on DB thread.
   std::unique_ptr<syncer::FakeSyncableService> db_syncable_service_;
 };
 
 // Simply connect the shared change processor.  It should succeed, and
 // nothing further should happen.
 TEST_F(SyncSharedChangeProcessorTest, Basic) {
   Connect();
 }
 
 // Connect the shared change processor to a syncable service with
 // AttachmentStore. Verify that shared change processor implementation
 // creates AttachmentService and passes it back to the syncable service.
 TEST_F(SyncSharedChangeProcessorTest, ConnectWithAttachmentStore) {
   SetAttachmentStore();
   Connect();
   EXPECT_TRUE(HasAttachmentService());
 }
 
 }  // namespace
 
 }  // namespace sync_driver