Refactor the implementation of the webNavigation extension API.

chrome/test/data/extensions/api_test/executescript/http204/background.js

Index: chrome/test/data/extensions/api_test/executescript/http204/background.js
diff --git a/chrome/test/data/extensions/api_test/executescript/http204/background.js b/chrome/test/data/extensions/api_test/executescript/http204/background.js
index 53e3fb98d4dcc4f0bd654cb28487e3a0df7f31f7..ad6280f758a15373be7317dec275772825aa3d02 100644
--- a/chrome/test/data/extensions/api_test/executescript/http204/background.js
+++ b/chrome/test/data/extensions/api_test/executescript/http204/background.js
@@ -248,23 +248,10 @@ function startTest(tabId) {
 
 // Navigates to a page that navigates to a 204 page via a script.
 function navigateToFrameAndWaitUntil204Loaded(tabId, hostname, hostname204) {
-  // If the child frame's origin differs from the parent frame's origin, and
-  // site isolation is enabled, then two onErrorOccurred events are expected:
-  // 1. onErrorOccurred for a process swap of the initial frame.
-  // 2. onErrorOccurred for the failed provisional load.
-  // TODO(robwu): Remove this work-around when the navigation is immediately
-  // handled in the right process (so that a process swap is not needed).
-  var expectTwoErrors = MAIN_HOST !== hostname && config.isolateExtensions;
   var doneListening = chrome.test.listenForever(
       chrome.webNavigation.onErrorOccurred,
       function(details) {
         if (details.tabId === tabId && details.frameId > 0) {
-          if (expectTwoErrors) {
-            // |url| is the initial URL of the iframe, declared below.
-            chrome.test.assertEq(url, details.url);
-            expectTwoErrors = false;
-            return;
-          }
           chrome.test.assertTrue(details.url.includes('page204.html'),
               'frame URL should be page204.html, but was ' + details.url);
           doneListening();