Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Unified Diff: components/sync/device_info/device_info_service_unittest.cc

Issue 2289143003: [Sync] Convert DTCs to be not RefCounted and NonThreadSafe. (Closed)
Patch Set: Rebase. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/sync/device_info/device_info_service_unittest.cc
diff --git a/components/sync/device_info/device_info_service_unittest.cc b/components/sync/device_info/device_info_service_unittest.cc
index a87da1c7e1c2a176c27a6c00ca7375270f33087d..c4067e22c01c340875da3169305879c4b5086ca5 100644
--- a/components/sync/device_info/device_info_service_unittest.cc
+++ b/components/sync/device_info/device_info_service_unittest.cc
@@ -16,12 +16,12 @@
#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"
@@ -217,7 +217,8 @@ class DeviceInfoServiceTest : public testing::Test,
}
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
@@ -323,9 +324,6 @@ class DeviceInfoServiceTest : public testing::Test,
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_;
« no previous file with comments | « components/sync/device_info/device_info_data_type_controller_unittest.cc ('k') | components/sync/driver/change_processor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698