Fix the failed AssertionTest and CheckFalseTest for touch build

chrome/common/logging_chrome_uitest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 56 matching lines @@
 
 #if defined(OS_LINUX) && (!defined(NDEBUG) || !defined(USE_LINUX_BREAKPAD))
 // On Linux in Debug mode, Chrome generates a SIGTRAP.
 // we do not catch SIGTRAPs, thus no crash dump.
 // This also does not work if Breakpad is disabled.
 #define EXPECTED_ASSERT_CRASHES 0
 #else
 #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 {
  protected:
   AssertionTest() : UITest() {
     // Initial loads will never complete due to assertion.
     wait_for_initial_loads_ = false;
 
     // We're testing the renderer rather than the browser assertion here,
     // because the browser assertion would flunk the test during SetUp()
     // (since TAU wouldn't be able to find the browser window).
     launch_arguments_.AppendSwitch(switches::kRendererAssertTest);
   }
 };
 
 // Launch the app in assertion test mode, then close the app.
 #if defined(OS_WIN)
 // http://crbug.com/26715
 #define Assertion DISABLED_Assertion
 #elif defined(OS_MACOSX)
 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243
 #define Assertion DISABLED_Assertion
 #endif
 TEST_F(AssertionTest, Assertion) {
   if (ProxyLauncher::in_process_renderer()) {
     // in process mode doesn't do the crashing.
     expected_errors_ = 0;
     expected_crashes_ = 0;
   } else {
-    expected_errors_ = 1;
+    expected_errors_ = EXPECTED_ASSERT_ERRORS;
     expected_crashes_ = EXPECTED_ASSERT_CRASHES;
   }
 }
 #endif  // !defined(NDEBUG)
 
 #if !defined(OFFICIAL_BUILD)
 // Only works on Linux in Release mode with CHROME_HEADLESS=1
 class CheckFalseTest : public UITest {
  protected:
   CheckFalseTest() : UITest() {
     // Initial loads will never complete due to assertion.
     wait_for_initial_loads_ = false;
 
     // We're testing the renderer rather than the browser assertion here,
     // because the browser assertion would flunk the test during SetUp()
     // (since TAU wouldn't be able to find the browser window).
     launch_arguments_.AppendSwitch(switches::kRendererCheckFalseTest);
   }
 };
 
 #if defined(OS_WIN)
 // http://crbug.com/38497
 #define CheckFails FLAKY_CheckFails
 #elif defined(OS_MACOSX)
 // 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()) {
     // in process mode doesn't do the crashing.
     expected_errors_ = 0;
     expected_crashes_ = 0;
   } else {
-    expected_errors_ = 1;
+    expected_errors_ = EXPECTED_ASSERT_ERRORS;
     expected_crashes_ = EXPECTED_ASSERT_CRASHES;
   }
 }
 #endif  // !defined(OFFICIAL_BUILD)
 
 // Tests whether we correctly fail on browser crashes during UI Tests.
 class RendererCrashTest : public UITest {
  protected:
   RendererCrashTest() : UITest() {
     // Initial loads will never complete due to crash.
@@ skipping 22 matching lines @@
   if (ProxyLauncher::in_process_renderer()) {
     // in process mode doesn't do the crashing.
     expected_crashes_ = 0;
   } else {
     scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
     ASSERT_TRUE(browser.get());
     ASSERT_TRUE(browser->WaitForTabCountToBecome(1));
     expected_crashes_ = EXPECTED_CRASH_CRASHES;
   }
 }