summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-25 00:07:20 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-25 00:07:20 +0000
commit94c8bdb5af3b423d72ff3fb6e20bb6592e0362f2 (patch)
treee90b894ae9852557cefdd4e9f03a99758627d2a1 /webkit/tools
parent8ad0adee6e5344c7f53ee688bd1b3b6f62a44f05 (diff)
downloadchromium_src-94c8bdb5af3b423d72ff3fb6e20bb6592e0362f2.zip
chromium_src-94c8bdb5af3b423d72ff3fb6e20bb6592e0362f2.tar.gz
chromium_src-94c8bdb5af3b423d72ff3fb6e20bb6592e0362f2.tar.bz2
Remove reference to obsolete web preference. The legacy parser no longer
exists so it can't be enabled. Review URL: http://codereview.chromium.org/3157038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/test_shell.cc3
-rw-r--r--webkit/tools/test_shell/test_shell.h5
-rw-r--r--webkit/tools/test_shell/test_shell_main.cc4
-rw-r--r--webkit/tools/test_shell/test_shell_switches.cc2
-rw-r--r--webkit/tools/test_shell/test_shell_switches.h1
5 files changed, 0 insertions, 15 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 07416a6..6b2c748 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -106,7 +106,6 @@ class URLRequestTestShellFileJob : public URLRequestFileJob {
WindowList* TestShell::window_list_;
WebPreferences* TestShell::web_prefs_ = NULL;
bool TestShell::developer_extras_enabled_ = false;
-bool TestShell::enable_html5_parser_ = true;
bool TestShell::layout_test_mode_ = false;
bool TestShell::allow_external_pages_ = false;
int TestShell::file_test_timeout_ms_ = kDefaultFileTestTimeoutMillisecs;
@@ -499,8 +498,6 @@ void TestShell::ResetWebPreferences() {
// tabbing to links by default.
web_prefs_->tabs_to_links = false;
- web_prefs_->enable_html5_parser = enable_html5_parser_;
-
// Allow those layout tests running as local files, i.e. under
// LayoutTests/http/tests/local, to access http server.
if (layout_test_mode_)
diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h
index 0bdffaa..4ddb592 100644
--- a/webkit/tools/test_shell/test_shell.h
+++ b/webkit/tools/test_shell/test_shell.h
@@ -324,8 +324,6 @@ public:
return dev_tools_agent_.get();
}
- static void disable_html5_parser() { enable_html5_parser_ = false; }
-
protected:
void CreateDevToolsClient(TestShellDevToolsAgent* agent);
bool Initialize(const GURL& starting_url);
@@ -388,9 +386,6 @@ private:
// produce images of the rendered page)
static bool allow_external_pages_;
- // Whether to use the new HTML5 parsing code.
- static bool enable_html5_parser_;
-
// Default timeout in ms for file page loads when in layout test mode.
static int file_test_timeout_ms_;
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 27f2396..1675ebb 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -179,10 +179,6 @@ int main(int argc, char* argv[]) {
platform.InitializeGUI();
- if (parsed_command_line.HasSwitch(test_shell::kEnableLegacyParser)) {
- TestShell::disable_html5_parser();
- }
-
TestShell::InitializeTestShell(layout_test_mode, allow_external_pages);
if (parsed_command_line.HasSwitch(test_shell::kAllowScriptsToCloseWindows))
diff --git a/webkit/tools/test_shell/test_shell_switches.cc b/webkit/tools/test_shell/test_shell_switches.cc
index bd544d1..9cd8312 100644
--- a/webkit/tools/test_shell/test_shell_switches.cc
+++ b/webkit/tools/test_shell/test_shell_switches.cc
@@ -86,6 +86,4 @@ const char kHeapProfiler[] = "heap-profiler";
const char kAllowExternalPages[] = "allow-external-pages";
-const char kEnableLegacyParser[] = "legacy-parser";
-
} // namespace test_shell
diff --git a/webkit/tools/test_shell/test_shell_switches.h b/webkit/tools/test_shell/test_shell_switches.h
index 80780d8..46ec7b2 100644
--- a/webkit/tools/test_shell/test_shell_switches.h
+++ b/webkit/tools/test_shell/test_shell_switches.h
@@ -35,7 +35,6 @@ extern const char kGDB[];
extern const char kProfiler[];
extern const char kHeapProfiler[];
extern const char kAllowExternalPages[];
-extern const char kEnableLegacyParser[];
} // namespace test_shell