Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index 380aa2af72c5514cb2d7b29bf21dbac1b9d9d6fa..733e6df3c3022a012e81f281e4d3790ad90ddcb1 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -1343,6 +1343,11 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( |
if (browser_command_line.HasSwitch(switches::kChromeFrame)) |
command_line->AppendSwitch(switches::kChromeFrame); |
+#if defined(ENABLE_IPC_FUZZER) |
+ command_line->CopySwitchFrom(browser_command_line, |
+ switches::kIpcFuzzerTestcase); |
+#endif |
+ |
if (process_type == switches::kRendererProcess) { |
base::FilePath user_data_dir = |
browser_command_line.GetSwitchValuePath(switches::kUserDataDir); |
@@ -2432,6 +2437,16 @@ void ChromeContentBrowserClient::GetAdditionalFileSystemBackends( |
additional_backends->push_back(new sync_file_system::SyncFileSystemBackend()); |
} |
+bool ChromeContentBrowserClient::ShouldKillChildProcessOnBadMessage() { |
+#if defined(ENABLE_IPC_FUZZER) |
+ // Don't kill the IPC fuzzer process, if it sends a bad message. |
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kIpcFuzzerTestcase)) |
+ return false; |
+#endif |
+ |
+ return true; |
+} |
+ |
#if defined(OS_POSIX) && !defined(OS_MACOSX) |
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( |
const CommandLine& command_line, |