DevTools: improve test infrastructure w/ devtools driving the test

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>
@@ skipping 211 matching lines @@
 }
 
 BlinkTestController::BlinkTestController()
     : main_window_(NULL),
       test_phase_(BETWEEN_TESTS),
       is_leak_detection_enabled_(
           base::CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kEnableLeakDetection)),
       crash_when_leak_found_(false),
       devtools_frontend_(NULL),
+      inspected_window_(NULL),

[dgozman, 2017/03/10 00:17:17]

nullptr

       render_process_host_observer_(this) {
   CHECK(!instance_);
   instance_ = this;
 
   if (is_leak_detection_enabled_) {
     std::string switchValue =
         base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
             switches::kEnableLeakDetection);
     crash_when_leak_found_ = switchValue == switches::kCrashOnFailure;
   }
@@ skipping 24 matching lines @@
     bool enable_pixel_dumping,
     const std::string& expected_pixel_hash) {
   DCHECK(CalledOnValidThread());
   test_phase_ = DURING_TEST;
   current_working_directory_ = current_working_directory;
   enable_pixel_dumping_ = enable_pixel_dumping;
   expected_pixel_hash_ = expected_pixel_hash;
   if (test_url.spec().find("/inspector-unit/") == std::string::npos)
     test_url_ = test_url;
   else
-    test_url_ = LayoutTestDevToolsFrontend::MapJSTestURL(test_url);
+    test_url_ = LayoutTestDevToolsFrontend::MapUnitTestURL(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();
   layout_test_control_map_.clear();
   ShellBrowserContext* browser_context =
       ShellContentBrowserClient::Get()->browser_context();
   is_compositing_test_ =
       test_url_.spec().find("compositing/") != std::string::npos;
   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_) {
+  if (test_url_.spec().find("/devtools-js/") != std::string::npos) {
+    if (devtools_frontend_ && inspected_window_) {
+      inspected_window_->LoadURL(GURL(url::kAboutBlankURL));

[dgozman, 2017/03/10 00:17:17]

Did we detach at the end of previous test? It would be unfortunate to navigate
while attached and waste resources.

+      test_url_ = LayoutTestDevToolsFrontend::MapIntegrationTestURL(test_url);
+      main_window_->LoadURL(test_url_);
+    } else {
+      inspected_window_ = content::Shell::CreateNewWindow(
+          browser_context, GURL(), NULL, initial_size_);
+      inspected_window_->LoadURL(GURL(url::kAboutBlankURL));
+      devtools_frontend_ = LayoutTestDevToolsFrontend::CreateDevToolsMainWindow(
+          *inspected_window_, test_url_.spec());
+      main_window_ = devtools_frontend_->frontend_shell();
+      test_url_ = LayoutTestDevToolsFrontend::MapIntegrationTestURL(test_url);
+      WebContentsObserver::Observe(main_window_->web_contents());
+      current_pid_ = base::kNullProcessId;
+      default_prefs_ = main_window_->web_contents()
+                           ->GetRenderViewHost()
+                           ->GetWebkitPreferences();
+      main_window_->LoadURL(test_url_);
+    }
+  } else if (!main_window_) {
     main_window_ = content::Shell::CreateNewWindow(
         browser_context,
         GURL(),
         NULL,
         initial_size_);
     WebContentsObserver::Observe(main_window_->web_contents());
     current_pid_ = base::kNullProcessId;
     default_prefs_ =
       main_window_->web_contents()->GetRenderViewHost()->GetWebkitPreferences();
     main_window_->LoadURL(test_url_);
@@ skipping 572 matching lines @@
                                        session_histories,
                                        current_entry_indexes));
 }
 
 void BlinkTestController::OnCloseRemainingWindows() {
   DevToolsAgentHost::DetachAllClients();
   std::vector<Shell*> open_windows(Shell::windows());
   Shell* devtools_shell = devtools_frontend_ ?
       devtools_frontend_->frontend_shell() : NULL;
   for (size_t i = 0; i < open_windows.size(); ++i) {
-    if (open_windows[i] != main_window_ && open_windows[i] != devtools_shell)
+    if (open_windows[i] != main_window_ && open_windows[i] != devtools_shell &&
+        open_windows[i] != inspected_window_)
       open_windows[i]->Close();
   }
   base::RunLoop().RunUntilIdle();
 }
 
 void BlinkTestController::OnResetDone() {
   if (is_leak_detection_enabled_) {
     if (main_window_ && main_window_->web_contents()) {
       RenderViewHost* render_view_host =
           main_window_->web_contents()->GetRenderViewHost();
@@ skipping 78 matching lines @@
   }
   DCHECK(layout_test_control_map_[frame].get());
   return layout_test_control_map_[frame].get();
 }
 
 void BlinkTestController::HandleLayoutTestControlError(RenderFrameHost* frame) {
   layout_test_control_map_.erase(frame);
 }
 
 }  // namespace content