Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Unified Diff: chrome/browser/nacl_host/nacl_process_host.cc

Issue 9662055: Test for --nacl-gdb functionality. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/nacl_host/test/mock_nacl_gdb.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/nacl_host/nacl_process_host.cc
===================================================================
--- chrome/browser/nacl_host/nacl_process_host.cc (revision 127348)
+++ 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);
« no previous file with comments | « no previous file | chrome/browser/nacl_host/test/mock_nacl_gdb.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698