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

Unified Diff: components/sync/engine_impl/model_type_worker_unittest.cc

Issue 2394573002: [Sync] Rename DataTypeState to ModelTypeState. (Closed)
Patch Set: Rebase. 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 | « components/sync/engine_impl/model_type_worker.cc ('k') | components/sync/protocol/data_type_state.proto » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/engine_impl/model_type_worker_unittest.cc
diff --git a/components/sync/engine_impl/model_type_worker_unittest.cc b/components/sync/engine_impl/model_type_worker_unittest.cc
index 3f45a7f72f5c0283c24581429e59e0aefdb8ee51..f9029eda2abd0e8c9745b005919237e854abac35 100644
--- a/components/sync/engine_impl/model_type_worker_unittest.cc
+++ b/components/sync/engine_impl/model_type_worker_unittest.cc
@@ -142,7 +142,7 @@ class ModelTypeWorkerTest : public ::testing::Test {
// significant server action until we receive an update response that
// contains the type root node for this type.
void FirstInitialize() {
- sync_pb::DataTypeState initial_state;
+ sync_pb::ModelTypeState initial_state;
initial_state.mutable_progress_marker()->set_data_type_id(
GetSpecificsFieldNumberFromModelType(kModelType));
@@ -158,7 +158,7 @@ class ModelTypeWorkerTest : public ::testing::Test {
// Initialize with some saved pending updates from the model thread.
void InitializeWithPendingUpdates(
const UpdateResponseDataList& initial_pending_updates) {
- sync_pb::DataTypeState initial_state;
+ sync_pb::ModelTypeState initial_state;
initial_state.mutable_progress_marker()->set_data_type_id(
GetSpecificsFieldNumberFromModelType(kModelType));
initial_state.mutable_progress_marker()->set_token(
@@ -171,9 +171,9 @@ class ModelTypeWorkerTest : public ::testing::Test {
mock_nudge_handler_.ClearCounters();
}
- // Initialize with a custom initial DataTypeState and pending updates.
+ // Initialize with a custom initial ModelTypeState and pending updates.
void InitializeWithState(
- const sync_pb::DataTypeState& state,
+ const sync_pb::ModelTypeState& state,
const UpdateResponseDataList& initial_pending_updates) {
DCHECK(!worker_);
@@ -595,7 +595,7 @@ TEST_F(ModelTypeWorkerTest, SendInitialSyncDone) {
// The update contains no entities.
EXPECT_EQ(0U, processor()->GetNthUpdateResponse(0).size());
- const sync_pb::DataTypeState& state = processor()->GetNthUpdateState(0);
+ const sync_pb::ModelTypeState& state = processor()->GetNthUpdateState(0);
EXPECT_FALSE(state.progress_marker().token().empty());
EXPECT_TRUE(state.initial_sync_done());
EXPECT_TRUE(worker()->IsInitialSyncEnded());
« no previous file with comments | « components/sync/engine_impl/model_type_worker.cc ('k') | components/sync/protocol/data_type_state.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698