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

components/sync/device_info/device_info_service_unittest.cc

 // Copyright 2015 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/device_info/device_info_service.h"
 
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "components/sync/api/data_batch.h"
+#include "components/sync/api/data_type_error_handler_mock.h"
 #include "components/sync/api/entity_data.h"
 #include "components/sync/api/fake_model_type_change_processor.h"
 #include "components/sync/api/metadata_batch.h"
 #include "components/sync/api/model_type_store.h"
 #include "components/sync/base/time.h"
-#include "components/sync/core/test/data_type_error_handler_mock.h"
 #include "components/sync/core/test/model_type_store_test_util.h"
 #include "components/sync/device_info/local_device_info_provider_mock.h"
 #include "components/sync/protocol/data_type_state.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sync_driver_v2 {
 
 using base::Time;
 using base::TimeDelta;
 using syncer::SyncError;
@@ skipping 175 matching lines @@
     service_.reset(new DeviceInfoService(
         local_device_.get(),
         base::Bind(&ModelTypeStoreTestUtil::MoveStoreToCallback,
                    base::Passed(&store_)),
         base::Bind(&DeviceInfoServiceTest::CreateModelTypeChangeProcessor,
                    base::Unretained(this))));
     service_->AddObserver(this);
   }
 
   void OnSyncStarting() {
-    service()->OnSyncStarting(&error_handler_, StartCallback());
+    service()->OnSyncStarting(
+        base::MakeUnique<syncer::DataTypeErrorHandlerMock>(), StartCallback());
   }
 
   // Creates the service and runs any outstanding tasks. This will typically
   // cause all initialization callbacks between the sevice and store to fire.
   void InitializeAndPump() {
     InitializeService();
     base::RunLoop().RunUntilIdle();
   }
 
   // Creates the service, runs any outstanding tasks, and then indicates to the
@@ skipping 85 matching lines @@
   int change_count_;
 
   // In memory model type store needs a MessageLoop.
   base::MessageLoop message_loop_;
 
   // Holds the store while the service is not initialized.
   std::unique_ptr<ModelTypeStore> store_;
 
   std::unique_ptr<LocalDeviceInfoProviderMock> local_device_;
 
-  // Mock error handler passed to the processor.
-  syncer::DataTypeErrorHandlerMock error_handler_;
-
   // Not initialized immediately (upon test's constructor). This allows each
   // test case to modify the dependencies the service will be constructed with.
   std::unique_ptr<DeviceInfoService> service_;
 
   // A non-owning pointer to the processor given to the service. Will be nullptr
   // before being given to the service, to make ownership easier.
   RecordingModelTypeChangeProcessor* processor_ = nullptr;
 
   // A monotonically increasing label for generated specifics objects with data
   // that is slightly different from eachother.
@@ skipping 432 matching lines @@
   specifics.set_cache_guid("non-local");
   PushBackEntityChangeAdd(specifics, &change_list);
   service()->ApplySyncChanges(service()->CreateMetadataChangeList(),
                               change_list);
   EXPECT_EQ(1, service()->CountActiveDevices());
 }
 
 }  // namespace
 
 }  // namespace sync_driver_v2