diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 04:02:56 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 04:02:56 +0000 |
| commit | 244932d545ce1bea5e1724d3a77c5064fa567eb2 (patch) | |
| tree | aaed157a5e258ce1accda2c2b9618c64d8180010 /content/browser/renderer_host/render_sandbox_host_linux.cc | |
| parent | 9da582be89b7c9ab891383c6d6c26e370c7f579c (diff) | |
| download | chromium_src-244932d545ce1bea5e1724d3a77c5064fa567eb2.zip chromium_src-244932d545ce1bea5e1724d3a77c5064fa567eb2.tar.gz chromium_src-244932d545ce1bea5e1724d3a77c5064fa567eb2.tar.bz2 | |
Do not spawn a thread in browser/interactive ui tests before spawning sandbox host process
* Introduced DBThreadManager::SetInstanceForTesting to specify the instance to be used when DBThreadManager::Initialize is called in the browser setup rocess.
* Temporarily stop the thread in EmbeddedTestServer to fork/exec sandbox host process properly.
BUG=322732
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/83633004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238554 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/render_sandbox_host_linux.cc')
| -rw-r--r-- | content/browser/renderer_host/render_sandbox_host_linux.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/content/browser/renderer_host/render_sandbox_host_linux.cc b/content/browser/renderer_host/render_sandbox_host_linux.cc index a018043..d17b1ca 100644 --- a/content/browser/renderer_host/render_sandbox_host_linux.cc +++ b/content/browser/renderer_host/render_sandbox_host_linux.cc @@ -709,10 +709,9 @@ void RenderSandboxHostLinux::Init(const std::string& sandbox_path) { childs_lifeline_fd_ = pipefds[1]; // We need to be monothreaded before we fork(). -#if !defined(TOOLKIT_GTK) && !defined(OS_CHROMEOS) +#if !defined(TOOLKIT_GTK) // Exclude gtk port as TestSuite in base/tests/test_suite.cc is calling // gtk_init. - // Exclude ChromeOS because KioskTest spawns EmbeddedTestServer. // TODO(oshima): Remove ifdef when above issues are resolved. DCHECK_EQ(1, base::GetNumberOfThreads(base::GetCurrentProcessHandle())); #endif |