DevTools: extract bindings from ShellDevToolsFrontend

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>
@@ skipping 21 matching lines @@
 
 #if defined(OS_ANDROID)
 #include "base/threading/thread_restrictions.h"
 #endif
 
 class SkBitmap;
 
 namespace content {
 
 class LayoutTestBluetoothChooserFactory;
-class LayoutTestDevToolsFrontend;
+class LayoutTestDevToolsBindings;
 class RenderFrameHost;
 class RenderProcessHost;
 class Shell;
 
 #if defined(OS_ANDROID)
 // Android uses a nested message loop for running layout tests because the
 // default message loop, provided by the system, does not offer a blocking
 // Run() method. The loop itself, implemented as NestedMessagePumpAndroid,
 // uses a base::WaitableEvent allowing it to sleep until more events arrive.
 class ScopedAllowWaitForAndroidLayoutTests {
@@ skipping 172 matching lines @@
                                          const std::string& argument);
   mojom::LayoutTestControl* GetLayoutTestControlPtr(RenderFrameHost* frame);
   void HandleLayoutTestControlError(RenderFrameHost* frame);
 
   std::unique_ptr<BlinkTestResultPrinter> printer_;
 
   base::FilePath current_working_directory_;
   base::FilePath temp_path_;
 
   Shell* main_window_;
+  std::unique_ptr<Shell> secondary_window_;

[dgozman, 2017/03/17 22:44:14]

Let's call this devtools_window_ and remove one below.

[chenwilliam, 2017/03/20 21:32:20]

Done.

+
+  Shell* devtools_window_;
+  std::unique_ptr<LayoutTestDevToolsBindings> devtools_bindings_;
 
   // The PID of the render process of the render view host of main_window_.
   int current_pid_;
 
   // Tracks if (during the current test) we have already sent *initial* test
   // configuration to a renderer process (*initial* test configuration is
   // associated with some steps that should only be executed *once* per test -
   // for example resizing the window and setting the focus).
   bool did_send_initial_test_configuration_;
 
@@ skipping 16 matching lines @@
   // True if the WebPreferences of newly created RenderViewHost should be
   // overridden with prefs_.
   bool should_override_prefs_;
   WebPreferences prefs_;
 
   NotificationRegistrar registrar_;
 
   const bool is_leak_detection_enabled_;
   bool crash_when_leak_found_;
 
-  LayoutTestDevToolsFrontend* devtools_frontend_;
-
   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_;
@@ skipping 13 matching lines @@
   // 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_