Remove various uses of TOUCH_UI that are no longer needed

This includes:
- Don't try to replace small resources with large ones based on a compile flag.  We'll need a more dynamic mechanism.
- No need to disable the Getting Started Guide
- Anything with TOOLKIT_USES_GTK won't support touch.
- Don't need the screen locker logout hack.  WebUI screen locker now works, and is also about to work on Aura builds.
- Re-enable a bunch of tests which were disabled/flaky in TOUCH_UI builds.
- No need to disable SSL Client certificate selector, we have a WebUI version now.
- TOUCH-specific max tab count is gone, remove hack from test.
- Remove exclusions from chrome_tests.gypi for touch tests that are no longer included in the build.

BUG=105046
TEST=

Review URL: http://codereview.chromium.org/8691005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111945 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 32 deletions

diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc
index 3dbf72a..816d976 100644
--- a/chrome/browser/extensions/extension_tabs_apitest.cc
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -41,34 +41,6 @@
 
 #endif
 
-// In the touch build, this fails reliably. http://crbug.com/85191
-#if defined(TOUCH_UI)
-#define MAYBE_GetViewsOfCreatedWindow DISABLED_GetViewsOfCreatedWindow
-#else
-#define MAYBE_GetViewsOfCreatedWindow GetViewsOfCreatedWindow
-#endif
-
-// In the touch build, this fails unreliably. http://crbug.com/85226
-#if defined(TOUCH_UI)
-#define MAYBE_GetViewsOfCreatedPopup FLAKY_GetViewsOfCreatedPopup
-#else
-#define MAYBE_GetViewsOfCreatedPopup GetViewsOfCreatedPopup
-#endif
-
-// In the touch build, this fails reliably. http://crbug.com/85190
-#if defined(TOUCH_UI)
-#define MAYBE_TabEvents DISABLED_TabEvents
-#else
-#define MAYBE_TabEvents TabEvents
-#endif
-
-// In the touch build, this fails unreliably. http://crbug.com/85193
-#if defined(TOUCH_UI)
-#define MAYBE_TabMove FLAKY_TabMove
-#else
-#define MAYBE_TabMove TabMove
-#endif
-
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs) {
   // The test creates a tab and checks that the URL of the new tab
   // is that of the new tab page.  Make sure the pref that controls
@@ -91,11 +63,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabPinned) {
   ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "pinned.html")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabMove) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabMove) {
   ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "move.html")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabEvents) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabEvents) {
   ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "events.html")) << message_;
 }
 
@@ -228,11 +200,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoDisabledByPref) {
   ASSERT_TRUE(RunExtensionTest("tabs/incognito_disabled")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_GetViewsOfCreatedPopup) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedPopup) {
   ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_popup.html"))
       << message_;
 }
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_GetViewsOfCreatedWindow) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedWindow) {
   ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html"))
       << message_;
 }