From 1591fc526d13054767eef5afe3b208cd1b6e19e9 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Mon, 4 Jun 2012 20:12:26 +0000 Subject: Get rid of internal content includes for sandbox code from chrome. BUG=98716 Review URL: https://chromiumcodereview.appspot.com/10512016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140357 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/service/service_main.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'chrome/service/service_main.cc') diff --git a/chrome/service/service_main.cc b/chrome/service/service_main.cc index d85134a..c17ded3 100644 --- a/chrome/service/service_main.cc +++ b/chrome/service/service_main.cc @@ -11,7 +11,7 @@ #include "net/url_request/url_request.h" #if defined(OS_WIN) -#include "content/common/sandbox_policy.h" +#include "content/public/common/sandbox_init.h" #include "sandbox/src/sandbox_types.h" #elif defined(OS_MACOSX) #include "chrome/service/chrome_service_application_mac.h" @@ -44,10 +44,7 @@ int ServiceProcessMain(const content::MainFunctionParams& parameters) { return 0; #if defined(OS_WIN) - sandbox::BrokerServices* broker_services = - parameters.sandbox_info->broker_services; - if (broker_services) - sandbox::InitBrokerServices(broker_services); + content::InitializeSandbox(parameters.sandbox_info); #endif // defined(OS_WIN) ServiceProcess service_process; -- cgit v1.1