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

Unified Diff: content/shell/app/shell_main_delegate.cc

Issue 649223004: Content Shell: Introduce LayoutTestBrowserMain. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@LayoutTestURLRequestContextGetter
Patch Set: ugh. Created 6 years, 2 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 | « content/shell/BUILD.gn ('k') | content/shell/browser/layout_test/layout_test_browser_main.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/app/shell_main_delegate.cc
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index b0fbabb2c3508f187617bbac907e5ace8ab5c1be..ae2b566d814436d65b0007e35ebaf9997ac982f9 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -19,6 +19,7 @@
#include "content/public/test/layouttest_support.h"
#include "content/shell/app/shell_crash_reporter_client.h"
#include "content/shell/app/webkit_test_platform_support.h"
+#include "content/shell/browser/layout_test/layout_test_browser_main.h"
#include "content/shell/browser/shell_browser_main.h"
#include "content/shell/browser/shell_content_browser_client.h"
#include "content/shell/common/shell_switches.h"
@@ -251,7 +252,11 @@ int ShellMainDelegate::RunProcess(
#endif
browser_runner_.reset(BrowserMainRunner::Create());
- return ShellBrowserMain(main_function_params, browser_runner_);
+ CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ return command_line.HasSwitch(switches::kDumpRenderTree) ||
+ command_line.HasSwitch(switches::kCheckLayoutTestSysDeps)
+ ? LayoutTestBrowserMain(main_function_params, browser_runner_)
+ : ShellBrowserMain(main_function_params, browser_runner_);
}
#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
« no previous file with comments | « content/shell/BUILD.gn ('k') | content/shell/browser/layout_test/layout_test_browser_main.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698