4 files changed, 2 insertions, 59 deletions
diff --git a/content/common/content_switches.cc b/content/common/content_switches.cc
index 3e22610..7033c7f 100644
--- a/content/common/content_switches.cc
+++ b/content/common/content_switches.cc
@@ -274,10 +274,6 @@ const char kLogPluginMessages[]             = "log-plugin-messages";
 // (used for launching NaCl loader processes on 64-bit Windows).
 const char kNaClBrokerProcess[]             = "nacl-broker";
 
-// Enables experimental lightweight Native Client launcher for Linux
-// Value is the path to the helper binary.
-const char kNaClLinuxHelper[]               = "nacl-linux-helper";
-
 // Causes the process to run as a NativeClient loader.
 const char kNaClLoaderProcess[]             = "nacl-loader";
 
diff --git a/content/common/content_switches.h b/content/common/content_switches.h
index 1b2384f..f48e69a 100644
--- a/content/common/content_switches.h
+++ b/content/common/content_switches.h
@@ -92,10 +92,6 @@ extern const char kLogPluginMessages[];
 // TODO(jam): this doesn't belong in content.
 extern const char kNaClBrokerProcess[];
 extern const char kNaClLoaderProcess[];
-// TODO(bradchen): remove kNaClLinuxHelper switch.
-// This switch enables the experimental lightweight nacl_helper for Linux.
-// It will be going away soon, when the helper is enabled permanently.
-extern const char kNaClLinuxHelper[];
 extern const char kNoDisplayingInsecureContent[];
 extern const char kNoJsRandomness[];
 extern const char kNoReferrers[];
diff --git a/content/common/sandbox_methods_linux.h b/content/common/sandbox_methods_linux.h
index f048ad8..02287f6d 100644
--- a/content/common/sandbox_methods_linux.h
+++ b/content/common/sandbox_methods_linux.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
@@ -7,7 +7,7 @@
 #pragma once
 
 // This is a list of sandbox IPC methods which the renderer may send to the
-// sandbox host. See http://code.google.com/p/chromium/wiki/LinuxSandboxIPC
+// sandbox host. See http://code.google.com/p/chromium/LinuxSandboxIPC
 // This isn't the full list, values < 32 are reserved for methods called from
 // Skia.
 class LinuxSandbox {
diff --git a/content/common/zygote_fork_delegate_linux.h b/content/common/zygote_fork_delegate_linux.h
deleted file mode 100644
index 26dfbc9..0000000
--- a/content/common/zygote_fork_delegate_linux.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) 2011 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.
-
-#ifndef CONTENT_COMMON_ZYGOTE_FORK_DELEGATE_LINUX_H_
-#define CONTENT_COMMON_ZYGOTE_FORK_DELEGATE_LINUX_H_
-#pragma once
-
-#include <unistd.h>
-
-#include <string>
-#include <vector>
-
-#include "base/basictypes.h"
-
-// The ZygoteForkDelegate allows the Chrome Linux zygote to delegate
-// fork operations to another class that knows how to do some
-// specialized version of fork.
-class ZygoteForkDelegate {
- public:
-  // A ZygoteForkDelegate is created during Chrome linux zygote
-  // initialization, and provides "fork()" functionality with
-  // as an alternative to forking the zygote. A new delegate is
-  // passed in as an argument to ZygoteMain().
-  ZygoteForkDelegate() {}
-  virtual ~ZygoteForkDelegate() {}
-
-  // Initialization happens in the zygote after it has been
-  // started by ZygoteMain.
-  virtual void Init(bool sandboxed,
-                    int browserdesc,
-                    int sandboxdesc) = 0;
-
-  // Returns 'true' if the delegate would like to handle a given
-  // fork request. Otherwise returns false.
-  virtual bool CanHelp(const std::string& process_type) = 0;
-
-  // Delegate forks, returning a -1 on failure. Outside the
-  // suid sandbox, Fork() returns the Linux process ID. Inside
-  // the sandbox, returns a positive integer, with PID discovery
-  // handled by the sandbox.
-  virtual pid_t Fork(const std::vector<int>& fds) = 0;
-
-  // After a successful for, signal the child to indicate that
-  // the child's PID has been received. Also communicate the
-  // channel switch as a part of acknowledgement message.
-  virtual bool AckChild(int fd, const std::string& channel_switch) = 0;
-};
-#endif  // CONTENT_COMMON_ZYGOTE_FORK_DELEGATE_LINUX_H_