Destroy secondary window in WebTestControlHost after each test

Secondary window was not destroyed after a test so the test
configuration was not properly synchronised with the secondary
renderer process after the first test. As a effect of that,
console messages would be added to the test results for DevTools
test which are configured to ignore console messages.

Fixed: 1122074
Change-Id: I526d95ff7df76c386f766adbd092ef75fa9b27df
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2377713
Commit-Queue: Alex Rudenko <alexrudenko@chromium.org>
Auto-Submit: Alex Rudenko <alexrudenko@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801872}

content/shell/browser/web_test/web_test_control_host.cc

@@ -610,11 +610,9 @@ bool WebTestControlHost::PrepareForWebTest(const TestInfo& test_info) {
   }
 
   if (is_devtools_js_test) {
-    if (!secondary_window_) {
-      secondary_window_ = content::Shell::CreateNewWindow(
-          ShellContentBrowserClient::Get()->browser_context(),
-          GURL(url::kAboutBlankURL), nullptr, window_size);
-    }
+    secondary_window_ = content::Shell::CreateNewWindow(
+        ShellContentBrowserClient::Get()->browser_context(),
+        GURL(url::kAboutBlankURL), nullptr, window_size);
     // This navigates the secondary (devtools inspector) window, and then
     // navigates the main window once that has loaded to a devtools html test
     // page, based on the test url.
@@ -1675,9 +1673,10 @@ void WebTestControlHost::CloseTestOpenedWindows() {
   DevToolsAgentHost::DetachAllClients();
   std::vector<Shell*> open_windows(Shell::windows());
   for (auto* shell : open_windows) {
-    if (shell != main_window_ && shell != secondary_window_)
+    if (shell != main_window_)
       shell->Close();
   }
+  secondary_window_ = nullptr;
   base::RunLoop().RunUntilIdle();
 }