DevTools: create test infrastructure so devtools drives the test

content/shell/browser/layout_test/layout_test_devtools_bindings.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_bindings.h"
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/path_service.h"
@@ skipping 40 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 LayoutTestDevToolsBindings::MapJSTestURL(const GURL& test_url) {
+GURL LayoutTestDevToolsBindings::MapTestURLIfNeeded(const GURL& test_url,
+                                                    bool* is_integration_test) {
+  std::string spec = test_url.spec();
+  *is_integration_test = spec.find("/devtools-js/") != std::string::npos;
+  bool is_unit_test = spec.find("/inspector-unit/") != std::string::npos;
+  if (!*is_integration_test && !is_unit_test) {

[dgozman, 2017/06/19 22:55:51]

nit: no need for {}

[chenwilliam, 2017/06/19 23:48:17]

Done.

+    return test_url;
+  }
+  std::string test_page;
+  if (is_integration_test)

[dgozman, 2017/06/19 22:55:51]

*is_integration_test

[chenwilliam, 2017/06/19 23:48:17]

Done. Ah, so it was running the unit tests as integration tests which is why I
saw console messages (which I suppressed with the Host.isUnderTest code), my
bad.

+    test_page = "integration_test_runner.html";
+  else
+    test_page = "unit_test_runner.html";
+  return MapJSTestURL(test_url, test_page);

[dgozman, 2017/06/19 22:55:51]

MapJSTestURL(test_url, is_unit_test ? "unit_test_runner.html" :
"integration_test_runner.html");

[chenwilliam, 2017/06/19 23:48:17]

Done.

+}
+
+// static.
+GURL LayoutTestDevToolsBindings::MapJSTestURL(
+    const GURL& test_url,
+    const std::string& entry_filename) {
   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");
+                     entry_filename);
   url_string += "&test=" + test_url.spec();
   return GURL(url_string);
 }
 
 // static
 LayoutTestDevToolsBindings* LayoutTestDevToolsBindings::LoadDevTools(
     WebContents* devtools_contents_,
     WebContents* inspected_contents_,
     const std::string& settings,
     const std::string& frontend_url) {
   LayoutTestDevToolsBindings* bindings =
       new LayoutTestDevToolsBindings(devtools_contents_, inspected_contents_);
   bindings->SetPreferences(settings);
   GURL devtools_url =
       LayoutTestDevToolsBindings::GetDevToolsPathAsURL(frontend_url);
   NavigationController::LoadURLParams params(devtools_url);
   params.transition_type = ui::PageTransitionFromInt(
       ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR);
   bindings->web_contents()->GetController().LoadURLWithParams(params);
   bindings->web_contents()->Focus();
-  bindings->CreateFrontendHost();
   return bindings;
 }
 
 void LayoutTestDevToolsBindings::EvaluateInFrontend(int call_id,
                                                     const std::string& script) {
   if (!ready_for_test_) {
     pending_evaluations_.push_back(std::make_pair(call_id, script));
     return;
   }
 
@@ skipping 35 matching lines @@
     base::TerminationStatus status) {
   BlinkTestController::Get()->DevToolsProcessCrashed();
 }
 
 void LayoutTestDevToolsBindings::RenderFrameCreated(
     RenderFrameHost* render_frame_host) {
   BlinkTestController::Get()->HandleNewRenderFrameHost(render_frame_host);
 }
 
 }  // namespace content