[Sync] Add support for associating a new Synced Bookmarks node.

net/tools/testserver/chromiumsync_test.py

Index: net/tools/testserver/chromiumsync_test.py
diff --git a/net/tools/testserver/chromiumsync_test.py b/net/tools/testserver/chromiumsync_test.py
index d704ac3ee2de2700764e072dd48d96908a1ed207..9be284bdc661e82df529c32cd46d06a3c8da1e96 100755
--- a/net/tools/testserver/chromiumsync_test.py
+++ b/net/tools/testserver/chromiumsync_test.py
@@ -72,7 +72,12 @@ class SyncDataModelTest(unittest.TestCase):
 
   def ExpectedPermanentItemCount(self, sync_type):
     if sync_type == chromiumsync.BOOKMARK:
-      return 4
+      if self.model._ItemExists(

[ncarter (slow), 2012/03/07 22:05:03]

It seems circular to query the model from the test expectation. This will mask
bugs where the folder is created when it shouldn't be, or bugs where the folder
isn't created when it should be.

Instead, you might add a boolean property to SyncDataModelTest called
syncedBookmarksFolderShouldExist, and set it to True whenever the folder is
explicitly created.

[Nicolas Zea, 2012/03/15 21:22:50]

Done.

+          self.model._MakeCurrentId(chromiumsync.BOOKMARK,
+                                    '<server tag>synced_bookmarks')):
+        return 5
+      else:
+        return 4
     elif sync_type == chromiumsync.TOP_LEVEL:
       return 1
     else:
@@ -560,6 +565,20 @@ class SyncDataModelTest(unittest.TestCase):
     sieve = chromiumsync.UpdateSieve(msg, migrator)
     sieve.CheckMigrationState()
 
+  def testCreateSyncedBookmaks(self):
+    version1, changes, remaining = (
+        self.GetChangesFromTimestamp([chromiumsync.BOOKMARK], 0))
+    id_string = self.model._MakeCurrentId(chromiumsync.BOOKMARK,
+                                          '<server tag>synced_bookmarks')
+    self.assertFalse(self.model._ItemExists(id_string))
+    self.model.TriggerCreateSyncedBookmarks()
+    self.assertTrue(self.model._ItemExists(id_string))
+    version2, changes, remaining = (
+        self.GetChangesFromTimestamp([chromiumsync.BOOKMARK], version1))
+    self.assertEqual(len(changes), 1)
+    self.assertEqual(changes[0].id_string, id_string)
+    self.assertNotEqual(version1, version2)
+
 
 if __name__ == '__main__':
   unittest.main()