Merge NativeTextfieldViews into views::Textfield.

ash/extended_desktop_unittest.cc

Index: ash/extended_desktop_unittest.cc
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index 1ba82974f54bf56fd24bd4cf95f81e14b759a213..cab22782636cd007b4aaab90e6c6546d1f13088e 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -780,20 +780,20 @@ TEST_F(ExtendedDesktopTest, KeyEventsOnLockScreen) {
   event_generator.PressKey(ui::VKEY_A, 0);
   event_generator.ReleaseKey(ui::VKEY_A, 0);
   EXPECT_EQ(lock_widget->GetNativeView(), focus_client->GetFocusedWindow());
-  EXPECT_EQ("a", UTF16ToASCII(textfield->text()));
+  EXPECT_EQ("a", UTF16ToASCII(textfield->GetText()));
 
   event_generator.set_current_root_window(root_windows[1]->GetDispatcher());
   event_generator.PressKey(ui::VKEY_B, 0);
   event_generator.ReleaseKey(ui::VKEY_B, 0);
   EXPECT_EQ(lock_widget->GetNativeView(), focus_client->GetFocusedWindow());
-  EXPECT_EQ("ab", UTF16ToASCII(textfield->text()));
+  EXPECT_EQ("ab", UTF16ToASCII(textfield->GetText()));
 
   // Deleting 2nd display. The lock window still should get the events.
   UpdateDisplay("100x100");
   event_generator.PressKey(ui::VKEY_C, 0);
   event_generator.ReleaseKey(ui::VKEY_C, 0);
   EXPECT_EQ(lock_widget->GetNativeView(), focus_client->GetFocusedWindow());
-  EXPECT_EQ("abc", UTF16ToASCII(textfield->text()));
+  EXPECT_EQ("abc", UTF16ToASCII(textfield->GetText()));
 
   // Creating 2nd display again, and lock window still should get events
   // on both root windows.
@@ -803,13 +803,13 @@ TEST_F(ExtendedDesktopTest, KeyEventsOnLockScreen) {
   event_generator.PressKey(ui::VKEY_D, 0);
   event_generator.ReleaseKey(ui::VKEY_D, 0);
   EXPECT_EQ(lock_widget->GetNativeView(), focus_client->GetFocusedWindow());
-  EXPECT_EQ("abcd", UTF16ToASCII(textfield->text()));
+  EXPECT_EQ("abcd", UTF16ToASCII(textfield->GetText()));
 
   event_generator.set_current_root_window(root_windows[1]->GetDispatcher());
   event_generator.PressKey(ui::VKEY_E, 0);
   event_generator.ReleaseKey(ui::VKEY_E, 0);
   EXPECT_EQ(lock_widget->GetNativeView(), focus_client->GetFocusedWindow());
-  EXPECT_EQ("abcde", UTF16ToASCII(textfield->text()));
+  EXPECT_EQ("abcde", UTF16ToASCII(textfield->GetText()));
 }
 
 TEST_F(ExtendedDesktopTest, PassiveGrab) {