summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-05 21:19:26 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-05 21:19:26 +0000
commit0089e561bbbacde67df51ee7c9a6e3cf6c3cbfcf (patch)
tree1876d790c0b9c461ea369708c7d9e7943f2855db /chrome/worker
parentf9fd6bf3ad3b321743c91dbff12acb67a789fbe7 (diff)
downloadchromium_src-0089e561bbbacde67df51ee7c9a6e3cf6c3cbfcf.zip
chromium_src-0089e561bbbacde67df51ee7c9a6e3cf6c3cbfcf.tar.gz
chromium_src-0089e561bbbacde67df51ee7c9a6e3cf6c3cbfcf.tar.bz2
Lazy AppLauncher creation to make tests stable.
There seems to be a timing issue in renderer deletion and io thread deletion, and the resource that has to be deleted before io thread are not deleted by the time io thread is deleted. Since this will soon be changed, i just chagned this to be created on demand for now. This also reverts commit dd6c4ab11002a308bf8eede36bb632e95d3a1382. TBR=sky@chromium.org BUG=32641 TEST=none Review URL: http://codereview.chromium.org/669196 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40780 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/worker_uitest.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 7e4eb2e..1eedc25 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -59,11 +59,7 @@ class WorkerTest : public UILayoutTest {
// The 1 is for the browser process.
int number_of_processes = 1 + workers +
(UITest::in_process_renderer() ? 0 : tabs);
-#if defined(OS_CHROMEOS)
- // On Chromeos, we also have a zygote process, a sandbox host process
- // and app launcher's renderer.
- number_of_processes += 3;
-#elif defined(OS_LINUX)
+#if defined(OS_LINUX)
// On Linux, we also have a zygote process and a sandbox host process.
number_of_processes += 2;
#endif