[Sync] Moving DataTypeState to proto for serialization

sync/internal_api/public/non_blocking_sync_common.h

Index: sync/internal_api/public/non_blocking_sync_common.h
diff --git a/sync/internal_api/public/non_blocking_sync_common.h b/sync/internal_api/public/non_blocking_sync_common.h
index 799dfca538f8f37751aa3e95ae080cd036d66833..b12ff014cc73759eb311997df390748cff8fe1da 100644
--- a/sync/internal_api/public/non_blocking_sync_common.h
+++ b/sync/internal_api/public/non_blocking_sync_common.h
@@ -19,32 +19,6 @@ namespace syncer_v2 {
 
 static const int64_t kUncommittedVersion = -1;
 
-// Data-type global state that must be accessed and updated on the sync thread,
-// but persisted on or through the model thread.
-struct SYNC_EXPORT DataTypeState {
-  DataTypeState();
-  ~DataTypeState();
-
-  // The latest progress markers received from the server.
-  sync_pb::DataTypeProgressMarker progress_marker;
-
-  // A data type context.  Sent to the server in every commit or update
-  // request.  May be updated by either by responses from the server or
-  // requests made on the model thread.  The interpretation of this value may
-  // be data-type specific.  Many data types ignore it.
-  sync_pb::DataTypeContext type_context;
-
-  // This value is set if this type's data should be encrypted on the server.
-  // If this key changes, the client will need to re-commit all of its local
-  // data to the server using the new encryption key.
-  std::string encryption_key_name;
-
-  // This flag is set to true when the first download cycle is complete.  The
-  // ModelTypeProcessor should not attempt to commit any items until this
-  // flag is set.
-  bool initial_sync_done = false;
-};
-
 struct SYNC_EXPORT CommitRequestData {
   CommitRequestData();
   ~CommitRequestData();