Index: content/shell/shell_browser_main.cc |
diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc |
index fb13b551fb3a2d167790c9d580280b84a23e4a24..908f8e61018c89552e13e8f5a1bfc3965ee17b64 100644 |
--- a/content/shell/shell_browser_main.cc |
+++ b/content/shell/shell_browser_main.cc |
@@ -4,6 +4,8 @@ |
#include "content/shell/shell_browser_main.h" |
+#include <iostream> |
+ |
#include "base/command_line.h" |
#include "base/logging.h" |
#include "base/memory/scoped_ptr.h" |
@@ -67,6 +69,11 @@ int ShellBrowserMain(const content::MainFunctionParams& parameters) { |
if (exit_code >= 0) |
return exit_code; |
+ if (CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kCheckLayoutTestSysDeps)) { |
+ return 0; |
+ } |
+ |
bool layout_test_mode = |
CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree); |
@@ -82,8 +89,7 @@ int ShellBrowserMain(const content::MainFunctionParams& parameters) { |
*new_line_position = '\0'; |
if (test_string[0] == '\0') |
continue; |
- if (!strcmp(test_string, "QUIT")) |
- break; |
+ |
content::Shell::CreateNewWindow(browser_context, |
GetURLForLayoutTest(test_string), |
NULL, |
@@ -92,6 +98,11 @@ int ShellBrowserMain(const content::MainFunctionParams& parameters) { |
main_runner_->Run(); |
content::Shell::CloseAllWindows(); |
+ |
+ // Test footer. |
+ std::cout << "#EOF\n"; |
+ std::cout.flush(); |
+ |
} |
exit_code = 0; |
} else { |