WIP: The Bookmark Position Megapatch

sync/engine/apply_control_data_updates_unittest.cc

Index: sync/engine/apply_control_data_updates_unittest.cc
diff --git a/sync/engine/apply_control_data_updates_unittest.cc b/sync/engine/apply_control_data_updates_unittest.cc
index 754bac3d7a0dfdb51a99c319ba4914843106de83..5d2e9c9486db86c0e37df5c4d03a3ac0939a9ce4 100644
--- a/sync/engine/apply_control_data_updates_unittest.cc
+++ b/sync/engine/apply_control_data_updates_unittest.cc
@@ -126,22 +126,21 @@ TEST_F(ApplyControlDataUpdatesTest, EncryptUnsyncedChanges) {
   // Create unsynced bookmarks without encryption.
   // First item is a folder
   Id folder_id = id_factory_.NewLocalId();
-  entry_factory_->CreateUnsyncedItem(folder_id, id_factory_.root(), "folder",
-                                     true, BOOKMARKS, NULL);
+  entry_factory_->CreateUnsyncedBookmarkItem(folder_id, id_factory_.root(),
+                                             "folder", true, NULL);
   // Next five items are children of the folder
   size_t i;
   size_t batch_s = 5;
   for (i = 0; i < batch_s; ++i) {
-    entry_factory_->CreateUnsyncedItem(id_factory_.NewLocalId(), folder_id,
-                                       base::StringPrintf("Item %"PRIuS"", i),
-                                       false, BOOKMARKS, NULL);
+    entry_factory_->CreateUnsyncedBookmarkItem(
+        id_factory_.NewLocalId(), folder_id,
+        base::StringPrintf("Item %"PRIuS"", i), false, NULL);
   }
   // Next five items are children of the root.
   for (; i < 2*batch_s; ++i) {
-    entry_factory_->CreateUnsyncedItem(
+    entry_factory_->CreateUnsyncedBookmarkItem(
         id_factory_.NewLocalId(), id_factory_.root(),
-        base::StringPrintf("Item %"PRIuS"", i), false,
-        BOOKMARKS, NULL);
+        base::StringPrintf("Item %"PRIuS"", i), false, NULL);
   }
 
   KeyParams params = {"localhost", "dummy", "foobar"};
@@ -239,23 +238,21 @@ TEST_F(ApplyControlDataUpdatesTest, CannotEncryptUnsyncedChanges) {
   // Create unsynced bookmarks without encryption.
   // First item is a folder
   Id folder_id = id_factory_.NewLocalId();
-  entry_factory_->CreateUnsyncedItem(
-      folder_id, id_factory_.root(), "folder", true,
-      BOOKMARKS, NULL);
+  entry_factory_->CreateUnsyncedBookmarkItem(
+      folder_id, id_factory_.root(), "folder", true, NULL);
   // Next five items are children of the folder
   size_t i;
   size_t batch_s = 5;
   for (i = 0; i < batch_s; ++i) {
-    entry_factory_->CreateUnsyncedItem(id_factory_.NewLocalId(), folder_id,
-                                       base::StringPrintf("Item %"PRIuS"", i),
-                                       false, BOOKMARKS, NULL);
+    entry_factory_->CreateUnsyncedBookmarkItem(
+        id_factory_.NewLocalId(), folder_id,
+        base::StringPrintf("Item %"PRIuS"", i), false, NULL);
   }
   // Next five items are children of the root.
   for (; i < 2*batch_s; ++i) {
-    entry_factory_->CreateUnsyncedItem(
+    entry_factory_->CreateUnsyncedBookmarkItem(
         id_factory_.NewLocalId(), id_factory_.root(),
-        base::StringPrintf("Item %"PRIuS"", i), false,
-        BOOKMARKS, NULL);
+        base::StringPrintf("Item %"PRIuS"", i), false, NULL);
   }
 
   // We encrypt with new keys, triggering the local cryptographer to be unready