Simplify ExtensionBrowserTest::NavigateInRenderer.

NavigateInRenderer was using a non-standard method of waiting for
navigations, (written in 2010). Now there is a much simpler way to
do this.

This cleanup has the pleasant side effect of fixing some test failures
when BackForwardCache is enabled.

Change-Id: I96b3d3d93fb9b58485cf0f7c7f33751a1abf55f5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1813350
Commit-Queue: Lowell Manners <lowell@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699731}

chrome/browser/extensions/extension_browsertest.cc

@@ -723,22 +723,11 @@ void ExtensionBrowserTest::OpenWindow(content::WebContents* contents,
 
 void ExtensionBrowserTest::NavigateInRenderer(content::WebContents* contents,
                                               const GURL& url) {
-  // Ensure any existing navigations complete before trying to navigate anew, to
-  // avoid triggering of the unload event for the wrong navigation.
+  // Note: We use ExecuteScript instead of ExecJS here, because ExecuteScript
+  // works on pages with a Content Security Policy.
+  EXPECT_TRUE(content::ExecuteScript(
+      contents, "window.location = '" + url.spec() + "';"));
   content::WaitForLoadStop(contents);
-  bool result = false;
-  content::WindowedNotificationObserver windowed_observer(
-      content::NOTIFICATION_LOAD_STOP,
-      content::NotificationService::AllSources());
-  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
-      contents,
-      "window.addEventListener('unload', function() {"
-      "    window.domAutomationController.send(true);"
-      "}, false);"
-      "window.location = '" + url.spec() + "';",
-      &result));
-  ASSERT_TRUE(result);
-  windowed_observer.Wait();
   EXPECT_EQ(url, contents->GetController().GetLastCommittedEntry()->GetURL());
 }
 

testing/buildbot/filters/bfcache.browser_tests.filter

 # These tests currently fail when run with --enable-features=BackForwardCache
 
-# Rely on an unload handler to run. It doesn't run.
--IsolatedAppTest.IsolatedAppProcessModel
-
 # No focused view.
 -PaymentRequestShippingAddressEditorTest.FocusFirstInvalidField_NotName