| Index: chrome/browser/search_engines/template_url_parser_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/search_engines/template_url_parser_unittest.cc (revision 88127)
|
| +++ chrome/browser/search_engines/template_url_parser_unittest.cc (working copy)
|
| @@ -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 @@
|
| EXPECT_FALSE(parse_result_);
|
| }
|
|
|
| -TEST_F(TemplateURLParserTest, TestDictionary) {
|
| +TEST_F(TemplateURLParserTest, MAYBE_TestDictionary) {
|
| if (IsDisabled())
|
| return;
|
| ParseFile("dictionary.xml", NULL);
|
| @@ -94,7 +106,7 @@
|
| "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 @@
|
| "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);
|
|
|