| Index: chrome/browser/nacl_host/nacl_process_host.cc
|
| ===================================================================
|
| --- chrome/browser/nacl_host/nacl_process_host.cc (revision 126069)
|
| +++ chrome/browser/nacl_host/nacl_process_host.cc (working copy)
|
| @@ -279,7 +279,13 @@
|
| }
|
| #if defined(OS_WIN)
|
| if (RunningOnWOW64()) {
|
| - NaClBrokerService::GetInstance()->OnLoaderDied();
|
| + // If the nacl-gdb switch is not empty, the NaCl loader has been launched
|
| + // without the broker and so we shouldn't inform the broker about
|
| + // the loader termination.
|
| + if (CommandLine::ForCurrentProcess()->GetSwitchValuePath(
|
| + switches::kNaClGdb).empty()) {
|
| + NaClBrokerService::GetInstance()->OnLoaderDied();
|
| + }
|
| } else {
|
| debug_context_->SetChildProcessHost(NULL);
|
| }
|
| @@ -599,7 +605,7 @@
|
| if (base::OpenProcessHandleWithAccess(
|
| peer_pid,
|
| base::kProcessAccessDuplicateHandle |
|
| - base::kProcessAccessQueryLimitedInfomation |
|
| + base::kProcessAccessQueryInformation |
|
| base::kProcessAccessWaitForTermination,
|
| &process)) {
|
| process_->SetHandle(process);
|
|
|