Refactor configuration of sandboxes - first steps

components/nacl/browser/nacl_broker_host_win.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 "components/nacl/browser/nacl_broker_host_win.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "components/nacl/browser/nacl_broker_service_win.h"
@@ skipping 10 matching lines @@
 #include "ipc/ipc_switches.h"
 
 namespace {
 // NOTE: changes to this class need to be reviewed by the security team.
 class NaClBrokerSandboxedProcessLauncherDelegate
     : public content::SandboxedProcessLauncherDelegate {
  public:
   NaClBrokerSandboxedProcessLauncherDelegate() {}
   virtual ~NaClBrokerSandboxedProcessLauncherDelegate() {}
 
-  virtual void ShouldSandbox(bool* in_sandbox) OVERRIDE {
-    *in_sandbox = false;
+  virtual bool ShouldSandbox() OVERRIDE {
+    return false;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NaClBrokerSandboxedProcessLauncherDelegate);
 };
 }  // namespace
 
 namespace nacl {
 
 NaClBrokerHost::NaClBrokerHost() : is_terminating_(false) {
@@ skipping 18 matching lines @@
   CommandLine* cmd_line = new CommandLine(nacl_path);
   CopyNaClCommandLineArguments(cmd_line);
 
   cmd_line->AppendSwitchASCII(switches::kProcessType,
                               switches::kNaClBrokerProcess);
   cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id);
   if (NaClBrowser::GetDelegate()->DialogsAreSuppressed())
     cmd_line->AppendSwitch(switches::kNoErrorDialogs);
 
   process_->Launch(new NaClBrokerSandboxedProcessLauncherDelegate,
-                   false,
                    cmd_line);
   return true;
 }
 
 bool NaClBrokerHost::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(NaClBrokerHost, msg)
     IPC_MESSAGE_HANDLER(NaClProcessMsg_LoaderLaunched, OnLoaderLaunched)
     IPC_MESSAGE_HANDLER(NaClProcessMsg_DebugExceptionHandlerLaunched,
                         OnDebugExceptionHandlerLaunched)
@@ skipping 29 matching lines @@
   NaClBrokerService::GetInstance()->OnDebugExceptionHandlerLaunched(pid,
                                                                     success);
 }
 
 void NaClBrokerHost::StopBroker() {
   is_terminating_ = true;
   process_->Send(new NaClProcessMsg_StopBroker());
 }
 
 }  // namespace nacl