diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-14 20:18:29 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-14 20:18:29 +0000 |
| commit | 1ba6c7e1078e14901b6b1d86c20db490e107375e (patch) | |
| tree | 3636f9da0992c881f1f2eaac1b97f82b104fd395 /content/app/content_main_runner.cc | |
| parent | a6699f3e95281be7fa0d9a6d12024e7b561dcab2 (diff) | |
| download | chromium_src-1ba6c7e1078e14901b6b1d86c20db490e107375e.zip chromium_src-1ba6c7e1078e14901b6b1d86c20db490e107375e.tar.gz chromium_src-1ba6c7e1078e14901b6b1d86c20db490e107375e.tar.bz2 | |
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
Diffstat (limited to 'content/app/content_main_runner.cc')
| -rw-r--r-- | content/app/content_main_runner.cc | 4 |
1 files changed, 0 insertions, 4 deletions
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(); |