Refactor the implementation of the webNavigation extension API.

chrome/test/data/extensions/api_test/webnavigation/crossProcessIframe/test_crossProcessIframe.js

Index: chrome/test/data/extensions/api_test/webnavigation/crossProcessIframe/test_crossProcessIframe.js
diff --git a/chrome/test/data/extensions/api_test/webnavigation/crossProcessIframe/test_crossProcessIframe.js b/chrome/test/data/extensions/api_test/webnavigation/crossProcessIframe/test_crossProcessIframe.js
index 8912831f29da0b2a76d248d0619c4d5554a4b82b..71f77400e034eafcfbd27ffd9ef4c798223abc85 100644
--- a/chrome/test/data/extensions/api_test/webnavigation/crossProcessIframe/test_crossProcessIframe.js
+++ b/chrome/test/data/extensions/api_test/webnavigation/crossProcessIframe/test_crossProcessIframe.js
@@ -36,7 +36,7 @@ onload = function() {
               event: 'onBeforeNavigate',
               details: { frameId: 0,
                          parentFrameId: -1,
-                         processId: 0,
+                         processId: -1,
                          tabId: 0,
                          timeStamp: 0,
                          url: URL_MAIN }},
@@ -63,28 +63,11 @@ onload = function() {
                          tabId: 0,
                          timeStamp: 0,
                          url: URL_MAIN }},
-            // pre-a.com is the navigation before the process swap.
-            { label: 'pre-a.com-onBeforeNavigate',
-              event: 'onBeforeNavigate',
-              details: { frameId: 1,
-                         parentFrameId: 0,
-                         processId: 0,
-                         tabId: 0,
-                         timeStamp: 0,
-                         url: URL_FRAME1 }},
-            { label: 'pre-a.com-onErrorOccurred',
-              event: 'onErrorOccurred',
-              details: { error: 'net::ERR_ABORTED',
-                         frameId: 1,
-                         processId: 0,
-                         tabId: 0,
-                         timeStamp: 0,
-                         url: URL_FRAME1 }},
             { label: 'a.com-onBeforeNavigate',
               event: 'onBeforeNavigate',
               details: { frameId: 1,
                          parentFrameId: 0,
-                         processId: 1,
+                         processId: -1,
                          tabId: 0,
                          timeStamp: 0,
                          url: URL_FRAME1 }},
@@ -111,16 +94,11 @@ onload = function() {
                          tabId: 0,
                          timeStamp: 0,
                          url: URL_FRAME1 }},
-            // There is no onBeforeNavigate and onErrorOccurred (like the other
-            // navigations in this test) because this navigation is triggered by
-            // a frame in a different process, so the navigation directly goes
-            // through the browser. This difference will be resolved once
-            // PlzNavigate goes live.
             { label: 'b.com-onBeforeNavigate',
               event: 'onBeforeNavigate',
               details: { frameId: 1,
                          parentFrameId: 0,
-                         processId: 2,
+                         processId: -1,
                          tabId: 0,
                          timeStamp: 0,
                          url: URL_FRAME2 }},
@@ -147,28 +125,11 @@ onload = function() {
                          tabId: 0,
                          timeStamp: 0,
                          url: URL_FRAME2 }},
-            // pre-c.com is the navigation before the process swap.
-            { label: 'pre-c.com-onBeforeNavigate',
-              event: 'onBeforeNavigate',
-              details: { frameId: 1,
-                         parentFrameId: 0,
-                         processId: 2,
-                         tabId: 0,
-                         timeStamp: 0,
-                         url: URL_FRAME3 }},
-            { label: 'pre-c.com-onErrorOccurred',
-              event: 'onErrorOccurred',
-              details: { error: 'net::ERR_ABORTED',
-                         frameId: 1,
-                         processId: 2,
-                         tabId: 0,
-                         timeStamp: 0,
-                         url: URL_FRAME3 }},
             { label: 'c.com-onBeforeNavigate',
               event: 'onBeforeNavigate',
               details: { frameId: 1,
                          parentFrameId: 0,
-                         processId: 3,
+                         processId: -1,
                          tabId: 0,
                          timeStamp: 0,
                          url: URL_FRAME3 }},
@@ -200,10 +161,9 @@ onload = function() {
               navigationOrder('a.com-'),
               navigationOrder('b.com-'),
               navigationOrder('c.com-'),
-              ['pre-a.com-onBeforeNavigate', 'a.com-onBeforeNavigate',
-               'pre-a.com-onErrorOccurred'],
-              ['pre-c.com-onBeforeNavigate', 'c.com-onBeforeNavigate',
-               'pre-c.com-onErrorOccurred']]);
+              ['a.com-onCommitted', 'b.com-onBeforeNavigate'],
+              ['b.com-onCommitted', 'c.com-onBeforeNavigate'],
+            ]);
 
           chrome.tabs.update(tabId, {
             url: URL_MAIN + '?' + config.testServer.port