Rolls WebKit 61233:61234 (Enable HTML5 Lexer)

webkit/tools/test_shell/test_shell_main.cc

 // Copyright (c) 2006-2008 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 "base/at_exit.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/event_recorder.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 160 matching lines @@
 
   // Config the network module so it has access to a limited set of resources.
   net::NetModule::SetResourceProvider(TestShell::NetResourceProvider);
 
   // On Linux and Mac, load the test root certificate.
   net::TestServerLauncher ssl_util;
   ssl_util.LoadTestRootCert();
 
   platform.InitializeGUI();
 
-  if (parsed_command_line.HasSwitch(test_shell::kEnableHtml5Parser)) {
-    TestShell::enable_html5_parser();
+  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))
     TestShell::SetAllowScriptsToCloseWindows();
 
   // Disable user themes for layout tests so pixel tests are consistent.
 #if defined(OS_WIN)
   TestShellWebTheme::Engine engine;
@@ skipping 191 matching lines @@
   TestShell::ShutdownTestShell();
   TestShell::CleanupLogging();
 
   // Tear down shared StatsTable; prevents unit_tests from leaking it.
   StatsTable::set_current(NULL);
   delete table;
   RemoveSharedMemoryFile(stats_filename);
 
   return 0;
 }