Zygote: create variables for magic fd numbers

content/zygote/zygote_linux.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/zygote/zygote_linux.h"
 
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ skipping 17 matching lines @@
 #include "content/public/common/zygote_fork_delegate_linux.h"
 #include "content/common/sandbox_methods_linux.h"
 #include "content/common/zygote_commands_linux.h"
 
 // See http://code.google.com/p/chromium/wiki/LinuxZygote
 
 namespace content {
 
 namespace {
 
-const int kZygoteIdDescriptor = 7;
-
 // NOP function. See below where this handler is installed.
 void SIGCHLDHandler(int signal) {
 }
 
 }  // namespace
 
 Zygote::Zygote(int sandbox_flags,
                ZygoteForkDelegate* helper,
                int proc_fd_for_seccomp)
     : sandbox_flags_(sandbox_flags),
@@ skipping 356 matching lines @@
       } else {
         PLOG(ERROR) << "openat(/proc/self/maps)";
       }
       close(proc_fd_for_seccomp_);
       proc_fd_for_seccomp_ = -1;
     }
 #endif
 
     close(kBrowserDescriptor);  // Our socket from the browser.
     if (UsingSUIDSandbox())
-      close(kZygoteIdDescriptor);  // Another socket from the browser.
+      close(content::kZygoteIdFd);  // Another socket from the browser.

[brettw, 2012/05/21 17:52:05]

You're already in content, so remove "content::".

     base::GlobalDescriptors::GetInstance()->Reset(mapping);
 
 #if defined(CHROMIUM_SELINUX)
     SELinuxTransitionToTypeOrDie("chromium_renderer_t");
 #endif
 
     // Reset the process-wide command line to our new command line.
     CommandLine::Reset();
     CommandLine::Init(0, NULL);
     CommandLine::ForCurrentProcess()->InitFromArgv(args);
@@ skipping 52 matching lines @@
                                     PickleIterator iter) {
   if (HANDLE_EINTR(write(fd, &sandbox_flags_, sizeof(sandbox_flags_))) !=
                    sizeof(sandbox_flags_)) {
     PLOG(ERROR) << "write";
   }
 
   return false;
 }
 
 }  // namespace content