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

Unified Diff: content/test/content_test_launcher.cc

Issue 220073002: Turns on use_mojo for android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add export 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
« no previous file with comments | « content/content_tests.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/content_test_launcher.cc
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
index e875673c9a97c0061a9159c71ede847123441104..d819165e1e6f2fb9eff866e1915e725991c0036e 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
« no previous file with comments | « content/content_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698