From 1ba6c7e1078e14901b6b1d86c20db490e107375e Mon Sep 17 00:00:00 2001 From: "darin@chromium.org" Date: Sat, 14 Jun 2014 20:18:29 +0000 Subject: Mojo: nuke EnvironmentData With this change, Mojo applications that link against mojo_environment_chromium do not need to instantiate mojo::Environment. We rely on AtExitManager for all finalization of singleton objects. This frees us up to use the familiar base::Singleton and base::LazyInstance for any such state. Tests can use ShadowingAtExitManager to clean the environment between test runs. It becomes a link error to use mojo::Environment if you are not linking against mojo_environment_standalone. I plan to follow this up with a change that buries mojo::Environment for the case where you are linking against mojo_environment_standalone. Ideally, this means no one will ever need to think about mojo::Environment again. Review URL: https://codereview.chromium.org/281353005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277265 0039d316-1c4b-4281-b951-d872f2087c98 --- content/app/content_main_runner.cc | 4 ---- 1 file changed, 4 deletions(-) (limited to 'content/app/content_main_runner.cc') diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index 061bdee..38bf1cb 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -777,10 +777,6 @@ class ContentMainRunnerImpl : public ContentMainRunner { delegate_->ProcessExiting(process_type); } -#if !defined(OS_IOS) - ShutdownMojo(); -#endif - #if defined(OS_WIN) #ifdef _CRTDBG_MAP_ALLOC _CrtDumpMemoryLeaks(); -- cgit v1.1