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

Unified Diff: chrome/browser/sync/test/integration/two_client_uss_sync_test.cc

Issue 2412193002: [Sync] Move SharedModelTypeProcessor to model_impl/. (Closed)
Patch Set: Address comment from Sky. Created 4 years, 2 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 | « no previous file | components/browser_sync/profile_sync_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc b/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
index 860ab24b201552fe8fd4407efe88664ce4dcef82..9035d31b2147fedc67b6fa66390f379b1ada7e4c 100644
--- a/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
@@ -15,13 +15,15 @@
#include "components/browser_sync/profile_sync_components_factory_impl.h"
#include "components/browser_sync/profile_sync_service.h"
#include "components/sync/model/fake_model_type_service.h"
+#include "components/sync/model/metadata_change_list.h"
+#include "components/sync/model/model_type_change_processor.h"
using browser_sync::ChromeSyncClient;
using browser_sync::ProfileSyncComponentsFactoryImpl;
using syncer::ConflictResolution;
using syncer::FakeModelTypeService;
+using syncer::ModelTypeChangeProcessor;
using syncer::ModelTypeService;
-using syncer::SharedModelTypeProcessor;
const char kKey1[] = "key1";
const char kKey2[] = "key2";
@@ -55,8 +57,7 @@ class TestModelTypeService : public FakeModelTypeService {
};
TestModelTypeService()
- : FakeModelTypeService(
- base::Bind(&SharedModelTypeProcessor::CreateAsChangeProcessor)) {}
+ : FakeModelTypeService(base::Bind(&ModelTypeChangeProcessor::Create)) {}
syncer::SyncError ApplySyncChanges(
std::unique_ptr<syncer::MetadataChangeList> metadata_changes,
« no previous file with comments | « no previous file | components/browser_sync/profile_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698