Back out trunk r103089 because it caused bug 98550.

chrome/app/chrome_main.cc

 // Copyright (c) 2011 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 "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/stats_counters.h"
 #include "base/path_service.h"
@@ skipping 369 matching lines @@
   virtual bool BasicStartupComplete(int* exit_code) OVERRIDE {
 #if defined(OS_CHROMEOS)
     chromeos::BootTimesLoader::Get()->SaveChromeMainStats();
 #endif
 
 #if defined(OS_MACOSX)
     // TODO(shess): Enable zombies for everyone.  http://crbug.com/94551
     DCHECK(ObjcEvilDoers::ZombieEnable(true, 1000));
     SetUpBundleOverrides();
     chrome::common::mac::EnableCFBundleBlocker();
-
-    SwitchToMachBootstrapSubsetPort();
 #endif
 
     Profiling::ProcessStarted();
 
     const CommandLine& command_line = *CommandLine::ForCurrentProcess();
     std::string process_type =
         command_line.GetSwitchValueASCII(switches::kProcessType);
 
 #if defined(OS_POSIX)
     if (HandleVersionSwitches(command_line)) {
@@ skipping 272 matching lines @@
 
     NOTREACHED() << "Unknown process type: " << process_type;
     return 1;
   }
 
   virtual void ProcessExiting(const std::string& process_type) OVERRIDE {
     if (SubprocessNeedsResourceBundle(process_type))
       ResourceBundle::CleanupSharedInstance();
 
     logging::CleanupChromeLogging();
+
+#if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD)
+    // TODO(mark): See the TODO(mark) at InitCrashReporter.
+    DestructCrashReporter();
+#endif  // OS_MACOSX && GOOGLE_CHROME_BUILD
   }
 
 #if defined(OS_MACOSX)
   virtual bool ProcessRegistersWithSystemProcess(
       const std::string& process_type) OVERRIDE {
     return process_type == switches::kNaClLoaderProcess ||
            process_type == switches::kExtensionProcess;
   }
 
   virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE {
@@ skipping 51 matching lines @@
 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
                                  sandbox::SandboxInterfaceInfo* sandbox_info) {
   ChromeMainDelegate chrome_main_delegate;
   return content::ContentMain(instance, sandbox_info, &chrome_main_delegate);
 #elif defined(OS_POSIX)
 int ChromeMain(int argc, const char** argv) {
   ChromeMainDelegate chrome_main_delegate;
   return content::ContentMain(argc, argv, &chrome_main_delegate);
 #endif
 }