diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 20:39:32 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 20:39:32 +0000 |
| commit | 96aca4267772014b20e71b6874b106babf752a50 (patch) | |
| tree | 9665d31b346f5dc104a1b9cc75627a9da6e344db /content/test/content_test_launcher.cc | |
| parent | 954387ef7d67aff24eca556c71d92050224a83f5 (diff) | |
| download | chromium_src-96aca4267772014b20e71b6874b106babf752a50.zip chromium_src-96aca4267772014b20e71b6874b106babf752a50.tar.gz chromium_src-96aca4267772014b20e71b6874b106babf752a50.tar.bz2 | |
Turns on use_mojo for android
BUG=none
TEST=none
R=darin@chromium.org, jam@chromium.org
Review URL: https://codereview.chromium.org/220073002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261519 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/content_test_launcher.cc')
| -rw-r--r-- | content/test/content_test_launcher.cc | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc index e875673..d819165 100644 --- a/content/test/content_test_launcher.cc +++ b/content/test/content_test_launcher.cc @@ -27,6 +27,11 @@ #include "content/shell/browser/shell_content_browser_client.h" #include "content/shell/common/shell_content_client.h" #include "ui/base/ui_base_paths.h" + +#if defined(USE_MOJO) +#include "content/app/mojo/mojo_init.h" +#endif + #endif namespace content { @@ -67,13 +72,26 @@ class ContentBrowserTestSuite : public ContentTestSuiteBase { RegisterPathProvider(); ui::RegisterPathProvider(); RegisterInProcessThreads(); + +#if defined(USE_MOJO) + InitializeMojo(); +#endif + #endif ContentTestSuiteBase::Initialize(); } + virtual void Shutdown() OVERRIDE { + ContentTestSuiteBase::Shutdown(); + +#if defined(OS_ANDROID) && defined(USE_MOJO) + ShutdownMojo(); +#endif + } + #if defined(OS_ANDROID) - scoped_ptr<ShellContentClient> content_client_; + scoped_ptr<ShellContentClient> content_client_; scoped_ptr<ShellContentBrowserClient> browser_content_client_; #endif |