[Sync] Restructure ModelTypeWorkerTest to match SMTP test.

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 ad39d2857df8101e5d1636169a8196a6880d0eab..ce970b8c4dc9039a335a55329934117994829369 100644
--- a/components/sync/test/engine/mock_model_type_processor.cc
+++ b/components/sync/test/engine/mock_model_type_processor.cc
@@ -4,8 +4,7 @@
 
 #include "components/sync/test/engine/mock_model_type_processor.h"
 
-#include <stddef.h>
-#include <stdint.h>
+#include <utility>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ -132,8 +131,7 @@ UpdateResponseDataList MockModelTypeProcessor::GetNthUpdateResponse(
   return received_update_responses_[n];
 }
 
-sync_pb::DataTypeState
-MockModelTypeProcessor::GetNthTypeStateReceivedInUpdateResponse(
+sync_pb::DataTypeState MockModelTypeProcessor::GetNthUpdateState(
     size_t n) const {
   DCHECK_LT(n, GetNumUpdateResponses());
   return type_states_received_on_update_[n];
@@ -149,8 +147,7 @@ CommitResponseDataList MockModelTypeProcessor::GetNthCommitResponse(
   return received_commit_responses_[n];
 }
 
-sync_pb::DataTypeState
-MockModelTypeProcessor::GetNthTypeStateReceivedInCommitResponse(
+sync_pb::DataTypeState MockModelTypeProcessor::GetNthCommitState(
     size_t n) const {
   DCHECK_LT(n, GetNumCommitResponses());
   return type_states_received_on_commit_[n];