WIP: The Bookmark Position Megapatch

sync/test/engine/test_syncable_utils.cc

Index: sync/test/engine/test_syncable_utils.cc
diff --git a/sync/test/engine/test_syncable_utils.cc b/sync/test/engine/test_syncable_utils.cc
index e5ff28577500100fe5c6ac59dc164027666771bd..c7ba6ede75ba792213c849f115715d1d06388471 100644
--- a/sync/test/engine/test_syncable_utils.cc
+++ b/sync/test/engine/test_syncable_utils.cc
@@ -68,25 +68,30 @@ Id GetOnlyEntryWithName(BaseTransaction* rtrans,
 void CreateTypeRoot(WriteTransaction* trans,
                     syncable::Directory *dir,
                     ModelType type) {
-  std::string tag_name = syncer::ModelTypeToRootTag(type);
+  std::string tag_name = ModelTypeToRootTag(type);
+  syncable::Id node_id = TestIdFactory::MakeServer(tag_name);
+
   syncable::MutableEntry node(trans,
-                              syncable::CREATE,
-                              TestIdFactory::root(),
-                              tag_name);
-  DCHECK(node.good());
+                              syncable::CREATE_NEW_UPDATE_ITEM,
+                              node_id);
   node.Put(syncable::UNIQUE_SERVER_TAG, tag_name);
   node.Put(syncable::IS_DIR, true);
-  node.Put(syncable::SERVER_IS_DIR, false);
+  node.Put(syncable::SERVER_IS_DIR, true);
   node.Put(syncable::IS_UNSYNCED, false);
   node.Put(syncable::IS_UNAPPLIED_UPDATE, false);
   node.Put(syncable::SERVER_VERSION, 20);
   node.Put(syncable::BASE_VERSION, 20);
+  node.Put(syncable::SERVER_IS_DEL, false);
   node.Put(syncable::IS_DEL, false);
-  node.Put(syncable::ID, syncer::TestIdFactory::MakeServer(tag_name));
+
   sync_pb::EntitySpecifics specifics;
   syncer::AddDefaultFieldValue(type, &specifics);
   node.Put(syncable::SERVER_SPECIFICS, specifics);
   node.Put(syncable::SPECIFICS, specifics);
+
+  // Tag name will make a good enough NON_UNIQUE_NAME.
+  node.Put(syncable::SERVER_NON_UNIQUE_NAME, tag_name);
+  node.Put(syncable::NON_UNIQUE_NAME, tag_name);
 }
 
 }  // namespace syncable