DevTools: improve test infrastructure w/ devtools driving the test

content/shell/browser/layout_test/layout_test_devtools_frontend.cc

 // Copyright 2014 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/layout_test_devtools_frontend.h"
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/shell/browser/layout_test/blink_test_controller.h"
 #include "content/shell/browser/shell.h"
+//#include "content/shell/browser/shell_devtools_frontend.h"
 #include "content/shell/common/layout_test/layout_test_switches.h"
 #include "net/base/filename_util.h"
 
 namespace content {
 
 // static
+LayoutTestDevToolsFrontend*
+LayoutTestDevToolsFrontend::CreateDevToolsMainWindow(
+    const Shell& inspected_window,
+    const std::string& test_url_spec) {
+  Shell* devtools_shell = Shell::CreateNewWindow(
+      inspected_window.web_contents()->GetBrowserContext(), GURL(), NULL,
+      gfx::Size());
+  LayoutTestDevToolsFrontend* devtools_frontend =
+      new LayoutTestDevToolsFrontend(devtools_shell,
+                                     inspected_window.web_contents());
+  devtools_frontend->Activate();
+  devtools_frontend->Focus();
+  return devtools_frontend;
+}
+
+// static
 LayoutTestDevToolsFrontend* LayoutTestDevToolsFrontend::Show(
     WebContents* inspected_contents,
     const std::string& settings,
     const std::string& frontend_url) {
   Shell* shell = Shell::CreateNewWindow(inspected_contents->GetBrowserContext(),
                                         GURL(),
                                         NULL,
                                         gfx::Size());
   LayoutTestDevToolsFrontend* devtools_frontend =
       new LayoutTestDevToolsFrontend(shell, inspected_contents);
@@ skipping 33 matching lines @@
   GURL result =
       net::FilePathToFileURL(dev_tools_path.AppendASCII("inspector.html"));
   std::string url_string =
       base::StringPrintf("%s?experiments=true", result.spec().c_str());
   if (is_debug_dev_tools)
     url_string += "&debugFrontend=true";
   return GURL(url_string);
 }
 
 // static.
-GURL LayoutTestDevToolsFrontend::MapJSTestURL(const GURL& test_url) {
+GURL LayoutTestDevToolsFrontend::MapIntegrationTestURL(const GURL& test_url) {
   std::string url_string = GetDevToolsPathAsURL(std::string()).spec();
   std::string inspector_file_name = "inspector.html";
   size_t start_position = url_string.find(inspector_file_name);
+  url_string.replace(start_position, inspector_file_name.length(),
+                     "integration_test_runner.html");
+  url_string += "&test=" + test_url.spec();
+  return GURL(url_string);
+}
+
+// static.
+GURL LayoutTestDevToolsFrontend::MapUnitTestURL(const GURL& test_url) {
+  std::string url_string = GetDevToolsPathAsURL(std::string()).spec();
+  std::string inspector_file_name = "inspector.html";
+  size_t start_position = url_string.find(inspector_file_name);
   url_string.replace(start_position, inspector_file_name.length(),
                      "unit_test_runner.html");
   url_string += "&test=" + test_url.spec();
   return GURL(url_string);
 }
 
 void LayoutTestDevToolsFrontend::ReuseFrontend(const std::string& settings,
                                                const std::string frontend_url) {
   DisconnectFromTarget();
   SetPreferences(settings);
@@ skipping 58 matching lines @@
     base::TerminationStatus status) {
   BlinkTestController::Get()->DevToolsProcessCrashed();
 }
 
 void LayoutTestDevToolsFrontend::RenderFrameCreated(
     RenderFrameHost* render_frame_host) {
   BlinkTestController::Get()->HandleNewRenderFrameHost(render_frame_host);
 }
 
 }  // namespace content