From 1c5fdc4aa3b54cbc3a103e26af918188afbe8b66 Mon Sep 17 00:00:00 2001 From: "jeremy@chromium.org" Date: Thu, 5 Nov 2009 13:15:24 +0000 Subject: TBR:mark git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31090 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/renderer/renderer_main_platform_delegate_mac.mm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to '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 014a7d2..4a5475e 100644 --- a/chrome/renderer/renderer_main_platform_delegate_mac.mm +++ b/chrome/renderer/renderer_main_platform_delegate_mac.mm @@ -6,8 +6,6 @@ #import -#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" @@ -26,6 +24,9 @@ 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) @@ -46,10 +47,7 @@ bool RendererMainPlatformDelegate::InitSandboxTests(bool no_sandbox) { } bool RendererMainPlatformDelegate::EnableSandbox() { - CommandLine* parsed_command_line = CommandLine::ForCurrentProcess(); - SandboxInitWrapper sandbox_wrapper; - return sandbox_wrapper.InitializeSandbox(*parsed_command_line, - switches::kRendererProcess); + return sandbox::EnableSandbox(); } void RendererMainPlatformDelegate::RunSandboxTests() { -- cgit v1.1