[Sync] Moving DataTypeState to proto for serialization

sync/test/engine/mock_model_type_processor.h

Index: sync/test/engine/mock_model_type_processor.h
diff --git a/sync/test/engine/mock_model_type_processor.h b/sync/test/engine/mock_model_type_processor.h
index 120dedc8bc31e90b5d241de01684b9079a84bc8a..a5a168e9066d0e2afd063cef3aaade18ed8d9d7f 100644
--- a/sync/test/engine/mock_model_type_processor.h
+++ b/sync/test/engine/mock_model_type_processor.h
@@ -16,6 +16,7 @@
 #include "base/macros.h"
 #include "sync/internal_api/public/model_type_processor.h"
 #include "sync/internal_api/public/non_blocking_sync_common.h"
+#include "sync/protocol/data_type_state.pb.h"
 
 namespace syncer_v2 {
 
@@ -37,9 +38,9 @@ class MockModelTypeProcessor : public ModelTypeProcessor {
 
   // Implementation of ModelTypeProcessor.
   void OnConnect(scoped_ptr<CommitQueue> commit_queue) override;
-  void OnCommitCompleted(const DataTypeState& type_state,
+  void OnCommitCompleted(const sync_pb::DataTypeState& type_state,
                          const CommitResponseDataList& response_list) override;
-  void OnUpdateReceived(const DataTypeState& type_state,
+  void OnUpdateReceived(const sync_pb::DataTypeState& type_state,
                         const UpdateResponseDataList& response_list,
                         const UpdateResponseDataList& pending_updates) override;
 
@@ -71,14 +72,16 @@ class MockModelTypeProcessor : public ModelTypeProcessor {
   size_t GetNumUpdateResponses() const;
   UpdateResponseDataList GetNthUpdateResponse(size_t n) const;
   UpdateResponseDataList GetNthPendingUpdates(size_t n) const;
-  DataTypeState GetNthTypeStateReceivedInUpdateResponse(size_t n) const;
+  sync_pb::DataTypeState GetNthTypeStateReceivedInUpdateResponse(
+      size_t n) const;
 
   // Getters to access the log of received commit responses.
   //
   // Does not includes repsonses that are in pending tasks.
   size_t GetNumCommitResponses() const;
   CommitResponseDataList GetNthCommitResponse(size_t n) const;
-  DataTypeState GetNthTypeStateReceivedInCommitResponse(size_t n) const;
+  sync_pb::DataTypeState GetNthTypeStateReceivedInCommitResponse(
+      size_t n) const;
 
   // Getters to access the lastest update response for a given tag_hash.
   bool HasUpdateResponse(const std::string& tag_hash) const;
@@ -92,13 +95,13 @@ class MockModelTypeProcessor : public ModelTypeProcessor {
   // Process a received commit response.
   //
   // Implemented as an Impl method so we can defer its execution in some cases.
-  void OnCommitCompletedImpl(const DataTypeState& type_state,
+  void OnCommitCompletedImpl(const sync_pb::DataTypeState& type_state,
                              const CommitResponseDataList& response_list);
 
   // Process a received update response.
   //
   // Implemented as an Impl method so we can defer its execution in some cases.
-  void OnUpdateReceivedImpl(const DataTypeState& type_state,
+  void OnUpdateReceivedImpl(const sync_pb::DataTypeState& type_state,
                             const UpdateResponseDataList& response_list,
                             const UpdateResponseDataList& pending_updates);
 
@@ -125,8 +128,8 @@ class MockModelTypeProcessor : public ModelTypeProcessor {
   std::vector<CommitResponseDataList> received_commit_responses_;
   std::vector<UpdateResponseDataList> received_update_responses_;
   std::vector<UpdateResponseDataList> received_pending_updates_;
-  std::vector<DataTypeState> type_states_received_on_update_;
-  std::vector<DataTypeState> type_states_received_on_commit_;
+  std::vector<sync_pb::DataTypeState> type_states_received_on_update_;
+  std::vector<sync_pb::DataTypeState> type_states_received_on_commit_;
 
   // Latest responses received, indexed by tag_hash.
   std::map<const std::string, CommitResponseData> commit_response_items_;