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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/content/test/content_test_launcher.cc

Issue 299263002: Revert 272472 "Mojo: nuke EnvironmentData" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | « trunk/src/content/app/mojo/mojo_init.cc ('k') | trunk/src/mojo/android/javatests/core_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/test/content_test_launcher.cc
===================================================================
--- trunk/src/content/test/content_test_launcher.cc (revision 272588)
+++ trunk/src/content/test/content_test_launcher.cc (working copy)
@@ -76,7 +76,15 @@
ContentTestSuiteBase::Initialize();
}
+ virtual void Shutdown() OVERRIDE {
+ ContentTestSuiteBase::Shutdown();
+
#if defined(OS_ANDROID)
+ ShutdownMojo();
+#endif
+ }
+
+#if defined(OS_ANDROID)
scoped_ptr<ShellContentClient> content_client_;
scoped_ptr<ShellContentBrowserClient> browser_content_client_;
#endif
« no previous file with comments | « trunk/src/content/app/mojo/mojo_init.cc ('k') | trunk/src/mojo/android/javatests/core_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698