Revert 272472 "Mojo: nuke EnvironmentData"

trunk/src/content/test/content_test_launcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/test/test_launcher.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/logging.h"
@@ skipping 58 matching lines @@
     RegisterPathProvider();
     ui::RegisterPathProvider();
     RegisterInProcessThreads();
 
     InitializeMojo();
 #endif
 
     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
 
   DISALLOW_COPY_AND_ASSIGN(ContentBrowserTestSuite);
 };
 
 class ContentTestLauncherDelegate : public TestLauncherDelegate {
  public:
@@ skipping 22 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate);
 };
 
 }  // namespace content
 
 int main(int argc, char** argv) {
   int default_jobs = std::max(1, base::SysInfo::NumberOfProcessors() / 2);
   content::ContentTestLauncherDelegate launcher_delegate;
   return LaunchTests(&launcher_delegate, default_jobs, argc, argv);
 }