Fixed ExtensionApiTest.Bookmarks and enabled it again.

chrome/test/data/extensions/api_test/bookmarks/test.js

 // 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.
 
 // bookmarks api test
 // browser_tests.exe --gtest_filter=ExtensionApiTest.Bookmarks
 
 // This is global state that is maintained across tests as a reference
 // to compare against what's fetched from the browser (using compareTrees).
 // TODO(erikkay) It would be better if each test was self-contained and
@@ skipping 49 matching lines @@
 
 function compareTrees(left, right, verbose) {
   if (verbose) {
     chrome.test.log(JSON.stringify(left) || "<null>");
     chrome.test.log(JSON.stringify(right) || "<null>");
   }
   if (left == null && right == null) {
     return true;
   }
   if (left == null || right == null)
-    return left + " !+ " + right;
+    return left + " != " + right;
   if (left.length != right.length)
     return "count mismatch: " + left.length + " != " + right.length;
   for (var i = 0; i < left.length; i++) {
     var result = compareNode(left[i], right[i]);
     if (result !== true) {
       chrome.test.log(result);
       chrome.test.log(JSON.stringify(left, null, 2));
       chrome.test.log(JSON.stringify(right, null, 2));
       return result;
     }
@@ skipping 89 matching lines @@
 
   function createNoParentId() {
     var node = {title:"google", url:"http://www.google.com/"};
     chrome.test.listenOnce(chrome.bookmarks.onCreated, function(id, created) {
       node.id = created.id;
       node.index = 0;
       chrome.test.assertEq(id, node.id);
       // Make sure the parentId defaults to the Other Bookmarks folder.
       chrome.test.assertEq(expected[0].children[1].id, created.parentId);
       chrome.test.assertTrue(compareNode(node, created));
+      expected[0].children[1].children.push(node);
     });
     chrome.bookmarks.create(node, pass(function(results) {
       node.id = results.id;  // since we couldn't know this going in
       node.index = 0;
       chrome.test.assertTrue(compareNode(node, results),
                              "created node != source");
     }));
   },
 
   function createInRoot() {
@@ skipping 79 matching lines @@
 
       verifyTreeIsExpected(pass());
     }));
 
     // Move folder (and its children) to be a child of Other Bookmarks.
     var other = expected[0].children[1];
     chrome.bookmarks.move(folder.id, {parentId:other.id},
                           pass(function(results) {
       chrome.test.assertEq(results.parentId, other.id);
       folder.parentId = results.parentId;
+      folder.index = results.index;
 
       var folder2 = expected[0].children[0].children.pop();
-      folder2.parentId = other.parentId;
-      folder2.index = 0;
+      chrome.test.assertEq(folder2.id, folder.id);
       expected[0].children[1].children.push(folder2);
-
       verifyTreeIsExpected(pass());
     }));
   },
 
   function search() {
     chrome.bookmarks.search("baz bar", pass(function(results) {
       // matches node1 & node3
       chrome.test.assertEq(2, results.length);
     }));
     chrome.bookmarks.search("www hello", pass(function(results) {
@@ skipping 59 matching lines @@
     chrome.test.listenOnce(chrome.bookmarks.onRemoved,
                            function(id, removeInfo) {
       chrome.test.assertEq(id, node1.id);
       chrome.test.assertEq(removeInfo.parentId, parentId);
       chrome.test.assertEq(removeInfo.index, node1.index);
     });
     chrome.bookmarks.remove(node1.id, pass(function() {
       // Update expected to match.
       // We removed node1, which means that the index of the other two nodes
       // changes as well.
-      expected[0].children[1].children[0].children.shift();
-      expected[0].children[1].children[0].children[0].index = 0;
-      expected[0].children[1].children[0].children[1].index = 1;
+      expected[0].children[1].children[1].children.shift();
+      expected[0].children[1].children[1].children[0].index = 0;
+      expected[0].children[1].children[1].children[1].index = 1;
 
       verifyTreeIsExpected(pass());
     }));
   },
 
   function removeTree() {
     var parentId = node2.parentId;
-    var folder = expected[0].children[1].children[0];
+    var folder = expected[0].children[1].children[1];
     chrome.test.listenOnce(chrome.bookmarks.onRemoved,
                            function(id, removeInfo) {
       chrome.test.assertEq(id, folder.id);
       chrome.test.assertEq(removeInfo.parentId, folder.parentId);
       chrome.test.assertEq(removeInfo.index, folder.index);
     });
     chrome.bookmarks.removeTree(parentId, pass(function(){
       // Update expected to match.
-      expected[0].children[1].children.shift();
-
+      expected[0].children[1].children.pop();
       verifyTreeIsExpected(pass());
     }));
   },
 
   function quotaLimitedCreate() {
     var node = {parentId:"1", title:"quotacreate", url:"http://www.quota.com/"};
     for (i = 0; i < 100; i++) {
       chrome.bookmarks.create(node, pass(function(results) {
         expected[0].children[0].children.push(results);
       }));
@@ skipping 34 matching lines @@
 
     chrome.test.resetQuota();
   },
 
   function getRecentSetup() {
     // Clean up tree
     ["1", "2"].forEach(function(id) {
       chrome.bookmarks.getChildren(id, pass(function(children) {
         children.forEach(function(child, i) {
           chrome.bookmarks.removeTree(child.id, pass(function() {}));
-
           // When we have removed the last child we can continue.
-          if (i == children.length - 1)
+          if (id == "2" && i == children.length - 1)
             afterRemove();
         });
       }));
     });
 
     function afterRemove() {
       // Once done add 3 nodes
       chrome.bookmarks.getTree(pass(function(results) {
         chrome.test.assertEq(0, results[0].children[0].children.length);
         chrome.test.assertEq(0, results[0].children[1].children.length);
@@ skipping 32 matching lines @@
                            "Should only get the last 2 bookmarks");
 
       chrome.test.assertTrue(compareNode(node3, results[0]));
       chrome.test.assertTrue(compareNode(node2, results[1]));
     }));
   }
 ]);
 }
 
 run();