From 0089e561bbbacde67df51ee7c9a6e3cf6c3cbfcf Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Fri, 5 Mar 2010 21:19:26 +0000 Subject: 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 --- chrome/app/chrome_main_uitest.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'chrome/app/chrome_main_uitest.cc') diff --git a/chrome/app/chrome_main_uitest.cc b/chrome/app/chrome_main_uitest.cc index 7bd027b..ab79407f 100644 --- a/chrome/app/chrome_main_uitest.cc +++ b/chrome/app/chrome_main_uitest.cc @@ -18,11 +18,7 @@ TEST_F(ChromeMainTest, AppLaunch) { if (UITest::in_process_renderer()) { EXPECT_EQ(1, UITest::GetBrowserProcessCount()); } else { -#if defined(OS_CHROMEOS) - // On Chromeos we'll have five processes: browser, renderer, app launcher, - // zygote and sandbox helper. - EXPECT_EQ(5, UITest::GetBrowserProcessCount()); -#elif defined(OS_LINUX) +#if defined(OS_LINUX) // On Linux we'll have four processes: browser, renderer, zygote and // sandbox helper. EXPECT_EQ(4, UITest::GetBrowserProcessCount()); -- cgit v1.1