Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(400)

Unified Diff: webkit/tools/test_shell/test_shell_main.cc

Issue 14841004: Remove remaining references to test_shell_tests now that the bots have been updated. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/tools/test_shell/test_shell_mac.mm ('k') | webkit/tools/test_shell/test_shell_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_shell_main.cc
===================================================================
--- webkit/tools/test_shell/test_shell_main.cc (revision 197949)
+++ webkit/tools/test_shell/test_shell_main.cc (working copy)
@@ -125,21 +125,6 @@
if (parsed_command_line.HasSwitch(test_shell::kEnableAccelCompositing))
TestShell::SetAcceleratedCompositingEnabled(true);
- if (parsed_command_line.HasSwitch(test_shell::kMultipleLoads)) {
- const std::string multiple_loads_str =
- parsed_command_line.GetSwitchValueASCII(test_shell::kMultipleLoads);
- int load_count;
- base::StringToInt(multiple_loads_str, &load_count);
- if (load_count <= 0) {
- #ifndef NDEBUG
- load_count = 2;
- #else
- load_count = 5;
- #endif
- }
- TestShell::SetMultipleLoad(load_count);
- }
-
bool layout_test_mode = false;
TestShell::InitLogging(suppress_error_dialogs,
layout_test_mode,
@@ -198,15 +183,6 @@
test_shell_webkit_init.SetThemeEngine(&engine);
#endif
- if (parsed_command_line.HasSwitch(test_shell::kTestShellTimeOut)) {
- const std::string timeout_str = parsed_command_line.GetSwitchValueASCII(
- test_shell::kTestShellTimeOut);
- int timeout_ms;
- base::StringToInt(timeout_str, &timeout_ms);
- if (timeout_ms > 0)
- TestShell::SetFileTestTimeout(timeout_ms);
- }
-
// Unless specifically requested otherwise, default to OSMesa for GL.
if (!parsed_command_line.HasSwitch(switches::kUseGL))
gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL);
« no previous file with comments | « webkit/tools/test_shell/test_shell_mac.mm ('k') | webkit/tools/test_shell/test_shell_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698