| Index: chrome/common/logging_chrome_uitest.cc
|
| diff --git a/chrome/common/logging_chrome_uitest.cc b/chrome/common/logging_chrome_uitest.cc
|
| index 5d4236afe31497d5f6a161793a59a0cbc09ad8f1..e66bc49823c2356e3c027474b207b63a4e3b6253 100644
|
| --- a/chrome/common/logging_chrome_uitest.cc
|
| +++ b/chrome/common/logging_chrome_uitest.cc
|
| @@ -74,6 +74,14 @@ TEST_F(ChromeLoggingTest, EnvironmentLogFileName) {
|
| #define EXPECTED_ASSERT_CRASHES 1
|
| #endif
|
|
|
| +// Touch build will start an extra renderer process (the extension process)
|
| +// for the virtual keyboard.
|
| +#if defined(TOUCH_UI)
|
| +#define EXPECTED_ASSERT_ERRORS 2
|
| +#else
|
| +#define EXPECTED_ASSERT_ERRORS 1
|
| +#endif
|
| +
|
| #if !defined(NDEBUG) // We don't have assertions in release builds.
|
| // Tests whether we correctly fail on browser assertions during tests.
|
| class AssertionTest : public UITest {
|
| @@ -103,7 +111,7 @@ TEST_F(AssertionTest, Assertion) {
|
| expected_errors_ = 0;
|
| expected_crashes_ = 0;
|
| } else {
|
| - expected_errors_ = 1;
|
| + expected_errors_ = EXPECTED_ASSERT_ERRORS;
|
| expected_crashes_ = EXPECTED_ASSERT_CRASHES;
|
| }
|
| }
|
| @@ -138,7 +146,7 @@ TEST_F(CheckFalseTest, CheckFails) {
|
| expected_errors_ = 0;
|
| expected_crashes_ = 0;
|
| } else {
|
| - expected_errors_ = 1;
|
| + expected_errors_ = EXPECTED_ASSERT_ERRORS;
|
| expected_crashes_ = EXPECTED_ASSERT_CRASHES;
|
| }
|
| }
|
|
|