Index: chrome/renderer/renderer_main_platform_delegate_mac.mm |
diff --git a/chrome/renderer/renderer_main_platform_delegate_mac.mm b/chrome/renderer/renderer_main_platform_delegate_mac.mm |
index 4a5475e35365fd772ee56f5caba5876794901e4c..014a7d2be3225dc927938f51ee03fa74fbee5ead 100644 |
--- a/chrome/renderer/renderer_main_platform_delegate_mac.mm |
+++ b/chrome/renderer/renderer_main_platform_delegate_mac.mm |
@@ -6,6 +6,8 @@ |
#import <Cocoa/Cocoa.h> |
+#include "base/command_line.h" |
+#include "chrome/common/chrome_switches.h" |
#include "chrome/common/sandbox_mac.h" |
#include "third_party/WebKit/WebKit/mac/WebCoreSupport/WebSystemInterface.h" |
@@ -24,9 +26,6 @@ void RendererMainPlatformDelegate::PlatformInitialize() { |
// Load WebKit system interfaces. |
InitWebCoreSystemInterface(); |
- // Warmup APIs before turning on the Sandbox. |
- sandbox::SandboxWarmup(); |
- |
if (![NSThread isMultiThreaded]) { |
NSString* string = @""; |
[NSThread detachNewThreadSelector:@selector(length) |
@@ -47,7 +46,10 @@ bool RendererMainPlatformDelegate::InitSandboxTests(bool no_sandbox) { |
} |
bool RendererMainPlatformDelegate::EnableSandbox() { |
- return sandbox::EnableSandbox(); |
+ CommandLine* parsed_command_line = CommandLine::ForCurrentProcess(); |
+ SandboxInitWrapper sandbox_wrapper; |
+ return sandbox_wrapper.InitializeSandbox(*parsed_command_line, |
+ switches::kRendererProcess); |
} |
void RendererMainPlatformDelegate::RunSandboxTests() { |