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

Unified Diff: sync/internal_api/shared_model_type_processor_unittest.cc

Issue 1763953002: [USS] Change the place where SharedModelTypeProcessor got created (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit Created 4 years, 9 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
« no previous file with comments | « sync/internal_api/shared_model_type_processor.cc ('k') | sync/internal_api/test/fake_model_type_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/shared_model_type_processor_unittest.cc
diff --git a/sync/internal_api/shared_model_type_processor_unittest.cc b/sync/internal_api/shared_model_type_processor_unittest.cc
index 1e6a7f79ef8dd908d928a7a77c89ea93438f56be..b89ff3dc280791caf8fbe0ccdcb0f0cb7c52055e 100644
--- a/sync/internal_api/shared_model_type_processor_unittest.cc
+++ b/sync/internal_api/shared_model_type_processor_unittest.cc
@@ -146,14 +146,8 @@ class SharedModelTypeProcessorTest : public ::testing::Test,
~SharedModelTypeProcessorTest() override {}
- void CreateProcessor() {
- ASSERT_FALSE(type_processor());
- set_change_processor(
- make_scoped_ptr(new SharedModelTypeProcessor(kModelType, this)));
- }
-
void InitializeToMetadataLoaded() {
- CreateProcessor();
+ ASSERT_TRUE(GetOrCreateChangeProcessor());
sync_pb::DataTypeState data_type_state(db_.data_type_state());
data_type_state.set_initial_sync_done(true);
db_.set_data_type_state(data_type_state);
@@ -391,6 +385,13 @@ class SharedModelTypeProcessorTest : public ::testing::Test,
return static_cast<SharedModelTypeProcessor*>(change_processor());
}
+ protected:
+ syncer_v2::ModelTypeChangeProcessor* CreateProcessorForTest(
+ syncer::ModelType type,
+ ModelTypeService* service) override {
+ return new SharedModelTypeProcessor(kModelType, service);
+ }
+
private:
static std::string GenerateTagHash(const std::string& tag) {
return syncer::syncable::GenerateSyncableHash(kModelType, tag);
@@ -545,7 +546,7 @@ class SharedModelTypeProcessorTest : public ::testing::Test,
// Test that an initial sync handles local and remote items properly.
TEST_F(SharedModelTypeProcessorTest, InitialSync) {
- CreateProcessor();
+ GetOrCreateChangeProcessor();
OnMetadataLoaded();
OnSyncStarting();
@@ -1171,7 +1172,7 @@ TEST_F(SharedModelTypeProcessorTest, Disable) {
WriteItem(kTag3, kValue3);
// Now we re-enable.
- CreateProcessor();
+ GetOrCreateChangeProcessor();
OnMetadataLoaded();
OnSyncStarting();
OnInitialSyncDone();
« no previous file with comments | « sync/internal_api/shared_model_type_processor.cc ('k') | sync/internal_api/test/fake_model_type_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698