Revert 272472 "Mojo: nuke EnvironmentData"

trunk/src/content/app/content_main_runner.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/app/content_main_runner.h"
 
 #include <stdlib.h>
 
 #include "base/allocator/allocator_extension.h"
 #include "base/at_exit.h"
@@ skipping 733 matching lines @@
     DCHECK(!is_shutdown_);
 
     if (completed_basic_startup_ && delegate_) {
       const CommandLine& command_line = *CommandLine::ForCurrentProcess();
       std::string process_type =
           command_line.GetSwitchValueASCII(switches::kProcessType);
 
       delegate_->ProcessExiting(process_type);
     }
 
+#if !defined(OS_IOS)
+    ShutdownMojo();
+#endif
+
 #if defined(OS_WIN)
 #ifdef _CRTDBG_MAP_ALLOC
     _CrtDumpMemoryLeaks();
 #endif  // _CRTDBG_MAP_ALLOC
 
     _Module.Term();
 #endif  // OS_WIN
 
 #if defined(OS_MACOSX)
     autorelease_pool_.reset(NULL);
@@ skipping 32 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
 };
 
 // static
 ContentMainRunner* ContentMainRunner::Create() {
   return new ContentMainRunnerImpl();
 }
 
 }  // namespace content