startup: move some browser startup code into BrowserMain

There was a block of code that was #ifdef LINUX right before
our call to BrowserMain().  We can instead put that code into
BrowserMain(), which knows how to delegate to multiple platforms.

TEST=should be just a refactoring change, all tests should still pass

Review URL: http://codereview.chromium.org/4579002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65892 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 29 deletions

diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc
index a0bcaea..cd6669f 100644
--- a/chrome/test/in_process_browser_test.cc
+++ b/chrome/test/in_process_browser_test.cc
@@ -47,29 +47,6 @@
 #include "chrome/browser/views/frame/browser_view.h"
 #endif
 
-#if defined(OS_LINUX)
-#include "base/environment.h"
-#include "base/singleton.h"
-#include "chrome/browser/renderer_host/render_sandbox_host_linux.h"
-#include "chrome/browser/zygote_host_linux.h"
-
-namespace {
-
-// A helper class to do Linux-only initialization only once per process.
-class LinuxHostInit {
- public:
-  LinuxHostInit() {
-    RenderSandboxHostLinux* shost = Singleton<RenderSandboxHostLinux>::get();
-    shost->Init("");
-    ZygoteHost* zhost = Singleton<ZygoteHost>::get();
-    zhost->Init("");
-  }
-  ~LinuxHostInit() {}
-};
-
-}  // namespace
-#endif
-
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #endif  // defined(OS_CHROMEOS)
@@ -243,12 +220,6 @@ void InProcessBrowserTest::SetUp() {
 #endif
   CHECK(PathService::Override(base::FILE_EXE, chrome_path));
 
-#if defined(OS_LINUX)
-  // Initialize the RenderSandbox and Zygote hosts. Apparently they get used
-  // for InProcessBrowserTest, and this is not the normal browser startup path.
-  Singleton<LinuxHostInit>::get();
-#endif
-
   BrowserMain(params);
   TearDownInProcessBrowserTestFixture();
 }