Explicitly initialize secondary renderers for layout tests.

content/shell/browser/layout_test/blink_test_controller.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/browser/layout_test/blink_test_controller.h"
 
 #include <stddef.h>
 
 #include <iostream>
 #include <set>
 #include <utility>
 
 #include "base/base64.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/dom_storage_context.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 232 matching lines @@
   DCHECK(CalledOnValidThread());
   test_phase_ = DURING_TEST;
   current_working_directory_ = current_working_directory;
   enable_pixel_dumping_ = enable_pixel_dumping;
   expected_pixel_hash_ = expected_pixel_hash;
   test_url_ = test_url;
   did_send_initial_test_configuration_ = false;
   printer_->reset();
   frame_to_layout_dump_map_.clear();
   render_process_host_observer_.RemoveAll();
+  all_observed_render_process_hosts_.clear();
+  main_window_render_process_hosts_.clear();
   accumulated_layout_test_runtime_flags_changes_.Clear();
   ShellBrowserContext* browser_context =
       ShellContentBrowserClient::Get()->browser_context();
   if (test_url.spec().find("compositing/") != std::string::npos)
     is_compositing_test_ = true;
   initial_size_ = Shell::GetShellDefaultSize();
   // The W3C SVG layout tests use a different size than the other layout tests.
   if (test_url.spec().find("W3C-SVG-1.1") != std::string::npos)
     initial_size_ = gfx::Size(kTestSVGWindowWidthDip, kTestSVGWindowHeightDip);
   if (!main_window_) {
@@ skipping 203 matching lines @@
 
 void BlinkTestController::WebContentsDestroyed() {
   DCHECK(CalledOnValidThread());
   printer_->AddErrorMessage("FAIL: main window was destroyed");
   DiscardMainWindow();
 }
 
 void BlinkTestController::RenderProcessHostDestroyed(
     RenderProcessHost* render_process_host) {
   render_process_host_observer_.Remove(render_process_host);
+  all_observed_render_process_hosts_.erase(render_process_host);
+  main_window_render_process_hosts_.erase(render_process_host);
 }
 
 void BlinkTestController::RenderProcessExited(
     RenderProcessHost* render_process_host,
     base::TerminationStatus status,
     int exit_code) {
   DCHECK(CalledOnValidThread());
   switch (status) {
     case base::TerminationStatus::TERMINATION_STATUS_NORMAL_TERMINATION:
     case base::TerminationStatus::TERMINATION_STATUS_STILL_RUNNING:
@@ skipping 62 matching lines @@
     test_phase_ = CLEAN_UP;
   } else if (main_window_) {
     main_window_->Close();
   }
   main_window_ = NULL;
   current_pid_ = base::kNullProcessId;
 }
 
 void BlinkTestController::HandleNewRenderFrameHost(RenderFrameHost* frame) {
   RenderProcessHost* process = frame->GetProcess();
+  bool main_window =
+      WebContents::FromRenderFrameHost(frame) == main_window_->web_contents();
 
   // Track pid of the renderer handling the main frame.
-  if (frame->GetParent() == nullptr) {
+  if (main_window && frame->GetParent() == nullptr) {
     base::ProcessHandle process_handle = process->GetHandle();
     if (process_handle != base::kNullProcessHandle)
       current_pid_ = base::GetProcId(process_handle);
   }
 
-  // Does RenderFrameHost map to a RenderFrame in a previously unknown process?
-  if (render_process_host_observer_.IsObserving(process))
-    return;  // No need to do anything more for an already known process.
-  render_process_host_observer_.Add(process);
+  // Is this the 1st time this renderer contains parts of the main test window?
+  if (main_window && !ContainsKey(main_window_render_process_hosts_, process)) {
+    main_window_render_process_hosts_.insert(process);
 
-  // Make sure the new renderer process has a test configuration shared with
-  // other renderers.
-  ShellTestConfiguration params;
-  params.current_working_directory = current_working_directory_;
-  params.temp_path = temp_path_;
-  params.test_url = test_url_;
-  params.enable_pixel_dumping = enable_pixel_dumping_;
-  params.allow_external_pages =
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kAllowExternalPages);
-  params.expected_pixel_hash = expected_pixel_hash_;
-  params.initial_size = initial_size_;
+    // Make sure the new renderer process has a test configuration shared with
+    // other renderers.
+    ShellTestConfiguration params;
+    params.current_working_directory = current_working_directory_;
+    params.temp_path = temp_path_;
+    params.test_url = test_url_;
+    params.enable_pixel_dumping = enable_pixel_dumping_;
+    params.allow_external_pages =
+        base::CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kAllowExternalPages);
+    params.expected_pixel_hash = expected_pixel_hash_;
+    params.initial_size = initial_size_;
 
-  if (did_send_initial_test_configuration_) {
-    frame->Send(new ShellViewMsg_ReplicateTestConfiguration(
-        frame->GetRoutingID(), params,
-        accumulated_layout_test_runtime_flags_changes_));
-  } else {
-    did_send_initial_test_configuration_ = true;
-    frame->Send(
-        new ShellViewMsg_SetTestConfiguration(frame->GetRoutingID(), params));
+    if (did_send_initial_test_configuration_) {
+      frame->Send(new ShellViewMsg_ReplicateTestConfiguration(
+          frame->GetRoutingID(), params,
+          accumulated_layout_test_runtime_flags_changes_));
+    } else {
+      did_send_initial_test_configuration_ = true;
+      frame->Send(
+          new ShellViewMsg_SetTestConfiguration(frame->GetRoutingID(), params));
+    }
+  }
+
+  // Is this a previously unknown renderer process?
+  if (!render_process_host_observer_.IsObserving(process)) {
+    render_process_host_observer_.Add(process);
+    all_observed_render_process_hosts_.insert(process);
+
+    if (!main_window) {
+      frame->Send(
+          new ShellViewMsg_SetupSecondaryRenderer(frame->GetRoutingID()));
+    }
   }
 }
 
 void BlinkTestController::OnTestFinished() {
   test_phase_ = CLEAN_UP;
   if (!printer_->output_finished())
     printer_->PrintImageFooter();
   RenderViewHost* render_view_host =
       main_window_->web_contents()->GetRenderViewHost();
   main_window_->web_contents()->ExitFullscreen(/*will_cause_resize=*/false);
@@ skipping 294 matching lines @@
   } else {
     printer_->AddErrorMessage(base::StringPrintf(
         "FAIL: Unexpected sendBluetoothManualChooserEvent() event name '%s'.",
         event_name.c_str()));
     return;
   }
   bluetooth_chooser_factory_->SendEvent(event, argument);
 }
 
 }  // namespace content