diff options
author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 12:47:34 +0000 |
---|---|---|
committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 12:47:34 +0000 |
commit | 18c83cc15087788e314580d2fd20aff907ba1589 (patch) | |
tree | 14bbce3c0ccf83bdbb80e86c1b082e15689634bf /apps/shell | |
parent | 0d39935ece19c811aa86977b8aa7743138b6a7fd (diff) | |
download | chromium_src-18c83cc15087788e314580d2fd20aff907ba1589.zip chromium_src-18c83cc15087788e314580d2fd20aff907ba1589.tar.gz chromium_src-18c83cc15087788e314580d2fd20aff907ba1589.tar.bz2 |
Add apps_browsertests target (currently running 0 tests).
Since trybot configurations only really support building test targets, this change adds a test target (that doesn't run any tests) to ensure that app_shell compiles, so that changes that pass the trybots cannot break the main waterfall due to app_shell compile problems.
BUG=349631
Review URL: https://codereview.chromium.org/205653002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258549 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/shell')
-rw-r--r-- | apps/shell/browser/shell_browser_main_parts.cc | 12 | ||||
-rw-r--r-- | apps/shell/browser/shell_browser_main_parts.h | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/apps/shell/browser/shell_browser_main_parts.cc b/apps/shell/browser/shell_browser_main_parts.cc index ab9aac2..fefaf0c 100644 --- a/apps/shell/browser/shell_browser_main_parts.cc +++ b/apps/shell/browser/shell_browser_main_parts.cc @@ -76,8 +76,7 @@ namespace apps { ShellBrowserMainParts::ShellBrowserMainParts( const content::MainFunctionParams& parameters) - : extension_system_(NULL) { -} + : extension_system_(NULL), parameters_(parameters) {} ShellBrowserMainParts::~ShellBrowserMainParts() { } @@ -131,6 +130,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(); diff --git a/apps/shell/browser/shell_browser_main_parts.h b/apps/shell/browser/shell_browser_main_parts.h index 653e90d..8d559bc 100644 --- a/apps/shell/browser/shell_browser_main_parts.h +++ b/apps/shell/browser/shell_browser_main_parts.h @@ -9,6 +9,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/browser_main_parts.h" +#include "content/public/common/main_function_params.h" #include "ui/aura/window_tree_host_observer.h" namespace aura { @@ -105,6 +106,9 @@ class ShellBrowserMainParts : public content::BrowserMainParts, // Owned by the KeyedService system. extensions::ShellExtensionSystem* extension_system_; + // For running app browsertests. + const content::MainFunctionParams parameters_; + DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); }; |