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

Unified Diff: chrome/app/nacl_fork_delegate_linux.cc

Issue 11819021: NaCl: Clean up file descriptor setup in nacl_helper on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove kNaClBrowserDescriptor Created 7 years, 11 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
Index: chrome/app/nacl_fork_delegate_linux.cc
diff --git a/chrome/app/nacl_fork_delegate_linux.cc b/chrome/app/nacl_fork_delegate_linux.cc
index c4e6ff7b7a8507094ecef8bf191e1cadc7b7e87c..e76d30f3953661a9d93b567faf33f833a37f2a19 100644
--- a/chrome/app/nacl_fork_delegate_linux.cc
+++ b/chrome/app/nacl_fork_delegate_linux.cc
@@ -34,13 +34,12 @@ const char kNaClHelperReservedAtZero[] =
"--reserved_at_zero=0xXXXXXXXXXXXXXXXX";
const char kNaClHelperRDebug[] = "--r_debug=0xXXXXXXXXXXXXXXXX";
-void NaClForkDelegate::Init(const int browserdesc, const int sandboxdesc) {
+void NaClForkDelegate::Init(const int sandboxdesc) {
VLOG(1) << "NaClForkDelegate::Init()";
int fds[2];
- // Confirm a couple hard-wired assumptions.
- // The NaCl constants are from chrome/nacl/nacl_linux_helper.h
- DCHECK(kNaClBrowserDescriptor == browserdesc);
+ // Confirm a hard-wired assumption.
+ // The NaCl constant is from chrome/nacl/nacl_linux_helper.h
DCHECK(kNaClSandboxDescriptor == sandboxdesc);
CHECK(socketpair(PF_UNIX, SOCK_SEQPACKET, 0, fds) == 0);

Powered by Google App Engine
This is Rietveld 408576698