[Sync] Moving DataTypeState to be a proto so that it can easily be

serialized to storage by model types.

BUG=543405

Review URL: https://codereview.chromium.org/1678343002

Cr-Commit-Position: refs/heads/master@{#374667}

3 files changed, 10 insertions, 8 deletions

diff --git a/sync/api/metadata_batch.cc b/sync/api/metadata_batch.cc
index 072ad5e..a172d1e 100644
--- a/sync/api/metadata_batch.cc
+++ b/sync/api/metadata_batch.cc
@@ -18,11 +18,11 @@ void MetadataBatch::AddMetadata(const std::string& client_tag,
   metadata_map_.insert(std::make_pair(client_tag, metadata));
 }
 
-const DataTypeState& MetadataBatch::GetDataTypeState() const {
+const sync_pb::DataTypeState& MetadataBatch::GetDataTypeState() const {
   return state_;
 }
 
-void MetadataBatch::SetDataTypeState(const DataTypeState& state) {
+void MetadataBatch::SetDataTypeState(const sync_pb::DataTypeState& state) {
   state_ = state;
 }
 
diff --git a/sync/api/metadata_batch.h b/sync/api/metadata_batch.h
index 56ab2a7..dd4b8d0 100644
--- a/sync/api/metadata_batch.h
+++ b/sync/api/metadata_batch.h
@@ -6,9 +6,10 @@
 #define SYNC_API_METADATA_BATCH_H_
 
 #include <map>
+#include <string>
 
 #include "sync/base/sync_export.h"
-#include "sync/internal_api/public/non_blocking_sync_common.h"
+#include "sync/protocol/data_type_state.pb.h"
 #include "sync/protocol/entity_metadata.pb.h"
 
 namespace syncer_v2 {
@@ -32,14 +33,14 @@ class SYNC_EXPORT MetadataBatch {
                    const sync_pb::EntityMetadata& metadata);
 
   // Get the DataTypeState for this batch.
-  const DataTypeState& GetDataTypeState() const;
+  const sync_pb::DataTypeState& GetDataTypeState() const;
 
   // Set the DataTypeState for this batch.
-  void SetDataTypeState(const DataTypeState& state);
+  void SetDataTypeState(const sync_pb::DataTypeState& state);
 
  private:
   EntityMetadataMap metadata_map_;
-  DataTypeState state_;
+  sync_pb::DataTypeState state_;
 };
 
 }  // namespace syncer_v2
diff --git a/sync/api/metadata_change_list.h b/sync/api/metadata_change_list.h
index a8c0d95..53c8e24 100644
--- a/sync/api/metadata_change_list.h
+++ b/sync/api/metadata_change_list.h
@@ -10,11 +10,11 @@
 #include "sync/base/sync_export.h"
 
 namespace sync_pb {
+class DataTypeState;
 class EntityMetadata;
 }  // namespace sync_pb
 
 namespace syncer_v2 {
-struct DataTypeState;
 
 // Interface used by the processor and service to communicate about metadata.
 // The purpose of the interface is to record changes to data type global and
@@ -30,7 +30,8 @@ class SYNC_EXPORT MetadataChangeList {
   virtual ~MetadataChangeList() {}
 
   // Requests DataTypeState to be updated in the storage.
-  virtual void UpdateDataTypeState(const DataTypeState& data_type_state) = 0;
+  virtual void UpdateDataTypeState(
+      const sync_pb::DataTypeState& data_type_state) = 0;
 
   // Requests DataTypeState to be cleared from the storage.
   virtual void ClearDataTypeState() = 0;