Fix http/tests/security/mixedContent/insecure-iframe-in-main-frame.html

When dumping the navigation history, dump windows opened by the main
test window also.

R=avi@chromium.org

Bug: 771003, 1069111
Change-Id: I6fad87666ee9542c51648dc7bf6cba493a105bab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2218482Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772720}

content/shell/browser/web_test/web_test_control_host.cc

@@ -701,23 +701,17 @@ void WebTestControlHost::InitiateCaptureDump(bool capture_navigation_history,
     return;
 
   if (capture_navigation_history) {
-    RenderFrameHost* main_rfh = main_window_->web_contents()->GetMainFrame();
     for (auto* window : Shell::windows()) {
       WebContents* web_contents = window->web_contents();
-      // Only capture the history from windows in the same process_host as the
-      // main window. During web tests, we only use two processes when a
-      // devtools window is open.
-      // TODO(https://crbug.com/771003): Dump history for all WebContentses, not
-      // just ones that happen to be in the same process_host as the main test
-      // window's main frame.
-      if (main_rfh->GetProcess() != web_contents->GetMainFrame()->GetProcess())
-        continue;
-
-      navigation_history_dump_ +=
-          "\n============== Back Forward List ==============\n";
-      navigation_history_dump_ += DumpHistoryForWebContents(web_contents);
-      navigation_history_dump_ +=
-          "===============================================\n";
+      // Only dump the main test window, and windows that it opened. This avoids
+      // devtools windows specifically.
+      if (window == main_window_ || web_contents->HasOpener()) {
+        navigation_history_dump_ +=
+            "\n============== Back Forward List ==============\n";
+        navigation_history_dump_ += DumpHistoryForWebContents(web_contents);
+        navigation_history_dump_ +=
+            "===============================================\n";
+      }
     }
   }
 

third_party/blink/web_tests/TestExpectations

@@ -94,8 +94,6 @@ crbug.com/901056 virtual/synchronous_html_parser/http/tests/preload/meta-viewpor
 # Tests temporarily disabled with Site Isolation - test issues or test harness
 # issues (e.g. missing OOPIF support in the test harness).
 # TODO(lukasza, alexmos): Burn down this list.
-crbug.com/771003 http/tests/security/mixedContent/insecure-iframe-in-main-frame.html [ Failure ]
-
 crbug.com/1050826 external/wpt/mixed-content/gen/top.http-rp/opt-in/object-tag.https.html [ Timeout ]
 
 # Tests temporarily disabled with Site Isolation - uninvestigated bugs:

third_party/blink/web_tests/VirtualTestSuites

@@ -483,7 +483,6 @@
               "http/tests/printing/cross-site-frame-scrolled.html",
               "http/tests/printing/cross-site-frame.html",
               "http/tests/security/frameNavigation/xss-DENIED-top-navigation-without-user-gesture.html",
-              "http/tests/security/mixedContent/insecure-iframe-in-main-frame.html",
               "http/tests/security/upgrade-insecure-requests/iframe-upgrade.https.html",
               "http/tests/text-autosizing/narrow-iframe.html",
               "http/tests/text-autosizing/wide-iframe.html",