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

components/sync/core/processor_entity_tracker_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/sync/core/processor_entity_tracker.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
@@ skipping 451 matching lines @@
 
   // Ack the first commit.
   entity->ReceiveCommitResponse(GenerateAckData(request_v1, kId, 2));
 
   EXPECT_EQ(2, entity->metadata().sequence_number());
   EXPECT_EQ(1, entity->metadata().acked_sequence_number());
   EXPECT_EQ(2, entity->metadata().server_version());
   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));
 
   EXPECT_EQ(2, entity->metadata().sequence_number());
   EXPECT_EQ(2, entity->metadata().acked_sequence_number());
   EXPECT_EQ(3, entity->metadata().server_version());
   EXPECT_EQ(specifics_hash_v2, entity->metadata().specifics_hash());
   EXPECT_EQ("", entity->metadata().base_specifics_hash());
 
   EXPECT_FALSE(entity->IsUnsynced());
   EXPECT_FALSE(entity->RequiresCommitRequest());
   EXPECT_FALSE(entity->RequiresCommitData());
   EXPECT_FALSE(entity->CanClearMetadata());
   EXPECT_FALSE(entity->HasCommitData());
 }
 
 }  // namespace syncer_v2