Test runner: make inspector tests reuse a single inspector process.

content/shell/browser/shell.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/shell.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 230 matching lines @@
   int current_index = web_contents_->GetController().GetCurrentEntryIndex();
   int max_index = web_contents_->GetController().GetEntryCount() - 1;
 
   PlatformEnableUIControl(BACK_BUTTON, current_index > 0);
   PlatformEnableUIControl(FORWARD_BUTTON, current_index < max_index);
   PlatformEnableUIControl(STOP_BUTTON,
       to_different_document && web_contents_->IsLoading());
 }
 
 void Shell::ShowDevTools() {
-  InnerShowDevTools("", "");
+  InnerShowDevTools();
 }
 
 void Shell::ShowDevToolsForElementAt(int x, int y) {
-  InnerShowDevTools("", "");
+  InnerShowDevTools();
   devtools_frontend_->InspectElementAt(x, y);
 }
 
-void Shell::ShowDevToolsForTest(const std::string& settings,
-                                const std::string& frontend_url) {
-  InnerShowDevTools(settings, frontend_url);
-}
-
 void Shell::CloseDevTools() {
   if (!devtools_frontend_)
     return;
   devtools_observer_.reset();
   devtools_frontend_->Close();
   devtools_frontend_ = NULL;
 }
 
 gfx::NativeView Shell::GetContentView() {
   if (!web_contents_)
@@ skipping 137 matching lines @@
 #if defined(TOOLKIT_VIEWS)
   PlatformWebContentsFocused(contents);
 #endif
 }
 
 void Shell::TitleWasSet(NavigationEntry* entry, bool explicit_set) {
   if (entry)
     PlatformSetTitle(entry->GetTitle());
 }
 
-void Shell::InnerShowDevTools(const std::string& settings,
-                              const std::string& frontend_url) {
+void Shell::InnerShowDevTools() {
   if (!devtools_frontend_) {
-    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kDumpRenderTree)) {
-      devtools_frontend_ = LayoutTestDevToolsFrontend::Show(
-          web_contents(), settings, frontend_url);
-    } else {
-      devtools_frontend_ = ShellDevToolsFrontend::Show(web_contents());
-    }
+    devtools_frontend_ = ShellDevToolsFrontend::Show(web_contents());
     devtools_observer_.reset(new DevToolsWebContentsObserver(
         this, devtools_frontend_->frontend_shell()->web_contents()));
   }
 
   devtools_frontend_->Activate();
   devtools_frontend_->Focus();
 }
 
 void Shell::OnDevToolsWebContentsDestroyed() {
   devtools_observer_.reset();
   devtools_frontend_ = NULL;
 }
 
 }  // namespace content