DevTools: Run devtools tests in release mode

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/common/layout_test/layout_test_switches.h"
 #include "net/base/filename_util.h"
 
 namespace content {
 
 // static
 LayoutTestDevToolsFrontend* LayoutTestDevToolsFrontend::Show(
     WebContents* inspected_contents,
     const std::string& settings,
     const std::string& frontend_url) {
   Shell* shell = Shell::CreateNewWindow(inspected_contents->GetBrowserContext(),
@@ skipping 16 matching lines @@
   if (!PathService::Get(base::DIR_EXE, &dir_exe)) {
     NOTREACHED();
     return GURL();
   }
 #if defined(OS_MACOSX)
   // On Mac, the executable is in
   // out/Release/Content Shell.app/Contents/MacOS/Content Shell.
   // We need to go up 3 directories to get to out/Release.
   dir_exe = dir_exe.AppendASCII("../../..");
 #endif
+  bool isDebugDevTools = base::CommandLine::ForCurrentProcess()->HasSwitch(

[pfeldman, 2016/08/24 00:36:04]

use_underscore_notation

[chenwilliam, 2016/08/24 22:53:40]

Done.

+      switches::kDebugDevTools);
+  std::string folder = isDebugDevTools ? "inspector" : "inspector_release";
   base::FilePath dev_tools_path =
-      dir_exe.AppendASCII("resources/inspector/inspector.html");
+      dir_exe.AppendASCII("resources/" + folder + "/inspector.html");
 
   GURL result = net::FilePathToFileURL(dev_tools_path);
   std::string url_string =
       base::StringPrintf("%s?experiments=true", result.spec().c_str());
 #if defined(DEBUG_DEVTOOLS)

[pfeldman, 2016/08/24 00:36:04]

This should now be based on the runtime check.

[chenwilliam, 2016/08/24 22:53:40]

Done.

   url_string += "&debugFrontend=true";
 #endif  // defined(DEBUG_DEVTOOLS)
   return GURL(url_string);
 }
 
 void LayoutTestDevToolsFrontend::ReuseFrontend(const std::string& settings,
                                                const std::string frontend_url) {
   DisconnectFromTarget();
   SetPreferences(settings);
   ready_for_test_ = false;
@@ skipping 57 matching lines @@
     base::TerminationStatus status) {
   BlinkTestController::Get()->DevToolsProcessCrashed();
 }
 
 void LayoutTestDevToolsFrontend::RenderFrameCreated(
     RenderFrameHost* render_frame_host) {
   BlinkTestController::Get()->HandleNewRenderFrameHost(render_frame_host);
 }
 
 }  // namespace content