Refactor ExtensionApiTest.WebNavigationEvents* to not rely on window.setTimeout

chrome/test/data/extensions/api_test/webnavigation/test_serverRedirect.js

Index: chrome/test/data/extensions/api_test/webnavigation/test_serverRedirect.js
diff --git a/chrome/test/data/extensions/api_test/webnavigation/test_serverRedirect.js b/chrome/test/data/extensions/api_test/webnavigation/test_serverRedirect.js
index 96502ce26f226aeb01815f14e4feb1b5ae0160f4..026f2b6c3720bef847b8b049bf1ed0a0ddad91df 100644
--- a/chrome/test/data/extensions/api_test/webnavigation/test_serverRedirect.js
+++ b/chrome/test/data/extensions/api_test/webnavigation/test_serverRedirect.js
@@ -4,7 +4,8 @@
 
 function runTests() {
   var getURL = chrome.extension.getURL;
-  var URL_LOAD = "http://www.a.com:PORT/files/extensions/api_test/webnavigation/serverRedirect/a.html";
+  var URL_LOAD =
+      "http://www.a.com:PORT/files/extensions/api_test/webnavigation/serverRedirect/a.html";
   var URL_LOAD_REDIRECT = "http://www.a.com:PORT/server-redirect?" + URL_LOAD;
   chrome.tabs.create({"url": "about:blank"}, function(tab) {
     var tabId = tab.id;
@@ -18,28 +19,33 @@ function runTests() {
         // Navigates to a page that redirects (on the server side) to a.html.
         function serverRedirect() {
           expect([
-            [ "onBeforeNavigate",
-              { frameId: 0,
-                tabId: 0,
-                timeStamp: 0,
-                url: URL_LOAD_REDIRECT }],
-            [ "onCommitted",
-              { frameId: 0,
-                tabId: 0,
-                timeStamp: 0,
-                transitionQualifiers: [],
-                transitionType: "link",
-                url: URL_LOAD }],
-            [ "onDOMContentLoaded",
-              { frameId: 0,
-                tabId: 0,
-                timeStamp: 0,
-                url: URL_LOAD }],
-            [ "onCompleted",
-              { frameId: 0,
-                tabId: 0,
-                timeStamp: 0,
-                url: URL_LOAD }]]);
+            { label: "a-onBeforeNavigate",
+              event: "onBeforeNavigate",
+              details: { frameId: 0,
+                         tabId: 0,
+                         timeStamp: 0,
+                         url: URL_LOAD_REDIRECT }},
+            { label: "a-onCommitted",
+              event: "onCommitted",
+              details: { frameId: 0,
+                         tabId: 0,
+                         timeStamp: 0,
+                         transitionQualifiers: [],
+                         transitionType: "link",
+                         url: URL_LOAD }},
+            { label: "a-onDOMContentLoaded",
+              event: "onDOMContentLoaded",
+              details: { frameId: 0,
+                         tabId: 0,
+                         timeStamp: 0,
+                         url: URL_LOAD }},
+            { label: "a-onCompleted",
+              event: "onCompleted",
+              details: { frameId: 0,
+                         tabId: 0,
+                         timeStamp: 0,
+                         url: URL_LOAD }}],
+            [ navigationOrder("a-") ]);
           chrome.tabs.update(tabId, { url: URL_LOAD_REDIRECT });
         },
       ]);