NaCl: Remove unused "sandboxed_" field and argument from NaClForkDelegate

BUG=none
TEST=any NaCl test on Linux

Review URL: https://codereview.chromium.org/11819022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175901 0039d316-1c4b-4281-b951-d872f2087c98

chrome/app/nacl_fork_delegate_linux.cc

@@ -26,7 +26,6 @@
 
 NaClForkDelegate::NaClForkDelegate()
     : status_(kNaClHelperUnused),
-      sandboxed_(false),
       fd_(-1) {}
 
 // Note these need to match up with their counterparts in nacl_helper_linux.c
@@ -35,13 +34,10 @@ const char kNaClHelperReservedAtZero[] =
     "--reserved_at_zero=0xXXXXXXXXXXXXXXXX";
 const char kNaClHelperRDebug[] = "--r_debug=0xXXXXXXXXXXXXXXXX";
 
-void NaClForkDelegate::Init(const bool sandboxed,
-                            const int browserdesc,
-                            const int sandboxdesc) {
+void NaClForkDelegate::Init(const int browserdesc, const int sandboxdesc) {
   VLOG(1) << "NaClForkDelegate::Init()";
   int fds[2];
 
-  sandboxed_ = sandboxed;
   // Confirm a couple hard-wired assumptions.
   // The NaCl constants are from chrome/nacl/nacl_linux_helper.h
   DCHECK(kNaClBrowserDescriptor == browserdesc);

chrome/app/nacl_fork_delegate_linux.h

@@ -22,9 +22,7 @@ class NaClForkDelegate : public content::ZygoteForkDelegate {
   NaClForkDelegate();
   virtual ~NaClForkDelegate();
 
-  virtual void Init(bool sandboxed,
-                    int browserdesc,
-                    int sandboxdesc) OVERRIDE;
+  virtual void Init(int browserdesc, int sandboxdesc) OVERRIDE;
   virtual void InitialUMA(std::string* uma_name,
                           int* uma_sample,
                           int* uma_boundary_value) OVERRIDE;
@@ -49,7 +47,6 @@ class NaClForkDelegate : public content::ZygoteForkDelegate {
   };
 
   NaClHelperStatus status_;
-  bool sandboxed_;
   int fd_;
 };
 

content/public/common/zygote_fork_delegate_linux.h

@@ -25,9 +25,7 @@ class ZygoteForkDelegate {
 
   // Initialization happens in the zygote after it has been
   // started by ZygoteMain.
-  virtual void Init(bool sandboxed,
-                    int browserdesc,
-                    int sandboxdesc) = 0;
+  virtual void Init(int browserdesc, int sandboxdesc) = 0;
 
   // After Init, supply a UMA_HISTOGRAM_ENUMERATION the delegate
   // would like to supply on the first fork.

content/zygote/zygote_main_linux.cc

@@ -463,8 +463,7 @@ bool ZygoteMain(const MainFunctionParams& params,
 
   if (forkdelegate != NULL) {
     VLOG(1) << "ZygoteMain: initializing fork delegate";
-    forkdelegate->Init(setuid_sandbox->IsSuidSandboxChild(),
-                       Zygote::kBrowserDescriptor,
+    forkdelegate->Init(Zygote::kBrowserDescriptor,
                        Zygote::kMagicSandboxIPCDescriptor);
   } else {
     VLOG(1) << "ZygoteMain: fork delegate is NULL";