Revert 272472 "Mojo: nuke EnvironmentData"

Caused layout tests (when run with check-sys-deps) to hang on Windows
with a stuck content_shell process. See Issue 376929.

BUG=376929

> 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

TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/299263002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272589 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 0 deletions

diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
index 85c0f4a..64e91f8 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc
@@ -76,6 +76,14 @@ class ContentBrowserTestSuite : public ContentTestSuiteBase {
     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_;