Expose the sandbox related code through the content API. I did a bit of cleanup while I was doing...

chrome/browser/chrome_browser_main_unittest.cc

Index: chrome/browser/chrome_browser_main_unittest.cc
===================================================================
--- chrome/browser/chrome_browser_main_unittest.cc	(revision 107845)
+++ chrome/browser/chrome_browser_main_unittest.cc	(working copy)
@@ -12,7 +12,6 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "content/common/main_function_params.h"
-#include "content/common/sandbox_init_wrapper.h"
 #include "content/public/browser/content_browser_client.h"
 #include "net/socket/client_socket_pool_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -20,12 +19,8 @@
 class BrowserMainTest : public testing::Test {
  public:
   BrowserMainTest() : command_line_(CommandLine::NO_PROGRAM) {}
- protected:
-  virtual void SetUp() {
-    sandbox_init_wrapper_.reset(new SandboxInitWrapper());
-  }
 
-  scoped_ptr<SandboxInitWrapper> sandbox_init_wrapper_;
+ protected:
   TestingPrefService pref_service_;
   CommandLine command_line_;
 };
@@ -33,8 +28,7 @@
 TEST_F(BrowserMainTest, WarmConnectionFieldTrial_WarmestSocket) {
   command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "0");
 
-  scoped_ptr<MainFunctionParams> params(
-      new MainFunctionParams(command_line_, *sandbox_init_wrapper_, NULL));
+  scoped_ptr<MainFunctionParams> params(new MainFunctionParams(command_line_));
   ScopedVector<content::BrowserMainParts> bwv;
   content::GetContentClient()->browser()->CreateBrowserMainParts(
       *params, &(bwv.get()));
@@ -49,8 +43,7 @@
 }
 
 TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Random) {
-  scoped_ptr<MainFunctionParams> params(
-      new MainFunctionParams(command_line_, *sandbox_init_wrapper_, NULL));
+  scoped_ptr<MainFunctionParams> params(new MainFunctionParams(command_line_));
   ScopedVector<content::BrowserMainParts> bwv;
   content::GetContentClient()->browser()->CreateBrowserMainParts(
       *params, &(bwv.get()));
@@ -72,8 +65,7 @@
 TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Invalid) {
   command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "100");
 
-  scoped_ptr<MainFunctionParams> params(
-      new MainFunctionParams(command_line_, *sandbox_init_wrapper_, NULL));
+  scoped_ptr<MainFunctionParams> params(new MainFunctionParams(command_line_));
   // This test ends up launching a new process, and that doesn't initialize the
   // ContentClient interfaces.
   ScopedVector<content::BrowserMainParts> bwv;