These tests fail in the touch environment, and we would like to queue fixing them behind keeping that build working as well as it does today.

BUG=84854, 84855
TEST=none

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

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

2 files changed, 23 insertions, 4 deletions

diff --git a/chrome/browser/search_engines/template_url_parser_unittest.cc b/chrome/browser/search_engines/template_url_parser_unittest.cc
index d0fae59..9077543 100644
--- a/chrome/browser/search_engines/template_url_parser_unittest.cc
+++ b/chrome/browser/search_engines/template_url_parser_unittest.cc
@@ -11,6 +11,18 @@
 #include "chrome/common/chrome_paths.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(TOUCH_UI)
+//  Tests that fail on touch .. http://crbug/84855
+#define MAYBE_TestDictionary FAILS_TestDictionary
+#define MAYBE_TestMSDN FAILS_TestMSDN
+#define MAYBE_TestWikipedia FAILS_TestWikipedia
+#else
+#define MAYBE_TestDictionary TestDictionary
+#define MAYBE_TestMSDN TestMSDN
+#define MAYBE_TestWikipedia TestWikipedia
+#endif
+
+
 class TemplateURLParserTest : public testing::Test {
  public:
   TemplateURLParserTest() : parse_result_(true) {
@@ -80,7 +92,7 @@ TEST_F(TemplateURLParserTest, FailOnPost) {
   EXPECT_FALSE(parse_result_);
 }
 
-TEST_F(TemplateURLParserTest, TestDictionary) {
+TEST_F(TemplateURLParserTest, MAYBE_TestDictionary) {
   if (IsDisabled())
     return;
   ParseFile("dictionary.xml", NULL);
@@ -94,7 +106,7 @@ TEST_F(TemplateURLParserTest, TestDictionary) {
             "http://dictionary.reference.com/browse/{searchTerms}?r=75");
 }
 
-TEST_F(TemplateURLParserTest, TestMSDN) {
+TEST_F(TemplateURLParserTest, MAYBE_TestMSDN) {
   if (IsDisabled())
     return;
   ParseFile("msdn.xml", NULL);
@@ -108,7 +120,7 @@ TEST_F(TemplateURLParserTest, TestMSDN) {
             "http://search.msdn.microsoft.com/search/default.aspx?Query={searchTerms}&brand=msdn&locale=en-US");
 }
 
-TEST_F(TemplateURLParserTest, TestWikipedia) {
+TEST_F(TemplateURLParserTest, MAYBE_TestWikipedia) {
   if (IsDisabled())
     return;
   ParseFile("wikipedia.xml", NULL);
diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc
index 89bd230..d3a9b64 100644
--- a/chrome/common/service_process_util_unittest.cc
+++ b/chrome/common/service_process_util_unittest.cc
@@ -29,6 +29,13 @@
 #include <glib.h>
 #endif
 
+#if defined(TOUCH_UI)
+// This test fails http://crbug/84854
+#define MAYBE_ForceShutdown FAILS_ForceShutdown
+#else
+#define MAYBE_ForceShutdown ForceShutdown
+#endif
+
 namespace {
 
 bool g_good_shutdown = false;
@@ -166,7 +173,7 @@ TEST_F(ServiceProcessStateTest, SharedMem) {
   ASSERT_EQ(base::GetCurrentProcId(), pid);
 }
 
-TEST_F(ServiceProcessStateTest, ForceShutdown) {
+TEST_F(ServiceProcessStateTest, MAYBE_ForceShutdown) {
   base::ProcessHandle handle = SpawnChild("ServiceProcessStateTestShutdown",
                                           true);
   ASSERT_TRUE(handle);