Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index f1ee07ecd399d85e35d77bd4b31cbf65cd6fd835..7e226a9a8dce6b46656042c604c63334380b8e35 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -2558,9 +2558,8 @@ base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType( |
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 |
@@ -2570,8 +2569,7 @@ void ChromeContentBrowserClient::PreSpawnRenderer( |
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 brace
Will Harris
2015/11/10 17:45:38
style guide says no braces... so they really shoul
rickyz (no longer on Chrome)
2015/11/10 23:18:01
The style guide actually allows both here: https:/
|
} |
// Renderers need to send named pipe handles and shared memory |
@@ -2580,9 +2578,10 @@ void ChromeContentBrowserClient::PreSpawnRenderer( |
sandbox::TargetPolicy::HANDLES_DUP_ANY, |
L"File"); |
if (result != sandbox::SBOX_ALL_OK) { |
- *success = false; |
- return; |
+ return false; |
} |
+ |
+ return true; |
} |
#endif |