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

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

Index: chrome/test/data/extensions/api_test/webnavigation/test_simpleLoad.js
diff --git a/chrome/test/data/extensions/api_test/webnavigation/test_simpleLoad.js b/chrome/test/data/extensions/api_test/webnavigation/test_simpleLoad.js
index 57ef2402177dec8b32000b7f00bd03899ac324f8..a40f8f11e9e2feea1354a8ad05abea2b7c19956c 100644
--- a/chrome/test/data/extensions/api_test/webnavigation/test_simpleLoad.js
+++ b/chrome/test/data/extensions/api_test/webnavigation/test_simpleLoad.js
@@ -11,28 +11,33 @@ function runTests() {
       // Navigates to an URL.
       function simpleLoad() {
         expect([
-          [ "onBeforeNavigate",
-            { frameId: 0,
-              tabId: 0,
-              timeStamp: 0,
-              url: getURL('simpleLoad/a.html') }],
-          [ "onCommitted",
-            { frameId: 0,
-              tabId: 0,
-              timeStamp: 0,
-              transitionQualifiers: [],
-              transitionType: "link",
-              url: getURL('simpleLoad/a.html') }],
-          [ "onDOMContentLoaded",
-            { frameId: 0,
-              tabId: 0,
-              timeStamp: 0,
-              url: getURL('simpleLoad/a.html') }],
-          [ "onCompleted",
-            { frameId: 0,
-              tabId: 0,
-              timeStamp: 0,
-              url: getURL('simpleLoad/a.html') }]]);
+          { label: "a-onBeforeNavigate",
+            event: "onBeforeNavigate",
+            details: { frameId: 0,
+                       tabId: 0,
+                       timeStamp: 0,
+                       url: getURL('simpleLoad/a.html') }},
+          { label: "a-onCommitted",
+            event: "onCommitted",
+            details: { frameId: 0,
+                       tabId: 0,
+                       timeStamp: 0,
+                       transitionQualifiers: [],
+                       transitionType: "link",
+                       url: getURL('simpleLoad/a.html') }},
+          { label: "a-onDOMContentLoaded",
+            event: "onDOMContentLoaded",
+            details: { frameId: 0,
+                       tabId: 0,
+                       timeStamp: 0,
+                       url: getURL('simpleLoad/a.html') }},
+          { label: "a-onCompleted",
+            event: "onCompleted",
+            details: { frameId: 0,
+                       tabId: 0,
+                       timeStamp: 0,
+                       url: getURL('simpleLoad/a.html') }}],
+          [ navigationOrder("a-") ]);
         chrome.tabs.update(tabId, { url: getURL('simpleLoad/a.html') });
       },
     ]);