[Sync] Moving DataTypeState to proto for serialization

sync/sessions/model_type_registry_unittest.cc

Index: sync/sessions/model_type_registry_unittest.cc
diff --git a/sync/sessions/model_type_registry_unittest.cc b/sync/sessions/model_type_registry_unittest.cc
index d5b620e9ba99806cf7f83ea51dbadc0db1aaffd3..079b37b4cfb73fe5a3d4b595d87620593ca126f1 100644
--- a/sync/sessions/model_type_registry_unittest.cc
+++ b/sync/sessions/model_type_registry_unittest.cc
@@ -13,6 +13,7 @@
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/shared_model_type_processor.h"
 #include "sync/internal_api/public/test/fake_model_type_service.h"
+#include "sync/protocol/data_type_state.pb.h"
 #include "sync/test/engine/fake_model_worker.h"
 #include "sync/test/engine/mock_nudge_handler.h"
 #include "sync/test/engine/test_directory_setter_upper.h"
@@ -29,15 +30,15 @@ class ModelTypeRegistryTest : public ::testing::Test,
 
   ModelTypeRegistry* registry();
 
-  static syncer_v2::DataTypeState MakeInitialDataTypeState(ModelType type) {
-    syncer_v2::DataTypeState state;
-    state.progress_marker.set_data_type_id(
+  static sync_pb::DataTypeState MakeInitialDataTypeState(ModelType type) {
+    sync_pb::DataTypeState state;
+    state.mutable_progress_marker()->set_data_type_id(
         GetSpecificsFieldNumberFromModelType(type));
     return state;
   }
 
   static scoped_ptr<syncer_v2::ActivationContext> MakeActivationContext(
-      const syncer_v2::DataTypeState& data_type_state,
+      const sync_pb::DataTypeState& data_type_state,
       const syncer_v2::UpdateResponseDataList& saved_pending_updates,
       scoped_ptr<syncer_v2::ModelTypeProcessor> type_processor) {
     scoped_ptr<syncer_v2::ActivationContext> context =