Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5321)

Unified Diff: chrome/common/logging_chrome_uitest.cc

Issue 7053019: Fix the failed AssertionTest and CheckFalseTest for touch build (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: addressing some comments Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698