diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-04 21:52:38 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-04 21:52:38 +0000 |
| commit | cfe8fd1fe634cb63142aed136284a78f2f257965 (patch) | |
| tree | a00d60640f21f4e4c377f48b57e6cc755520963e /chrome/app | |
| parent | 9c551f47036fa0d170a3c259882f0d7fecd9f331 (diff) | |
| download | chromium_src-cfe8fd1fe634cb63142aed136284a78f2f257965.zip chromium_src-cfe8fd1fe634cb63142aed136284a78f2f257965.tar.gz chromium_src-cfe8fd1fe634cb63142aed136284a78f2f257965.tar.bz2 | |
ui_tests fix
BUG=none
TEST=ui_tests should cycle green
Review URL: http://codereview.chromium.org/669093
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_main_uitest.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/app/chrome_main_uitest.cc b/chrome/app/chrome_main_uitest.cc index ab79407f..5fc6992 100644 --- a/chrome/app/chrome_main_uitest.cc +++ b/chrome/app/chrome_main_uitest.cc @@ -18,7 +18,11 @@ TEST_F(ChromeMainTest, AppLaunch) { if (UITest::in_process_renderer()) { EXPECT_EQ(1, UITest::GetBrowserProcessCount()); } else { -#if defined(OS_LINUX) +#if defined(OS_CHROMEOS) + // On Linux we'll have five processes: browser, renderer, app launcher, + // zygote and sandbox helper. + EXPECT_EQ(5, UITest::GetBrowserProcessCount()); +#elif defined(OS_LINUX) // On Linux we'll have four processes: browser, renderer, zygote and // sandbox helper. EXPECT_EQ(4, UITest::GetBrowserProcessCount()); |