Marks a number of tests as FAILS for aura. I filed bugs on the two key

areas, I plan on immediately fixing the widget one which is why I
didn't file a bug. Hopefully when we get bots actually building and
running tests, these changes will make them green.

TBR since this is just marking tests FAILS.

BUG=99129 99128
TEST=none
TBR=ben@chromium.org
R=ben@chromium.org

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

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

3 files changed, 73 insertions, 19 deletions

diff --git a/views/controls/textfield/native_textfield_views_unittest.cc b/views/controls/textfield/native_textfield_views_unittest.cc
index f38e2f2..d2da892 100644
--- a/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/views/controls/textfield/native_textfield_views_unittest.cc
@@ -34,6 +34,43 @@
 #include "views/widget/native_widget_private.h"
 #include "views/widget/widget.h"
 
+// Bug 99128.
+#if defined(USE_AURA)
+#define MAYBE_KeyTest FAILS_KeyTest
+#define MAYBE_ControlAndSelectTest FAILS_ControlAndSelectTest
+#define MAYBE_InsertionDeletionTest FAILS_InsertionDeletionTest
+#define MAYBE_OnKeyPressReturnValueTest FAILS_OnKeyPressReturnValueTest
+#define MAYBE_CursorMovement FAILS_CursorMovement
+#define MAYBE_DragAndDrop_ToTheRight FAILS_DragAndDrop_ToTheRight
+#define MAYBE_DragAndDrop_ToTheLeft FAILS_DragAndDrop_ToTheLeft
+#define MAYBE_ReadOnlyTest FAILS_ReadOnlyTest
+#define MAYBE_TextInputClientTest FAILS_TextInputClientTest
+#define MAYBE_UndoRedoTest FAILS_UndoRedoTest
+#define MAYBE_TextCursorDisplayTest FAILS_TextCursorDisplayTest
+#define MAYBE_TextCursorDisplayInRTLTest FAILS_TextCursorDisplayInRTLTest
+#define MAYBE_HitOutsideTextAreaTest FAILS_HitOutsideTextAreaTest
+#define MAYBE_HitOutsideTextAreaInRTLTest FAILS_HitOutsideTextAreaInRTLTest
+#define MAYBE_OverflowTest FAILS_OverflowTest
+#define MAYBE_OverflowInRTLTest FAILS_OverflowInRTLTest
+#else
+#define MAYBE_KeyTest KeyTest
+#define MAYBE_ControlAndSelectTest ControlAndSelectTest
+#define MAYBE_InsertionDeletionTest InsertionDeletionTest
+#define MAYBE_OnKeyPressReturnValueTest OnKeyPressReturnValueTest
+#define MAYBE_CursorMovement CursorMovement
+#define MAYBE_DragAndDrop_ToTheRight DragAndDrop_ToTheRight
+#define MAYBE_DragAndDrop_ToTheLeft DragAndDrop_ToTheLeft
+#define MAYBE_ReadOnlyTest ReadOnlyTest
+#define MAYBE_TextInputClientTest TextInputClientTest
+#define MAYBE_UndoRedoTest UndoRedoTest
+#define MAYBE_TextCursorDisplayTest TextCursorDisplayTest
+#define MAYBE_TextCursorDisplayInRTLTest TextCursorDisplayInRTLTest
+#define MAYBE_HitOutsideTextAreaTest HitOutsideTextAreaTest
+#define MAYBE_HitOutsideTextAreaInRTLTest HitOutsideTextAreaInRTLTest
+#define MAYBE_OverflowTest OverflowTest
+#define MAYBE_OverflowInRTLTest OverflowInRTLTest
+#endif
+
 namespace {
 
 // A wrapper of Textfield to intercept the result of OnKeyPressed() and
@@ -334,7 +371,7 @@ TEST_F(NativeTextfieldViewsTest, ModelChangesTest) {
   EXPECT_TRUE(last_contents_.empty());
 }
 
-TEST_F(NativeTextfieldViewsTest, KeyTest) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_KeyTest) {
   InitTextfield(Textfield::STYLE_DEFAULT);
   SendKeyEvent(ui::VKEY_C, true, false);
   EXPECT_STR_EQ("C", textfield_->text());
@@ -355,7 +392,7 @@ TEST_F(NativeTextfieldViewsTest, KeyTest) {
   EXPECT_STR_EQ("cC1!!", last_contents_);
 }
 
-TEST_F(NativeTextfieldViewsTest, ControlAndSelectTest) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_ControlAndSelectTest) {
   // Insert a test string in a textfield.
   InitTextfield(Textfield::STYLE_DEFAULT);
   textfield_->SetText(ASCIIToUTF16("one two three"));
@@ -390,7 +427,7 @@ TEST_F(NativeTextfieldViewsTest, ControlAndSelectTest) {
   EXPECT_STR_EQ("ZERO ", textfield_->GetSelectedText());
 }
 
-TEST_F(NativeTextfieldViewsTest, InsertionDeletionTest) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_InsertionDeletionTest) {
   // Insert a test string in a textfield.
   InitTextfield(Textfield::STYLE_DEFAULT);
   char test_str[] = "this is a test";
@@ -519,7 +556,7 @@ TEST_F(NativeTextfieldViewsTest, TextInputType) {
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE, GetTextInputType());
 }
 
-TEST_F(NativeTextfieldViewsTest, OnKeyPressReturnValueTest) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_OnKeyPressReturnValueTest) {
   InitTextfield(Textfield::STYLE_DEFAULT);
 
   // Character keys will be handled by input method.
@@ -550,7 +587,7 @@ TEST_F(NativeTextfieldViewsTest, OnKeyPressReturnValueTest) {
   EXPECT_FALSE(textfield_->key_handled());
 }
 
-TEST_F(NativeTextfieldViewsTest, CursorMovement) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_CursorMovement) {
   InitTextfield(Textfield::STYLE_DEFAULT);
 
   // Test with trailing whitespace.
@@ -810,7 +847,7 @@ TEST_F(NativeTextfieldViewsTest, DragAndDrop_InitiateDrag) {
       textfield_view_->GetDragOperationsForView(textfield_view_, kStringPoint));
 }
 
-TEST_F(NativeTextfieldViewsTest, DragAndDrop_ToTheRight) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_DragAndDrop_ToTheRight) {
   InitTextfield(Textfield::STYLE_DEFAULT);
   textfield_->SetText(ASCIIToUTF16("hello world"));
 
@@ -864,7 +901,7 @@ TEST_F(NativeTextfieldViewsTest, DragAndDrop_ToTheRight) {
   EXPECT_STR_EQ("h welloorld", textfield_->text());
 }
 
-TEST_F(NativeTextfieldViewsTest, DragAndDrop_ToTheLeft) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_DragAndDrop_ToTheLeft) {
   InitTextfield(Textfield::STYLE_DEFAULT);
   textfield_->SetText(ASCIIToUTF16("hello world"));
 
@@ -945,7 +982,7 @@ TEST_F(NativeTextfieldViewsTest, DragAndDrop_Canceled) {
 }
 #endif
 
-TEST_F(NativeTextfieldViewsTest, ReadOnlyTest) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_ReadOnlyTest) {
   InitTextfield(Textfield::STYLE_DEFAULT);
   textfield_->SetText(ASCIIToUTF16(" one two three "));
   textfield_->SetReadOnly(true);
@@ -1002,7 +1039,7 @@ TEST_F(NativeTextfieldViewsTest, ReadOnlyTest) {
   EXPECT_STR_EQ(" four five six ", textfield_->GetSelectedText());
 }
 
-TEST_F(NativeTextfieldViewsTest, TextInputClientTest) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_TextInputClientTest) {
   InitTextfield(Textfield::STYLE_DEFAULT);
   TextInputClient* client = textfield_->GetTextInputClient();
   EXPECT_TRUE(client);
@@ -1092,7 +1129,7 @@ TEST_F(NativeTextfieldViewsTest, TextInputClientTest) {
   EXPECT_TRUE(textfield_->GetTextInputClient());
 }
 
-TEST_F(NativeTextfieldViewsTest, UndoRedoTest) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_UndoRedoTest) {
   InitTextfield(Textfield::STYLE_DEFAULT);
   SendKeyEvent(ui::VKEY_A);
   EXPECT_STR_EQ("a", textfield_->text());
@@ -1200,7 +1237,7 @@ TEST_F(NativeTextfieldViewsTest, UndoRedoTest) {
   EXPECT_STR_EQ("ab3", textfield_->text());
 }
 
-TEST_F(NativeTextfieldViewsTest, TextCursorDisplayTest) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_TextCursorDisplayTest) {
   InitTextfield(Textfield::STYLE_DEFAULT);
   // LTR-RTL string in LTR context.
   SendKeyEvent('a');
@@ -1252,7 +1289,7 @@ TEST_F(NativeTextfieldViewsTest, TextCursorDisplayTest) {
   EXPECT_LT(prev_x, x);
 }
 
-TEST_F(NativeTextfieldViewsTest, TextCursorDisplayInRTLTest) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_TextCursorDisplayInRTLTest) {
   std::string locale = l10n_util::GetApplicationLocale("");
   base::i18n::SetICUDefaultLocale("he");
 
@@ -1370,7 +1407,7 @@ TEST_F(NativeTextfieldViewsTest, HitInsideTextAreaTest) {
   }
 }
 
-TEST_F(NativeTextfieldViewsTest, HitOutsideTextAreaTest) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_HitOutsideTextAreaTest) {
   InitTextfield(Textfield::STYLE_DEFAULT);
 
   // LTR-RTL string in LTR context.
@@ -1410,7 +1447,7 @@ TEST_F(NativeTextfieldViewsTest, HitOutsideTextAreaTest) {
   EXPECT_EQ(bound, GetCursorBounds());
 }
 
-TEST_F(NativeTextfieldViewsTest, HitOutsideTextAreaInRTLTest) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_HitOutsideTextAreaInRTLTest) {
   std::string locale = l10n_util::GetApplicationLocale("");
   base::i18n::SetICUDefaultLocale("he");
 
@@ -1464,7 +1501,7 @@ void OverflowCursorBoundTestVerifier(const gfx::Rect& display,
   EXPECT_GE(display.bottom(), bound.bottom());
 }
 
-TEST_F(NativeTextfieldViewsTest, OverflowTest) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_OverflowTest) {
   InitTextfield(Textfield::STYLE_DEFAULT);
 
   string16 str;
@@ -1494,7 +1531,7 @@ TEST_F(NativeTextfieldViewsTest, OverflowTest) {
   EXPECT_EQ(501U, textfield_->GetCursorPosition());
 }
 
-TEST_F(NativeTextfieldViewsTest, OverflowInRTLTest) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_OverflowInRTLTest) {
   std::string locale = l10n_util::GetApplicationLocale("");
   base::i18n::SetICUDefaultLocale("he");
 
diff --git a/views/events/event_unittest.cc b/views/events/event_unittest.cc
index 4694b59..211877d 100644
--- a/views/events/event_unittest.cc
+++ b/views/events/event_unittest.cc
@@ -7,6 +7,15 @@
 #include "base/basictypes.h"
 #include "views/events/event.h"
 
+// Bug 99129.
+#if defined(USE_AURA)
+#define MAYBE_KeyEvent FAILS_KeyEvent
+#define MAYBE_KeyEventDirectUnicode FAILS_KeyEventDirectUnicode
+#else
+#define MAYBE_KeyEvent KeyEvent
+#define MAYBE_KeyEventDirectUnicode KeyEventDirectUnicode
+#endif
+
 namespace views {
 
 class EventTest : public testing::Test {
@@ -18,7 +27,7 @@ class EventTest : public testing::Test {
   DISALLOW_COPY_AND_ASSIGN(EventTest);
 };
 
-TEST_F(EventTest, KeyEvent) {
+TEST_F(EventTest, MAYBE_KeyEvent) {
   static const struct {
     ui::KeyboardCode key_code;
     int flags;
@@ -103,7 +112,7 @@ TEST_F(EventTest, KeyEvent) {
   }
 }
 
-TEST_F(EventTest, KeyEventDirectUnicode) {
+TEST_F(EventTest, MAYBE_KeyEventDirectUnicode) {
   KeyEvent key(ui::ET_KEY_PRESSED, ui::VKEY_UNKNOWN, ui::EF_SHIFT_DOWN);
   key.set_character(0x1234U);
   key.set_unmodified_character(0x4321U);
diff --git a/views/widget/widget_unittest.cc b/views/widget/widget_unittest.cc
index a93a421..9b3fe5a9 100644
--- a/views/widget/widget_unittest.cc
+++ b/views/widget/widget_unittest.cc
@@ -585,10 +585,18 @@ TEST_F(WidgetOwnershipTest, Ownership_ViewsNativeWidgetOwnsWidget) {
   EXPECT_TRUE(state.native_widget_deleted);
 }
 
+#if defined(USE_AURA)
+#define MAYBE_Ownership_PlatformNativeWidgetOwnsWidget_NativeDestroy \
+    FAILS_Ownership_PlatformNativeWidgetOwnsWidget_NativeDestroy
+#else
+#define MAYBE_Ownership_PlatformNativeWidgetOwnsWidget_NativeDestroy \
+    Ownership_PlatformNativeWidgetOwnsWidget_NativeDestroy
+#endif
+
 // NativeWidget owns its Widget, part 3: NativeWidget is a platform-native
 // widget, destroyed out from under it by the OS.
 TEST_F(WidgetOwnershipTest,
-       Ownership_PlatformNativeWidgetOwnsWidget_NativeDestroy) {
+       MAYBE_Ownership_PlatformNativeWidgetOwnsWidget_NativeDestroy) {
   OwnershipTestState state;
 
   Widget* widget = new OwnershipTestWidget(&state);