WIP: The Bookmark Position Megapatch

sync/internal_api/public/test/test_entry_factory.h

Index: sync/internal_api/public/test/test_entry_factory.h
diff --git a/sync/internal_api/public/test/test_entry_factory.h b/sync/internal_api/public/test/test_entry_factory.h
index 071a501974f2097f46efe7aef1dbad3a4825da56..51e39aa689ee8d836d21eea826f7855e515c8359 100644
--- a/sync/internal_api/public/test/test_entry_factory.h
+++ b/sync/internal_api/public/test/test_entry_factory.h
@@ -29,33 +29,54 @@ class TestEntryFactory {
       const sync_pb::EntitySpecifics& specifics,
       const std::string& parent_id);
 
+  int64 CreateUnappliedNewBookmarkItemWithParent(
+      const std::string& item_id,
+      const sync_pb::EntitySpecifics& specifics,
+      const std::string& parent_id);
+
   // Create a new unapplied update without a parent.
   int64 CreateUnappliedNewItem(const std::string& item_id,
                                const sync_pb::EntitySpecifics& specifics,
                                bool is_unique);
 
-  // Create an unsynced item in the database.  If item_id is a local ID, it will
-  // be treated as a create-new.  Otherwise, if it's a server ID, we'll fake the
-  // server data so that it looks like it exists on the server.  Returns the
-  // methandle of the created item in |metahandle_out| if not NULL.
+  // Create an unsynced unique_client_tag item in the database.  If item_id is a
+  // local ID, it will be treated as a create-new.  Otherwise, if it's a server
+  // ID, we'll fake the server data so that it looks like it exists on the
+  // server.  Returns the methandle of the created item in |metahandle_out| if
+  // not NULL.
   void CreateUnsyncedItem(const syncable::Id& item_id,
                           const syncable::Id& parent_id,
                           const std::string& name,
-                          bool is_folder,
                           ModelType model_type,
                           int64* metahandle_out);
 
-  // Creates an item that is both unsynced an an unapplied update.  Returns the
-  // metahandle of the created item.
-  int64 CreateUnappliedAndUnsyncedItem(const std::string& name,
-                                       ModelType model_type);
-
-  // Creates an item that has neither IS_UNSYNED or IS_UNAPPLIED_UPDATE.  The
-  // item is known to both the server and client.  Returns the metahandle of
-  // the created item.
+  // Creates an unsynced bookarm item in the database.  If the item_id is a
+  // lcoal ID, it will be treated as a create-new.  Otherwise, if it's a server
+  // ID, we'll fake the server data so that it looks like it exists on the
+  // server.  Returns the metahandle of te created item in |metahandle_out| if
+  // not NULL.
+  void CreateUnsyncedBookmarkItem(const syncable::Id& item_id,
+                                  const syncable::Id& parent_id,
+                                  const std::string& name,
+                                  bool is_folder,
+                                  int64* metahandle_out);
+
+
+  // Creates a bookmark that is both unsynced an an unapplied update.  Returns
+  // the metahandle of the created item.
+  int64 CreateUnappliedAndUnsyncedBookmarkItem(const std::string& name);
+
+  // Creates a unique_client_tag item that has neither IS_UNSYNED or
+  // IS_UNAPPLIED_UPDATE.  The item is known to both the server and client.
+  // Returns the metahandle of the created item.
   int64 CreateSyncedItem(const std::string& name,
                          ModelType model_type, bool is_folder);
 
+  // Creates a bookmark that has neither IS_UNSYNED or IS_UNAPPLIED_UPDATE.  The
+  // item is known to both the server and client.  Returns the metahandle of the
+  // created item.
+  int64 CreateSyncedBookmarkItem(const std::string& name, bool is_folder);
+
   // Creates a root node that IS_UNAPPLIED. Smiilar to what one would find in
   // the database between the ProcessUpdates of an initial datatype configure
   // cycle and the ApplyUpdates step of the same sync cycle.