Remove almost all remaining TOUCH_UIs.

chrome/common/logging_chrome_uitest.cc

 // Copyright (c) 2011 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 57 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)
-// for the virtual keyboard.
-#if defined(TOUCH_UI)
+// Virtual keyboard build will start an extra renderer process (the extension
+// process) for the virtual keyboard.
+#if defined(USE_VIRTUAL_KEYBOARD)
 #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 renderer assertions during tests.
 class AssertionTest : public UITest {
  protected:
   AssertionTest() {
@@ skipping 73 matching lines @@
 #else
 #define MAYBE_Crash Crash
 #endif
 // Launch the app in renderer crash test mode, then close the app.
 TEST_F(RendererCrashTest, MAYBE_Crash) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   ASSERT_TRUE(browser->WaitForTabCountToBecome(1));
   expected_crashes_ = EXPECTED_CRASH_CRASHES;
 }