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 40607b042a605866de1001f2eb2b19e7d52519a6..54844f39e78990aab5bf3c24ba7695a3d3d4e177 100644 |
--- a/views/controls/textfield/native_textfield_views_unittest.cc |
+++ b/views/controls/textfield/native_textfield_views_unittest.cc |
@@ -117,13 +117,14 @@ class NativeTextfieldViewsTest : public ViewsTestBase, |
// ::testing::Test: |
virtual void SetUp() { |
+ ViewsTestBase::SetUp(); |
Widget::SetPureViews(true); |
} |
virtual void TearDown() { |
- Widget::SetPureViews(false); |
if (widget_) |
widget_->Close(); |
+ Widget::SetPureViews(false); |
ViewsTestBase::TearDown(); |
} |
@@ -657,6 +658,7 @@ TEST_F(NativeTextfieldViewsTest, DragAndDrop_AcceptDrop) { |
EXPECT_FALSE(textfield_view_->CanDrop(bad_data)); |
} |
+#if !defined(TOUCH_UI) |
TEST_F(NativeTextfieldViewsTest, DragAndDrop_InitiateDrag) { |
InitTextfield(Textfield::STYLE_DEFAULT); |
textfield_->SetText(ASCIIToUTF16("hello string world")); |
@@ -828,6 +830,7 @@ TEST_F(NativeTextfieldViewsTest, DragAndDrop_Canceled) { |
textfield_view_->OnDragDone(); |
EXPECT_EQ(ASCIIToUTF16("hello world"), textfield_->text()); |
} |
+#endif |
TEST_F(NativeTextfieldViewsTest, ReadOnlyTest) { |
InitTextfield(Textfield::STYLE_DEFAULT); |