diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 20:12:26 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 20:12:26 +0000 |
| commit | 1591fc526d13054767eef5afe3b208cd1b6e19e9 (patch) | |
| tree | c8c95de2d6c80b033f4e354a8cf93daa5fee9fbb /chrome/service/service_main.cc | |
| parent | da29adf6cb81b8607d37483cc575bb6abc2b0eb5 (diff) | |
| download | chromium_src-1591fc526d13054767eef5afe3b208cd1b6e19e9.zip chromium_src-1591fc526d13054767eef5afe3b208cd1b6e19e9.tar.gz chromium_src-1591fc526d13054767eef5afe3b208cd1b6e19e9.tar.bz2 | |
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
Diffstat (limited to 'chrome/service/service_main.cc')
| -rw-r--r-- | chrome/service/service_main.cc | 7 |
1 files changed, 2 insertions, 5 deletions
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; |