[Sync] Restructure ModelTypeWorkerTest to match SMTP test.

components/sync/test/engine/mock_model_type_processor.h

Index: components/sync/test/engine/mock_model_type_processor.h
diff --git a/components/sync/test/engine/mock_model_type_processor.h b/components/sync/test/engine/mock_model_type_processor.h
index f228eace75c1cf1268b8c43d8b3a4a1c6b7545c5..ddadba297632572280779cf5a7ec0b3087d343c0 100644
--- a/components/sync/test/engine/mock_model_type_processor.h
+++ b/components/sync/test/engine/mock_model_type_processor.h
@@ -9,6 +9,7 @@
 #include <stdint.h>
 
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -73,16 +74,14 @@ class MockModelTypeProcessor : public ModelTypeProcessor {
   // Does not includes repsonses that are in pending tasks.
   size_t GetNumUpdateResponses() const;
   UpdateResponseDataList GetNthUpdateResponse(size_t n) const;
-  sync_pb::DataTypeState GetNthTypeStateReceivedInUpdateResponse(
-      size_t n) const;
+  sync_pb::DataTypeState GetNthUpdateState(size_t n) const;
 
   // Getters to access the log of received commit responses.
   //
   // Does not includes responses that are in pending tasks.
   size_t GetNumCommitResponses() const;
   CommitResponseDataList GetNthCommitResponse(size_t n) const;
-  sync_pb::DataTypeState GetNthTypeStateReceivedInCommitResponse(
-      size_t n) const;
+  sync_pb::DataTypeState GetNthCommitState(size_t n) const;
 
   // Getters to access the lastest update response for a given tag_hash.
   bool HasUpdateResponse(const std::string& tag_hash) const;