[Sync] Fixing two bugs in the worker revealed by trying to add an encryption integration test.

components/sync/core/processor_entity_tracker_unittest.cc

Index: components/sync/core/processor_entity_tracker_unittest.cc
diff --git a/components/sync/core/processor_entity_tracker_unittest.cc b/components/sync/core/processor_entity_tracker_unittest.cc
index 58c10c81dde0c6058e49158fe5116c5da427bf41..aa48d3774626485b139673441511f313f56c2c07 100644
--- a/components/sync/core/processor_entity_tracker_unittest.cc
+++ b/components/sync/core/processor_entity_tracker_unittest.cc
@@ -469,6 +469,12 @@ TEST_F(ProcessorEntityTrackerTest, LocalChangesInterleaved) {
   EXPECT_EQ(specifics_hash_v2, entity->metadata().specifics_hash());
   EXPECT_EQ(specifics_hash_v1, entity->metadata().base_specifics_hash());
 
+  EXPECT_TRUE(entity->IsUnsynced());

[maxbogue, 2016/09/21 00:57:14]

Thanks!

[skym, 2016/09/22 18:58:46]

Acknowledged.

+  EXPECT_FALSE(entity->RequiresCommitRequest());
+  EXPECT_FALSE(entity->RequiresCommitData());
+  EXPECT_FALSE(entity->CanClearMetadata());
+  EXPECT_TRUE(entity->HasCommitData());
+
   // Ack the second commit.
   entity->ReceiveCommitResponse(GenerateAckData(request_v2, kId, 3));