| Index: content/browser/web_contents/touch_editable_impl_aura_browsertest.cc
|
| diff --git a/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc b/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc
|
| index e63ce5af8ab5dfe3d49200206b5f7e306564ef51..a44174ebb6d72eaf57a1b8d0b464ddb9baaa22fe 100644
|
| --- a/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc
|
| +++ b/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc
|
| @@ -312,8 +312,14 @@ IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest,
|
| EXPECT_STREQ("Some", selection.c_str());
|
| }
|
|
|
| +#if defined(OS_CHROMEOS)
|
| +// http://crbug.com/396509
|
| +#define MAYBE_TouchCursorInTextfieldTest DISABLED_TouchCursorInTextfieldTest
|
| +#else
|
| +#define MAYBE_TouchCursorInTextfieldTest TouchCursorInTextfieldTest
|
| +#endif
|
| IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest,
|
| - TouchCursorInTextfieldTest) {
|
| + MAYBE_TouchCursorInTextfieldTest) {
|
| ASSERT_NO_FATAL_FAILURE(StartTestWithPage("files/touch_selection.html"));
|
| WebContentsImpl* web_contents =
|
| static_cast<WebContentsImpl*>(shell()->web_contents());
|
|
|