Get rid of SandboxedProcessLauncherDelegate::PreSandbox.

chrome/browser/chrome_content_browser_client.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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 2540 matching lines @@
     case PROCESS_TYPE_NACL_BROKER:
       return base::string16();
 #endif
   }
 
   // Should never reach here.
   CHECK(0);
   return base::string16();
 }
 
-void ChromeContentBrowserClient::PreSpawnRenderer(
-    sandbox::TargetPolicy* policy,
-    bool* success) {
+bool ChromeContentBrowserClient::PreSpawnRenderer(
+    sandbox::TargetPolicy* policy) {
   // This code is duplicated in nacl_exe_win_64.cc.
   // Allow the server side of a pipe restricted to the "chrome.nacl."
   // namespace so that it cannot impersonate other system or other chrome
   // service pipes.
   sandbox::ResultCode result = policy->AddRule(
       sandbox::TargetPolicy::SUBSYS_NAMED_PIPES,
       sandbox::TargetPolicy::NAMEDPIPES_ALLOW_ANY,
       L"\\\\.\\pipe\\chrome.nacl.*");
   if (result != sandbox::SBOX_ALL_OK) {
-    *success = false;
-    return;
+    return false;

[Will Harris, 2015/11/06 19:26:37]

nit: no need for braces

[rickyz (no longer on Chrome), 2015/11/10 02:16:32]

How strongly do you feel about leaving these braces out? I often find them
convenient when I want to quickly add a LOG(ERROR) to every single failure check
in a function (though maybe the real solution is just to windbg better :-P)

[Will Harris, 2015/11/10 17:45:38]

style guide says no braces... so they really shouldn't be here. I am working on
adding better error codes to sandbox failures, if that helps :)

[rickyz (no longer on Chrome), 2015/11/10 23:18:01]

The style guide actually allows both here:
https://google.github.io/styleguide/cppguide.html#Conditionals, but happy to get
rid of them if that's the preferred style for this code.

   }
 
   // Renderers need to send named pipe handles and shared memory
   // segment handles to NaCl loader processes.
   result = policy->AddRule(sandbox::TargetPolicy::SUBSYS_HANDLES,
                            sandbox::TargetPolicy::HANDLES_DUP_ANY,
                            L"File");
   if (result != sandbox::SBOX_ALL_OK) {
-    *success = false;
-    return;
+    return false;
   }
+
+  return true;
 }
 #endif
 
 void ChromeContentBrowserClient::RegisterFrameMojoShellServices(
     content::ServiceRegistry* registry,
     content::RenderFrameHost* render_frame_host) {
 #if defined(OS_CHROMEOS)
   registry->AddService(
       base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create,
                  render_frame_host));
@@ skipping 173 matching lines @@
   if (channel <= kMaxDisableEncryptionChannel) {
     static const char* const kWebRtcDevSwitchNames[] = {
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)