Revert 149692 - Create a LinuxSandbox class.

r149692 broke ChromiumOS (tegra2) build.

The LinuxSandbox class aims to become the central place for Linux
sandboxing inside content/.

For now, this refactors mostly code from the Zygote.

BUG=
NOTRY=true


Review URL: https://chromiumcodereview.appspot.com/10826093

TBR=jln@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10837081

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

3 files changed, 3 insertions, 19 deletions

diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc
index 4f62d09..749d2d0 100644
--- a/sandbox/linux/suid/client/setuid_sandbox_client.cc
+++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc
@@ -103,9 +103,8 @@ SetuidSandboxClient* SetuidSandboxClient::Create() {
   return sandbox_client;
 }
 
-SetuidSandboxClient::SetuidSandboxClient()
-    : env_(NULL),
-      sandboxed_(false) {
+SetuidSandboxClient::SetuidSandboxClient() {
+  env_ = NULL;
 }
 
 SetuidSandboxClient::~SetuidSandboxClient() {
@@ -143,10 +142,6 @@ bool SetuidSandboxClient::ChrootMe() {
     LOG(ERROR) << "Error code reply from chroot helper";
     return false;
   }
-
-  // We now consider ourselves "fully sandboxed" as far as the
-  // setuid sandbox is concerned.
-  sandboxed_ = true;
   return true;
 }
 
@@ -166,10 +161,6 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const {
   return env_->HasVar(kSandboxNETNSEnvironmentVarName);
 }
 
-bool SetuidSandboxClient::IsSandboxed() const {
-  return sandboxed_;
-}
-
 void SetuidSandboxClient::SetupLaunchEnvironment() {
   SaveSUIDUnsafeEnvironmentVariables(env_);
   SetSandboxAPIEnvironmentVariable(env_);
diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.h b/sandbox/linux/suid/client/setuid_sandbox_client.h
index da77ce0..afbde0a 100644
--- a/sandbox/linux/suid/client/setuid_sandbox_client.h
+++ b/sandbox/linux/suid/client/setuid_sandbox_client.h
@@ -6,8 +6,7 @@
 #define SANDBOX_LINUX_SUID_SETUID_SANDBOX_CLIENT_H_
 
 #include "base/basictypes.h"
-
-namespace base { class Environment; }
+#include "base/environment.h"
 
 namespace sandbox {
 
@@ -39,8 +38,6 @@ class SetuidSandboxClient {
   bool IsInNewPIDNamespace() const;
   // Did the setuid helper create a new network namespace ?
   bool IsInNewNETNamespace() const;
-  // Are we done and fully sandboxed ?
-  bool IsSandboxed() const;
 
   // Set-up the environment. This should be done prior to launching the setuid
   // helper.
@@ -49,7 +46,6 @@ class SetuidSandboxClient {
  private:
   // Holds the environment. Will never be NULL.
   base::Environment* env_;
-  bool sandboxed_;
   DISALLOW_IMPLICIT_CONSTRUCTORS(SetuidSandboxClient);
 };
 
diff --git a/sandbox/linux/suid/client/setuid_sandbox_client_unittest.cc b/sandbox/linux/suid/client/setuid_sandbox_client_unittest.cc
index 764ccb1..59b02eb 100644
--- a/sandbox/linux/suid/client/setuid_sandbox_client_unittest.cc
+++ b/sandbox/linux/suid/client/setuid_sandbox_client_unittest.cc
@@ -73,9 +73,6 @@ TEST(SetuidSandboxClient, SandboxedClientAPI) {
   EXPECT_TRUE(env->SetVar(kSandboxEnvironmentApiProvides,
               base::IntToString(kSUIDSandboxApiNumber + 1)));
   EXPECT_FALSE(sandbox_client->IsSuidSandboxUpToDate());
-  // We didn't go through the actual sandboxing mechanism as it is
-  // very hard in a unit test.
-  EXPECT_FALSE(sandbox_client->IsSandboxed());
 }
 
 }  // namespace sandbox