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

Unified Diff: apps/shell/browser/shell_browser_main_parts.cc

Issue 205653002: Add apps_browsertests target (currently running 0 tests). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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
Index: apps/shell/browser/shell_browser_main_parts.cc
diff --git a/apps/shell/browser/shell_browser_main_parts.cc b/apps/shell/browser/shell_browser_main_parts.cc
index e506e81a69e63091b3dbb0fdcd685b0a7610a1b2..bd95feedd9a76224bdc6a3deeb0d98648148465b 100644
--- a/apps/shell/browser/shell_browser_main_parts.cc
+++ b/apps/shell/browser/shell_browser_main_parts.cc
@@ -73,8 +73,7 @@ class ShellViewsDelegate : public views::TestViewsDelegate {
ShellBrowserMainParts::ShellBrowserMainParts(
const content::MainFunctionParams& parameters)
- : extension_system_(NULL) {
-}
+ : extension_system_(NULL), parameters_(parameters) {}
ShellBrowserMainParts::~ShellBrowserMainParts() {
}
@@ -128,6 +127,15 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
devtools_delegate_.reset(
new content::ShellDevToolsDelegate(browser_context_.get()));
+ // For running browser tests.
+ // TODO(yoz): This is set up to exit prematurely because we don't have
+ // any tests yet.
+ if (parameters_.ui_task) {
+ parameters_.ui_task->Run();
+ delete parameters_.ui_task;
+ return;
+ }
+
CreateRootWindow();
CreateViewsDelegate();

Powered by Google App Engine
This is Rietveld 408576698