Explicitly initialize secondary renderers for layout tests.

content/shell/browser/layout_test/blink_test_controller.h

 // 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.
 
 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_
 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_
 
 #include <map>
 #include <memory>
 #include <ostream>
+#include <set>
 #include <string>
 
 #include "base/cancelable_callback.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/scoped_observer.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/values.h"
 #include "build/build_config.h"
@@ skipping 105 matching lines @@
   ~BlinkTestController() override;
 
   // True if the controller is ready for testing.
   bool PrepareForLayoutTest(const GURL& test_url,
                             const base::FilePath& current_working_directory,
                             bool enable_pixel_dumping,
                             const std::string& expected_pixel_hash);
   // True if the controller was reset successfully.
   bool ResetAfterLayoutTest();
 
+  // Makes sure that the potentially new renderer associated with |frame| is 1)
+  // initialized for the test, 2) kept-up-to-date wrt test flags and 3)
+  // monitored for crashes.
+  void HandleNewRenderFrameHost(RenderFrameHost* frame);
+
   void SetTempPath(const base::FilePath& temp_path);
   void RendererUnresponsive();
   void OverrideWebkitPrefs(WebPreferences* prefs);
   void OpenURL(const GURL& url);
   void TestFinishedInSecondaryRenderer();
   bool IsMainWindow(WebContents* web_contents) const;
   std::unique_ptr<BluetoothChooser> RunBluetoothChooser(
       RenderFrameHost* frame,
       const BluetoothChooser::EventHandler& event_handler);
 
@@ skipping 31 matching lines @@
  private:
   enum TestPhase {
     BETWEEN_TESTS,
     DURING_TEST,
     CLEAN_UP
   };
 
   static BlinkTestController* instance_;
 
   void DiscardMainWindow();
-  void HandleNewRenderFrameHost(
-      RenderFrameHost* frame_representing_target_process);
 
   // Message handlers.
   void OnAudioDump(const std::vector<unsigned char>& audio_dump);
   void OnImageDump(const std::string& actual_pixel_hash, const SkBitmap& image);
   void OnTextDump(const std::string& dump);
   void OnInitiateLayoutDump();
   void OnLayoutTestRuntimeFlagsChanged(
       RenderFrameHost* sender,
       const base::DictionaryValue& changed_layout_test_runtime_flags);
   void OnLayoutDumpResponse(RenderFrameHost* sender, const std::string& dump);
@@ skipping 60 matching lines @@
   std::unique_ptr<LayoutTestBluetoothChooserFactory> bluetooth_chooser_factory_;
 
   // Map from frame_tree_node_id into frame-specific dumps.
   std::map<int, std::string> frame_to_layout_dump_map_;
   // Number of ShellViewHostMsg_LayoutDumpResponse messages we are waiting for.
   int pending_layout_dumps_;
 
   // Renderer processes are observed to detect crashes.
   ScopedObserver<RenderProcessHost, RenderProcessHostObserver>
       render_process_host_observer_;
+  std::set<RenderProcessHost*> all_observed_render_process_hosts_;

[Łukasz Anforowicz, 2016/04/15 20:15:29]

This field is somewhat redundant - render_process_host_observer_ already
contains the same set of RenderProcessHosts, but it is locked inside
ScopedObserver.  I guess I could try to add an accessor to ScopedObserver, but
that would mean pushback from //base owners unless I find 2-3 other cases that
would need an accessor...  Path of least resistance...

+  std::set<RenderProcessHost*> main_window_render_process_hosts_;
 
   // Changes reported by OnLayoutTestRuntimeFlagsChanged that have accumulated
   // since PrepareForLayoutTest (i.e. changes that need to be send to a fresh
   // renderer created while test is in progress).
   base::DictionaryValue accumulated_layout_test_runtime_flags_changes_;
 
 #if defined(OS_ANDROID)
   // Because of the nested message pump implementation, Android needs to allow
   // waiting on the UI thread while layout tests are being ran.
   ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BlinkTestController);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_