Quick fix for NativeTextfieldViewsTest on win aura.

views/controls/textfield/native_textfield_views_unittest.cc

Index: views/controls/textfield/native_textfield_views_unittest.cc
diff --git a/views/controls/textfield/native_textfield_views_unittest.cc b/views/controls/textfield/native_textfield_views_unittest.cc
index d2da8921524913322099629788fa56a195cb6660..f0ce31bcde4a211d45d157171d4f42c8bd0d83a7 100644
--- a/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/views/controls/textfield/native_textfield_views_unittest.cc
@@ -34,32 +34,17 @@
 #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
+// Bug http://crbug.com/99128
+#if defined(OS_WIN)

[sadrul, 2011/10/05 22:54:02]

I think the simplest would be to make this

#if defined(USE_AURA) && defined(OS_LINUX)

Keep the FAILS_ bit, turn some into DISABLED_, and remove the #else block.

[sadrul, 2011/10/05 22:57:18]

Clearly the #else block should remain as it is.

 #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_InitiateDrag DragAndDrop_InitiateDrag
 #define MAYBE_DragAndDrop_ToTheLeft DragAndDrop_ToTheLeft
+#define MAYBE_DragAndDrop_ToTheRight DragAndDrop_ToTheRight
+#define MAYBE_DragAndDrop_Canceled DragAndDrop_Canceled
 #define MAYBE_ReadOnlyTest ReadOnlyTest
 #define MAYBE_TextInputClientTest TextInputClientTest
 #define MAYBE_UndoRedoTest UndoRedoTest
@@ -69,7 +54,38 @@
 #define MAYBE_HitOutsideTextAreaInRTLTest HitOutsideTextAreaInRTLTest
 #define MAYBE_OverflowTest OverflowTest
 #define MAYBE_OverflowInRTLTest OverflowInRTLTest
-#endif
+#else  // OS_WIN
+
+#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_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
+
+// Drag and drop for aura in linux hasn't been implemented yet.
+// Bug http://crbug.com/97845
+#if defined(USE_AURA)
+#define MAYBE_DragAndDrop_InitiateDrag DISABLED_DragAndDrop_InitiateDrag
+#define MAYBE_DragAndDrop_ToTheLeft DISABLED_DragAndDrop_ToTheLeft
+#define MAYBE_DragAndDrop_ToTheRight DISABLED_DragAndDrop_ToTheRight
+#define MAYBE_DragAndDrop_Canceled DISABLED_DragAndDrop_Canceled
+#else  // USE_AURA
+#define MAYBE_DragAndDrop_InitiateDrag FAILS_DragAndDrop_InitiateDrag
+#define MAYBE_DragAndDrop_ToTheLeft FAILS_DragAndDrop_ToTheLeft
+#define MAYBE_DragAndDrop_ToTheRight FAILS_DragAndDrop_ToTheRight
+#define MAYBE_DragAndDrop_Canceled FAILS_DragAndDrop_Canceled
+#endif  // USE_AURA
+
+#endif  // OS_WIN
 
 namespace {
 
@@ -810,7 +826,7 @@ TEST_F(NativeTextfieldViewsTest, DragAndDrop_AcceptDrop) {
 #endif
 
 #if !defined(TOUCH_UI)
-TEST_F(NativeTextfieldViewsTest, DragAndDrop_InitiateDrag) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_DragAndDrop_InitiateDrag) {
   InitTextfield(Textfield::STYLE_DEFAULT);
   textfield_->SetText(ASCIIToUTF16("hello string world"));
 
@@ -954,7 +970,7 @@ TEST_F(NativeTextfieldViewsTest, MAYBE_DragAndDrop_ToTheLeft) {
   EXPECT_STR_EQ("h worlellod", textfield_->text());
 }
 
-TEST_F(NativeTextfieldViewsTest, DragAndDrop_Canceled) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_DragAndDrop_Canceled) {
   InitTextfield(Textfield::STYLE_DEFAULT);
   textfield_->SetText(ASCIIToUTF16("hello world"));