Disable failing tests on WIN

* disable Clipboard
* TraveralTest wasn't correctly disabled. This CL fixes it.

BUG=none
TEST=views_unittests, unittests on Win should cycle green.

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

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

2 files changed, 7 insertions, 2 deletions

diff --git a/views/controls/textfield/native_textfield_views_unittest.cc b/views/controls/textfield/native_textfield_views_unittest.cc
index f4b321a..05775f2 100644
--- a/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/views/controls/textfield/native_textfield_views_unittest.cc
@@ -356,7 +356,7 @@ TEST_F(NativeTextfieldViewsTest, CursorMovement) {
 #else
 #define MAYBE_FocusTraversalTest FocusTraversalTest
 #endif
-TEST_F(NativeTextfieldViewsTest, FocusTraversalTest) {
+TEST_F(NativeTextfieldViewsTest, MAYBE_FocusTraversalTest) {
   InitTextfields(Textfield::STYLE_DEFAULT, 3);
   textfield_->RequestFocus();
 
diff --git a/views/controls/textfield/textfield_views_model_unittest.cc b/views/controls/textfield/textfield_views_model_unittest.cc
index 87cace2..f9a3acc 100644
--- a/views/controls/textfield/textfield_views_model_unittest.cc
+++ b/views/controls/textfield/textfield_views_model_unittest.cc
@@ -287,7 +287,12 @@ TEST(TextfieldViewsModelTest, SetText) {
   EXPECT_EQ(0U, model.cursor_pos());
 }
 
-TEST(TextfieldViewsModelTest, Clipboard) {
+#if defined(OS_WIN)
+#define MAYBE_Clipboard DISABLED_Clipboard
+#else
+#define MAYBE_Clipboard Clipboard
+#endif
+TEST(TextfieldViewsModelTest, MAYBE_Clipboard) {
   views::ViewsDelegate::views_delegate = new TestViewsDelegate();
   ui::Clipboard* clipboard
       = views::ViewsDelegate::views_delegate->GetClipboard();