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

Unified Diff: components/sync/api/model_type_service_unittest.cc

Issue 2289143003: [Sync] Convert DTCs to be not RefCounted and NonThreadSafe. (Closed)
Patch Set: Rebase, address comments, remove TestMessageLoop. 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/api/model_type_service_unittest.cc
diff --git a/components/sync/api/model_type_service_unittest.cc b/components/sync/api/model_type_service_unittest.cc
index 481c82d2c793b695d994b30cc82e4abb2b993400..34dc2158a83ed2bf546912488beddf06e98531d2 100644
--- a/components/sync/api/model_type_service_unittest.cc
+++ b/components/sync/api/model_type_service_unittest.cc
@@ -6,9 +6,9 @@
#include "base/bind.h"
#include "base/memory/ptr_util.h"
+#include "components/sync/api/data_type_error_handler_mock.h"
#include "components/sync/api/fake_model_type_change_processor.h"
#include "components/sync/api/fake_model_type_service.h"
-#include "components/sync/core/test/data_type_error_handler_mock.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace syncer_v2 {
@@ -69,8 +69,9 @@ class ModelTypeServiceTest : public ::testing::Test {
void OnSyncStarting() {
service_.OnSyncStarting(
- &error_handler_, base::Bind(&ModelTypeServiceTest::OnProcessorStarted,
- base::Unretained(this)));
+ base::MakeUnique<syncer::DataTypeErrorHandlerMock>(),
+ base::Bind(&ModelTypeServiceTest::OnProcessorStarted,
+ base::Unretained(this)));
}
bool start_callback_called() const { return start_callback_called_; }
@@ -84,7 +85,6 @@ class ModelTypeServiceTest : public ::testing::Test {
}
bool start_callback_called_;
- syncer::DataTypeErrorHandlerMock error_handler_;
MockModelTypeService service_;
};

Powered by Google App Engine
This is Rietveld 408576698