Fix the failed AssertionTest and CheckFalseTest for touch build

chrome/common/logging_chrome_uitest.cc

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..ba7a247cd6369b940d0861d4b63edc91d711a52b 100644
--- a/chrome/common/logging_chrome_uitest.cc
+++ b/chrome/common/logging_chrome_uitest.cc
@@ -74,6 +74,13 @@ TEST_F(ChromeLoggingTest, EnvironmentLogFileName) {
 #define EXPECTED_ASSERT_CRASHES 1
 #endif
 
+// Touch build will start an extra renderer process (the extension process)

[sadrul, 2011/05/25 19:05:23]

" for the keyboard"

[Yufeng Shen (Slow to review), 2011/05/25 19:13:07]

Done.

+#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 +110,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;
   }
 }
@@ -131,6 +138,7 @@ class CheckFalseTest : public UITest {
 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243
 #define CheckFails DISABLED_CheckFails
 #endif
+

[sadrul, 2011/05/25 19:05:23]

-new line

[Yufeng Shen (Slow to review), 2011/05/25 19:13:07]

Done.

 // Launch the app in assertion test mode, then close the app.
 TEST_F(CheckFalseTest, CheckFails) {
   if (ProxyLauncher::in_process_renderer()) {
@@ -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;
   }
 }