summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/test_shell.cc1
-rw-r--r--webkit/tools/test_shell/test_shell.h3
-rw-r--r--webkit/tools/test_shell/test_shell_win.cc10
3 files changed, 5 insertions, 9 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 82f7c8d..c4023d5 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -107,7 +107,6 @@ WindowList* TestShell::window_list_;
WebPreferences* TestShell::web_prefs_ = NULL;
bool TestShell::developer_extras_enabled_ = false;
bool TestShell::enable_html5_parser_ = true;
-bool TestShell::inspector_test_mode_ = false;
bool TestShell::layout_test_mode_ = false;
bool TestShell::allow_external_pages_ = false;
int TestShell::file_test_timeout_ms_ = kDefaultFileTestTimeoutMillisecs;
diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h
index 8f7e60c..0bdffaa 100644
--- a/webkit/tools/test_shell/test_shell.h
+++ b/webkit/tools/test_shell/test_shell.h
@@ -380,9 +380,6 @@ private:
// True if developer extras should be enabled.
static bool developer_extras_enabled_;
- // Whether DevTools should be open before loading the page.
- static bool inspector_test_mode_;
-
// True when the app is being run using the --layout-tests switch.
static bool layout_test_mode_;
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 15596856..286deab 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -257,11 +257,11 @@ bool TestShell::RunFileTest(const TestParams& params) {
shell = static_cast<TestShell*>(win_util::GetWindowUserData(hwnd));
DCHECK(shell);
- if (strstr(params.test_url.c_str(), "/inspector/") ||
- strstr(params.test_url.c_str(), "\\inspector\\"))
- inspector_test_mode_ = true;
+ // Whether DevTools should be open before loading the page.
+ bool inspector_test_mode = strstr(params.test_url.c_str(), "/inspector/") ||
+ strstr(params.test_url.c_str(), "\\inspector\\");
- developer_extras_enabled_ = inspector_test_mode_ ||
+ developer_extras_enabled_ = inspector_test_mode ||
strstr(params.test_url.c_str(), "/inspector-enabled/") ||
strstr(params.test_url.c_str(), "\\inspector-enabled\\");
@@ -279,7 +279,7 @@ bool TestShell::RunFileTest(const TestParams& params) {
strstr(params.test_url.c_str(), "loading\\"))
shell->layout_test_controller()->SetShouldDumpFrameLoadCallbacks(true);
- if (inspector_test_mode_)
+ if (inspector_test_mode)
shell->ShowDevTools();
GURL url(params.test_url);