Sync: Don't set/use Parent ID for non-hierarchical sync data types.

sync/engine/syncer_unittest.cc

 // Copyright 2012 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.
 //
 // Syncer unit tests. Unfortunately a lot of these tests
 // are outdated and need to be reworked and updated.
 
 #include <algorithm>
 #include <limits>
 #include <list>
@@ skipping 4361 matching lines @@
   {
     // Preferences type root should have been created by the update above.
     // We need it in order to get its ID.
     syncable::ReadTransaction trans(FROM_HERE, directory());
     Entry pref_root(&trans, GET_TYPE_ROOT, PREFERENCES);
     ASSERT_TRUE(pref_root.good());
     pref_root_id = pref_root.GetId();
   }
 
   // Add a preference item with explicit parent ID.
-  mock_server_->AddUpdatePref(ids_.FromNumber(2).GetServerId(),
-                              ids_.FromNumber(1).GetServerId(), "tag", 1, 10);
+  {
+    WriteTransaction trans(FROM_HERE, UNITTEST, directory());
+    MutableEntry entry(&trans, CREATE, PREFERENCES, pref_root_id, "tag");
+    ASSERT_TRUE(entry.good());
+    entry.PutIsDir(false);
+    entry.PutBaseVersion(1);
+    entry.PutUniqueClientTag("tag");
+    entry.PutId(ids_.FromNumber(2));
+  }
 
-  EXPECT_TRUE(SyncShareNudge());
-
+  // Verify the entry above.
   {
     syncable::ReadTransaction trans(FROM_HERE, directory());
     Entry pref_entry(&trans, GET_BY_CLIENT_TAG, "tag");
     ASSERT_TRUE(pref_entry.good());
     ASSERT_EQ(pref_root_id, pref_entry.GetParentId());
   }
 
   // Make another update where the same item get updated, this time
   // with implicit parent ID.
   mock_server_->AddUpdatePref(ids_.FromNumber(2).GetServerId(), "", "tag", 2,
@@ skipping 1084 matching lines @@
     EXPECT_EQ("xyz", final_monitor_records["xyz"].extension_id);
     EXPECT_EQ(2049U, final_monitor_records["ABC"].bookmark_write_count);
     EXPECT_EQ(4U,    final_monitor_records["xyz"].bookmark_write_count);
   } else {
     EXPECT_TRUE(final_monitor_records.empty())
         << "Should not restore records after successful bookmark commit.";
   }
 }
 
 }  // namespace syncer