diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-29 03:44:44 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-29 03:44:44 +0000 |
commit | badf5cf5f14c65f6c799ef1fec77cde8351339c2 (patch) | |
tree | 83690887c035e4b457f00404f126f95ad1a90c06 /webkit/tools | |
parent | 8cc9738eff9c169487e8356947d88640659fc497 (diff) | |
download | chromium_src-badf5cf5f14c65f6c799ef1fec77cde8351339c2.zip chromium_src-badf5cf5f14c65f6c799ef1fec77cde8351339c2.tar.gz chromium_src-badf5cf5f14c65f6c799ef1fec77cde8351339c2.tar.bz2 |
Expose the sandbox related code through the content API. I did a bit of cleanup while I was doing this.
-got rid of SandboxInitWrapper, since I didn't see a need to expose given that we can just expose sandbox::SandboxInterfaceInfo
-got rid of the duplicated code to initialize the broker
-since I made MainFunctionParams only have the sandbox struct on Windows, I also made the mac specific auto release pool behind an ifdef as well. It seemed odd to make something so mac specific compile on all platforms to save some #ifdefs.
BUG=98716
Review URL: http://codereview.chromium.org/8414020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107863 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r-- | webkit/tools/test_shell/run_all_tests.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/run_all_tests.cc b/webkit/tools/test_shell/run_all_tests.cc index 8486362..176f8b9 100644 --- a/webkit/tools/test_shell/run_all_tests.cc +++ b/webkit/tools/test_shell/run_all_tests.cc @@ -13,7 +13,6 @@ #endif #include "base/command_line.h" -#include "base/mac/scoped_nsautorelease_pool.h" #include "base/message_loop.h" #include "base/process_util.h" #include "base/test/test_suite.h" @@ -28,6 +27,7 @@ #if defined(OS_MACOSX) #include "base/mac/mac_util.h" +#include "base/mac/scoped_nsautorelease_pool.h" #include "base/path_service.h" #endif @@ -106,7 +106,9 @@ class TestShellTestSuite : public base::TestSuite { }; int main(int argc, char** argv) { +#if defined(OS_MACOSX) base::mac::ScopedNSAutoreleasePool scoped_pool; +#endif TestShellPlatformDelegate::PreflightArgs(&argc, &argv); return TestShellTestSuite(argc, argv).Run(); |