[Sync] Don't commit items with predecessors/parents in conflict.

chrome/browser/sync/engine/syncer_unittest.cc

Index: chrome/browser/sync/engine/syncer_unittest.cc
diff --git a/chrome/browser/sync/engine/syncer_unittest.cc b/chrome/browser/sync/engine/syncer_unittest.cc
index 6aa9f71e115c652bfda5c7dc70834ed6745cdf68..6379a72da01946138f0dc4bad8701d2cd55a401a 100644
--- a/chrome/browser/sync/engine/syncer_unittest.cc
+++ b/chrome/browser/sync/engine/syncer_unittest.cc
@@ -710,10 +710,10 @@ TEST_F(SyncerTest, GetCommitIdsFiltersUnreadyEntries) {
     // conflicting, but last sync cycle resolved it as simple conflict, so on
     // this sync cycle it committed succesfullly.
     ReadTransaction rtrans(FROM_HERE, dir);
-    // Committed successfully.
-    VERIFY_ENTRY(1, false, false, false, 0, 21, 21, ids_, &rtrans);
-    // Committed successfully.
-    VERIFY_ENTRY(2, false, false, false, 0, 11, 11, ids_, &rtrans);
+    // Has unready predecessor.
+    VERIFY_ENTRY(1, false, true, false, 0, 20, 20, ids_, &rtrans);
+    // Has unready predecessor.
+    VERIFY_ENTRY(2, false, true, false, 0, 10, 10, ids_, &rtrans);
     // Was not properly encrypted.
     VERIFY_ENTRY(3, false, true, false, 0, 10, 10, ids_, &rtrans);
     // Was not properly encrypted.
@@ -733,8 +733,8 @@ TEST_F(SyncerTest, GetCommitIdsFiltersUnreadyEntries) {
   }
   SyncShareAsDelegate();
   {
-    // We attempted to commit two items.
-    EXPECT_EQ(2U, session_->status_controller().unsynced_handles().size());
+    // We attempted to commit four items.
+    EXPECT_EQ(4U, session_->status_controller().unsynced_handles().size());
     EXPECT_TRUE(session_->status_controller().did_commit_items());
     // None should be unsynced anymore.
     ReadTransaction rtrans(FROM_HERE, dir);