Bug 507172 - Request longer timeout in browser_ui_*_sidebar.js Places tests and sync bookmarks test with others.

r=trivial a=tests-only

browser/components/places/tests/perf/Makefile.in

@@ -50,10 +50,9 @@ _CHROME_FILES = \
 
 # Disabled due to bad interactions with next tests.
 # browser_ui_locationbar.js
-# Disabled due to random failures.
-# browser_ui_bookmarks_sidebar.js
 _BROWSER_TEST_FILES = \
 	browser_ui_000_data.js \
+	browser_ui_bookmarks_sidebar.js \
 	browser_ui_history_menu.js \
 	browser_ui_history_sidebar.js \
 	browser_ui_history_sidebar_2.js \

browser/components/places/tests/perf/browser_ui_bookmarks_sidebar.js

@@ -98,14 +98,16 @@ ptests.push({
     var start = Date.now();
     var sb = document.getElementById("sidebar");
     sb.addEventListener("load", function() {
-      var duration = Date.now() - start;
       sb.removeEventListener("load", arguments.callee, true);
-      toggleSidebar("viewBookmarksSidebar", false);
-      self.times.push(duration);
-      if (self.times.length == TEST_REPEAT_COUNT)
-        self.finish();
-      else
-        self.run();
+      executeSoon(function() {
+        var duration = Date.now() - start;
+        toggleSidebar("viewBookmarksSidebar", false);
+        self.times.push(duration);
+        if (self.times.length == TEST_REPEAT_COUNT)
+          self.finish();
+        else
+          self.run();
+      });
     }, true);
     toggleSidebar("viewBookmarksSidebar", true);
   },
@@ -122,6 +124,7 @@ ptests.push({
 });
 
 function test() {
+  requestLongerTimeout(2);
   // kick off tests
   setTimeout(runNextTest, 0);
 }

browser/components/places/tests/perf/browser_ui_history_sidebar.js

@@ -185,6 +185,7 @@ function processTestResult(aTest) {
 }
 
 function test() {
+  requestLongerTimeout(2);
   // kick off tests
   setTimeout(runNextTest, 0);
 }

browser/components/places/tests/perf/browser_ui_history_sidebar_2.js

@@ -130,6 +130,7 @@ function processTestResult(aTest) {
 }
 
 function test() {
+  requestLongerTimeout(2);
   // kick off tests
   setTimeout(runNextTest, 0);
 }

browser/components/places/tests/perf/browser_ui_history_sidebar_3.js

@@ -130,6 +130,7 @@ function processTestResult(aTest) {
 }
 
 function test() {
+  requestLongerTimeout(2);
   // kick off tests
   setTimeout(runNextTest, 0);
 }