[Sync] Rename DataTypeState to ModelTypeState.

components/sync/test/engine/mock_model_type_processor.cc

Index: components/sync/test/engine/mock_model_type_processor.cc
diff --git a/components/sync/test/engine/mock_model_type_processor.cc b/components/sync/test/engine/mock_model_type_processor.cc
index b4be919d96217d606083fe5b214d3a50362eed45..878497ef30335b4b599d34160e3daeca2e15fa3d 100644
--- a/components/sync/test/engine/mock_model_type_processor.cc
+++ b/components/sync/test/engine/mock_model_type_processor.cc
@@ -29,7 +29,7 @@ void MockModelTypeProcessor::DisconnectSync() {
 }
 
 void MockModelTypeProcessor::OnCommitCompleted(
-    const sync_pb::DataTypeState& type_state,
+    const sync_pb::ModelTypeState& type_state,
     const CommitResponseDataList& response_list) {
   base::Closure task =
       base::Bind(&MockModelTypeProcessor::OnCommitCompletedImpl,
@@ -40,7 +40,7 @@ void MockModelTypeProcessor::OnCommitCompleted(
 }
 
 void MockModelTypeProcessor::OnUpdateReceived(
-    const sync_pb::DataTypeState& type_state,
+    const sync_pb::ModelTypeState& type_state,
     const UpdateResponseDataList& response_list) {
   base::Closure task =
       base::Bind(&MockModelTypeProcessor::OnUpdateReceivedImpl,
@@ -131,7 +131,7 @@ UpdateResponseDataList MockModelTypeProcessor::GetNthUpdateResponse(
   return received_update_responses_[n];
 }
 
-sync_pb::DataTypeState MockModelTypeProcessor::GetNthUpdateState(
+sync_pb::ModelTypeState MockModelTypeProcessor::GetNthUpdateState(
     size_t n) const {
   DCHECK_LT(n, GetNumUpdateResponses());
   return type_states_received_on_update_[n];
@@ -147,7 +147,7 @@ CommitResponseDataList MockModelTypeProcessor::GetNthCommitResponse(
   return received_commit_responses_[n];
 }
 
-sync_pb::DataTypeState MockModelTypeProcessor::GetNthCommitState(
+sync_pb::ModelTypeState MockModelTypeProcessor::GetNthCommitState(
     size_t n) const {
   DCHECK_LT(n, GetNumCommitResponses());
   return type_states_received_on_commit_[n];
@@ -189,7 +189,7 @@ void MockModelTypeProcessor::SetDisconnectCallback(
 }
 
 void MockModelTypeProcessor::OnCommitCompletedImpl(
-    const sync_pb::DataTypeState& type_state,
+    const sync_pb::ModelTypeState& type_state,
     const CommitResponseDataList& response_list) {
   received_commit_responses_.push_back(response_list);
   type_states_received_on_commit_.push_back(type_state);
@@ -204,7 +204,7 @@ void MockModelTypeProcessor::OnCommitCompletedImpl(
 }
 
 void MockModelTypeProcessor::OnUpdateReceivedImpl(
-    const sync_pb::DataTypeState& type_state,
+    const sync_pb::ModelTypeState& type_state,
     const UpdateResponseDataList& response_list) {
   received_update_responses_.push_back(response_list);
   type_states_received_on_update_.push_back(type_state);