diff options
author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 06:17:17 +0000 |
---|---|---|
committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 06:17:17 +0000 |
commit | eaaa36f6c09f7b6022dd507c13d21871fedead40 (patch) | |
tree | 4e5b60ff2df6e7e8a961184bcd7124457b11bcb3 /chrome/app/chrome_main.cc | |
parent | af9db5fc79084fe986cf51ccc8b3475a5a4ef76f (diff) | |
download | chromium_src-eaaa36f6c09f7b6022dd507c13d21871fedead40.zip chromium_src-eaaa36f6c09f7b6022dd507c13d21871fedead40.tar.gz chromium_src-eaaa36f6c09f7b6022dd507c13d21871fedead40.tar.bz2 |
[Mac] Enable CrZombie for subprocesses in release builds.
EOM.
BUG=94551
TEST=none
Review URL: http://codereview.chromium.org/8133008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_main.cc')
-rw-r--r-- | chrome/app/chrome_main.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc index 4d26172..f59e7ac 100644 --- a/chrome/app/chrome_main.cc +++ b/chrome/app/chrome_main.cc @@ -381,19 +381,20 @@ class ChromeMainDelegate : public content::ContentMainDelegate { chromeos::BootTimesLoader::Get()->SaveChromeMainStats(); #endif + const CommandLine& command_line = *CommandLine::ForCurrentProcess(); + #if defined(OS_MACOSX) - // TODO(shess): Enable zombies for everyone. http://crbug.com/94551 - DCHECK(ObjcEvilDoers::ZombieEnable(true, 1000)); + // Give the browser process a longer treadmill, since crashes + // there have more impact. + const bool is_browser = !command_line.HasSwitch(switches::kProcessType); + ObjcEvilDoers::ZombieEnable(true, is_browser ? 10000 : 1000); + SetUpBundleOverrides(); chrome::common::mac::EnableCFBundleBlocker(); #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)) { *exit_code = 0; @@ -420,7 +421,7 @@ class ChromeMainDelegate : public content::ContentMainDelegate { } #endif - if (process_type == "" && + if (!command_line.HasSwitch(switches::kProcessType) && command_line.HasSwitch(switches::kEnableBenchmarking)) { base::FieldTrial::EnableBenchmarking(); } |