Fix StatsCounters on mac.

chrome/app/chrome_main.cc

 // Copyright (c) 2010 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 "app/app_paths.h"
 #include "app/app_switches.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/i18n/icu_util.h"
@@ skipping 664 matching lines @@
     // Disable sync and extensions if we're in "browse without sign-in" mode.
     CommandLine* singleton_command_line = CommandLine::ForCurrentProcess();
     singleton_command_line->AppendSwitch(switches::kDisableSync);
     singleton_command_line->AppendSwitch(switches::kDisableExtensions);
     browser_defaults::bookmarks_enabled = false;
   }
 #endif
 
   base::ProcessId browser_pid = base::GetCurrentProcId();
   if (SubprocessIsBrowserChild(process_type)) {
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_MACOSX)
     std::string channel_name =
         command_line.GetSwitchValueASCII(switches::kProcessChannelID);
 
     int browser_pid_int;
     base::StringToInt(channel_name, &browser_pid_int);
     browser_pid = static_cast<base::ProcessId>(browser_pid_int);
-    DCHECK_NE(browser_pid, 0u);
-#elif defined(OS_MACOSX)
-    browser_pid = base::GetCurrentProcId();
-    SendTaskPortToParentProcess();
+    DCHECK_NE(browser_pid, 0);
 #elif defined(OS_POSIX)
     // On linux, we're in the zygote here; so we need the parent process' id.
     browser_pid = base::GetParentProcessId(base::GetCurrentProcId());
 #endif
 
+#if defined(OS_MACOSX)
+    SendTaskPortToParentProcess();
+#endif
+
 #if defined(OS_POSIX)
     // When you hit Ctrl-C in a terminal running the browser
     // process, a SIGINT is delivered to the entire process group.
     // When debugging the browser process via gdb, gdb catches the
     // SIGINT for the browser process (and dumps you back to the gdb
     // console) but doesn't for the child processes, killing them.
     // The fix is to have child processes ignore SIGINT; they'll die
     // on their own when the browser process goes away.
     //
     // Note that we *can't* rely on BeingDebugged to catch this case because we
@@ skipping 47 matching lines @@
   // * If Breakpad is disabled, we only turn on Crash Reporter for the
   //    Browser process in release mode.
   if (!command_line.HasSwitch(switches::kDisableBreakpad)) {
     bool disable_apple_crash_reporter = is_debug_build
                                         || base::mac::IsBackgroundOnlyProcess();
     if (!IsCrashReporterEnabled() && disable_apple_crash_reporter) {
       base::mac::DisableOSCrashDumps();
     }
   }
 
-#if defined(OS_MACOSX)

[tonyg, 2011/01/24 23:56:55]

FYI, this is no functional change. I just noticed it is redundant since it is
already embedded in a defined(OS_MACOSX) guard.

   // Mac Chrome is packaged with a main app bundle and a helper app bundle.
   // The main app bundle should only be used for the browser process, so it
   // should never see a --type switch (switches::kProcessType).  Likewise,
   // the helper should always have a --type switch.
   //
   // This check is done this late so there is already a call to
   // base::mac::IsBackgroundOnlyProcess(), so there is no change in
   // startup/initialization order.
 
   // The helper's Info.plist marks it as a background only app.
   if (base::mac::IsBackgroundOnlyProcess()) {
     CHECK(command_line.HasSwitch(switches::kProcessType))
         << "Helper application requires --type.";
   } else {
     CHECK(!command_line.HasSwitch(switches::kProcessType))
         << "Main application forbids --type, saw \"" << process_type << "\".";
   }
-#endif  // defined(OS_MACOSX)
 
   if (IsCrashReporterEnabled())
     InitCrashProcessInfo();
-#endif  // OS_MACOSX
+#endif  // defined(OS_MACOSX)
 
   InitializeStatsTable(browser_pid, command_line);
 
   base::StatsScope<base::StatsCounterTimer>
       startup_timer(chrome::Counters::chrome_main());
 
   // Enable the heap profiler as early as possible!
   EnableHeapProfiler(command_line);
 
   // Enable Message Loop related state asap.
@@ skipping 123 matching lines @@
 
   int exit_code = RunNamedProcessTypeMain(process_type, main_params);
 
   if (SubprocessNeedsResourceBundle(process_type))
     ResourceBundle::CleanupSharedInstance();
 
   LowLevelShutdown();
 
   return exit_code;
 }