[Sync] Moving DataTypeState to proto for serialization

sync/internal_api/shared_model_type_processor_unittest.cc

Index: sync/internal_api/shared_model_type_processor_unittest.cc
diff --git a/sync/internal_api/shared_model_type_processor_unittest.cc b/sync/internal_api/shared_model_type_processor_unittest.cc
index 91b88c9f48de1e969c41e5f7176cb7614300eb92..6e7dae7f7f57062eeecb03557d5f2d96687c0551 100644
--- a/sync/internal_api/shared_model_type_processor_unittest.cc
+++ b/sync/internal_api/shared_model_type_processor_unittest.cc
@@ -16,6 +16,7 @@
 #include "sync/internal_api/public/non_blocking_sync_common.h"
 #include "sync/internal_api/public/test/fake_metadata_change_list.h"
 #include "sync/internal_api/public/test/fake_model_type_service.h"
+#include "sync/protocol/data_type_state.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/syncable/syncable_util.h"
 #include "sync/test/engine/mock_commit_queue.h"
@@ -168,7 +169,7 @@ class SharedModelTypeProcessorTest : public ::testing::Test,
   scoped_ptr<MockCommitQueue> mock_queue_ptr_;
   scoped_ptr<SharedModelTypeProcessor> type_processor_;
 
-  DataTypeState data_type_state_;
+  sync_pb::DataTypeState data_type_state_;
 
   // The last received EntityChangeList.
   scoped_ptr<EntityChangeList> entity_change_list_;
@@ -186,7 +187,7 @@ SharedModelTypeProcessorTest::SharedModelTypeProcessorTest()
 SharedModelTypeProcessorTest::~SharedModelTypeProcessorTest() {}
 
 void SharedModelTypeProcessorTest::InitializeToReadyState() {
-  data_type_state_.initial_sync_done = true;
+  data_type_state_.set_initial_sync_done(true);
   Start();
   // TODO(maxbogue): crbug.com/569642: Remove this once entity data is loaded
   // for the normal startup flow.
@@ -249,7 +250,7 @@ void SharedModelTypeProcessorTest::DeleteItem(const std::string& tag,
 }
 
 void SharedModelTypeProcessorTest::OnInitialSyncDone() {
-  data_type_state_.initial_sync_done = true;
+  data_type_state_.set_initial_sync_done(true);
   UpdateResponseDataList empty_update_list;
 
   // TODO(stanisc): crbug/569645: replace this with loading the initial state
@@ -340,7 +341,7 @@ void SharedModelTypeProcessorTest::SuccessfulCommitResponse(
 
 void SharedModelTypeProcessorTest::UpdateDesiredEncryptionKey(
     const std::string& key_name) {
-  data_type_state_.encryption_key_name = key_name;
+  data_type_state_.set_encryption_key_name(key_name);
   type_processor_->OnUpdateReceived(data_type_state_, UpdateResponseDataList(),
                                     UpdateResponseDataList());
 }
@@ -555,7 +556,7 @@ TEST_F(SharedModelTypeProcessorTest, CreateAndModifyWithOverrides) {
   entity_data->specifics.mutable_preference()->set_value("value2");
   entity_data->non_unique_name = "name2";
   entity_data->client_tag_hash = "hash";
-  // TODO (skym): Consider removing this. The ID should never be changed by the
+  // TODO(skym): Consider removing this. The ID should never be changed by the
   // client once established.
   entity_data->id = "cid2";
 
@@ -582,7 +583,7 @@ TEST_F(SharedModelTypeProcessorTest, CreateAndModifyWithOverrides) {
   const FakeMetadataChangeList::Record& record2 = change_list.GetNthRecord(1);
   EXPECT_EQ(FakeMetadataChangeList::UPDATE_METADATA, record2.action);
   EXPECT_EQ("tag1", record2.tag);
-  // TODO (skym): Is this correct?
+  // TODO(skym): Is this correct?
   EXPECT_EQ("cid1", record2.metadata.server_id());
   EXPECT_EQ("hash", record2.metadata.client_tag_hash());
 
@@ -912,11 +913,11 @@ TEST_F(SharedModelTypeProcessorTest, DISABLED_Disable) {
   // Once we're ready to commit, all three local items should consider
   // themselves uncommitted and pending for commit.
   // TODO(maxbogue): crbug.com/569645: Fix when data is loaded.
-   EXPECT_EQ(1U, GetNumCommitRequestLists());
-   EXPECT_EQ(3U, GetNthCommitRequestList(0).size());
-   EXPECT_TRUE(HasCommitRequestForTag("tag1"));
-   EXPECT_TRUE(HasCommitRequestForTag("tag2"));
-   EXPECT_TRUE(HasCommitRequestForTag("tag3"));
+  EXPECT_EQ(1U, GetNumCommitRequestLists());
+  EXPECT_EQ(3U, GetNthCommitRequestList(0).size());
+  EXPECT_TRUE(HasCommitRequestForTag("tag1"));
+  EXPECT_TRUE(HasCommitRequestForTag("tag2"));
+  EXPECT_TRUE(HasCommitRequestForTag("tag3"));
 }
 
 // Test receipt of pending updates.