WIP: The Bookmark Position Megapatch

sync/engine/apply_control_data_updates_unittest.cc

 // Copyright (c) 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.
 
 #include "base/format_macros.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
 #include "sync/engine/apply_control_data_updates.h"
 #include "sync/engine/syncer.h"
@@ skipping 108 matching lines @@
     EXPECT_TRUE(VerifyUnsyncedChangesAreEncrypted(&trans, encrypted_types));
 
     Syncer::UnsyncedMetaHandles handles;
     GetUnsyncedEntries(&trans, &handles);
     EXPECT_TRUE(handles.empty());
   }
 
   // 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"};
   cryptographer->AddKey(params);
   sync_pb::EntitySpecifics specifics;
   sync_pb::NigoriSpecifics* nigori = specifics.mutable_nigori();
   cryptographer->GetKeys(nigori->mutable_encryption_keybag());
   nigori->set_encrypt_everything(true);
   encrypted_types.Put(BOOKMARKS);
   entry_factory_->CreateUnappliedNewItem(
@@ skipping 77 matching lines @@
     EXPECT_TRUE(VerifyUnsyncedChangesAreEncrypted(&trans, encrypted_types));
 
     Syncer::UnsyncedMetaHandles handles;
     GetUnsyncedEntries(&trans, &handles);
     EXPECT_TRUE(handles.empty());
   }
 
   // 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
   // and unable to decrypt data (once updated).
   Cryptographer other_cryptographer(cryptographer->encryptor());
   KeyParams params = {"localhost", "dummy", "foobar"};
   other_cryptographer.AddKey(params);
   sync_pb::EntitySpecifics specifics;
   sync_pb::NigoriSpecifics* nigori = specifics.mutable_nigori();
   other_cryptographer.GetKeys(nigori->mutable_encryption_keybag());
@@ skipping 641 matching lines @@
                                            local_specifics);
   ApplyControlDataUpdates(session());
 
   EXPECT_FALSE(entry_factory_->GetIsUnappliedForItem(experiment_handle));
   EXPECT_TRUE(
       entry_factory_->GetLocalSpecificsForItem(experiment_handle).
           experiments().keystore_encryption().enabled());
 }
 
 }  // namespace syncer