| Index: chrome/app/chrome_crash_reporter_client_win.cc
|
| diff --git a/chrome/app/chrome_crash_reporter_client_win.cc b/chrome/app/chrome_crash_reporter_client_win.cc
|
| index b13781d981b37f35d6522d1b62b6b47c1cc19350..ca4f18bccf7acb1995af95f4e3e34a67deb4ffc8 100644
|
| --- a/chrome/app/chrome_crash_reporter_client_win.cc
|
| +++ b/chrome/app/chrome_crash_reporter_client_win.cc
|
| @@ -254,7 +254,10 @@ void ChromeCrashReporterClient::InitializeCrashReportingForProcess() {
|
|
|
| std::wstring process_type = install_static::GetSwitchValueFromCommandLine(
|
| ::GetCommandLine(), install_static::kProcessType);
|
| - if (process_type != install_static::kCrashpadHandler) {
|
| + // Don't set up Crashpad crash reporting in the Crashpad handler itself, nor
|
| + // in the fallback crash handler for the Crashpad handler process.
|
| + if (process_type != install_static::kCrashpadHandler &&
|
| + process_type != install_static::kFallbackHandler) {
|
| crash_reporter::SetCrashReporterClient(instance);
|
| crash_reporter::InitializeCrashpadWithEmbeddedHandler(
|
| process_type.empty(), install_static::UTF16ToUTF8(process_type));
|
|
|