Index: components/nacl/browser/nacl_process_host.cc |
diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc |
index eae244b46c386212b76cbfae106e5aa38bbad23a..d2b1ff1459c009505577f7e7474a21458033a912 100644 |
--- a/components/nacl/browser/nacl_process_host.cc |
+++ b/components/nacl/browser/nacl_process_host.cc |
@@ -341,8 +341,15 @@ void NaClProcessHost::EarlyStartup() { |
UMA_HISTOGRAM_BOOLEAN( |
"NaCl.enable-nacl-debug", |
cmd->HasSwitch(switches::kEnableNaClDebug)); |
- NaClBrowser::GetDelegate()->SetDebugPatterns( |
- cmd->GetSwitchValueASCII(switches::kNaClDebugMask)); |
+ std::string nacl_debug_mask = |
+ cmd->GetSwitchValueASCII(switches::kNaClDebugMask); |
+ // By default, exclude debugging SSH and the PNaCl translator. |
+ // about::flags only allows empty flags as the default, so replace |
+ // the empty setting with the default. To debug all apps, use a wild-card. |
+ if (nacl_debug_mask.empty()) { |
+ nacl_debug_mask = "!*://*/*ssh_client.nmf,chrome://pnacl-translator/*"; |
+ } |
+ NaClBrowser::GetDelegate()->SetDebugPatterns(nacl_debug_mask); |
} |
void NaClProcessHost::Launch( |