Get rid of the last NaCl mention in the content sandbox code. Make Windows callers of ChildProcessLauncher specify whether the process should be sandboxed or not through the SandboxedProcessLauncherDelegate interface.

BUG=191682
Review URL: https://codereview.chromium.org/12886041

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

1 files changed, 15 insertions, 2 deletions

diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc
index 0c03973..2364efc4 100644
--- a/content/browser/ppapi_plugin_process_host.cc
+++ b/content/browser/ppapi_plugin_process_host.cc
@@ -39,11 +39,19 @@ namespace content {
 class PpapiPluginSandboxedProcessLauncherDelegate
     : public content::SandboxedProcessLauncherDelegate {
  public:
-  PpapiPluginSandboxedProcessLauncherDelegate() {}
+  explicit PpapiPluginSandboxedProcessLauncherDelegate(bool is_broker)
+      : is_broker_(is_broker) {}
   virtual ~PpapiPluginSandboxedProcessLauncherDelegate() {}
 
+  virtual void ShouldSandbox(bool* in_sandbox) OVERRIDE {
+    if (is_broker_)
+      *in_sandbox = false;
+  }
+
   virtual void PreSpawnTarget(sandbox::TargetPolicy* policy,
                               bool* success) {
+    if (is_broker_)
+      return;
     // The Pepper process as locked-down as a renderer execpt that it can
     // create the server side of chrome pipes.
     sandbox::ResultCode result;
@@ -52,6 +60,11 @@ class PpapiPluginSandboxedProcessLauncherDelegate
                              L"\\\\.\\pipe\\chrome.*");
     *success = (result == sandbox::SBOX_ALL_OK);
   }
+
+ private:
+  bool is_broker_;
+
+  DISALLOW_COPY_AND_ASSIGN(PpapiPluginSandboxedProcessLauncherDelegate);
 };
 #endif  // OS_WIN
 
@@ -309,7 +322,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginInfo& info) {
 #endif  // OS_POSIX
   process_->Launch(
 #if defined(OS_WIN)
-      is_broker_ ? NULL : new PpapiPluginSandboxedProcessLauncherDelegate,
+      new PpapiPluginSandboxedProcessLauncherDelegate(is_broker_),
 #elif defined(OS_POSIX)
       use_zygote,
       base::EnvironmentVector(),