Merge NativeTextfieldViews into views::Textfield.

ash/extended_desktop_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 762 matching lines @@
       aura::client::GetFocusClient(root_windows[0]);
   EXPECT_EQ(lock_widget->GetNativeView(), focus_client->GetFocusedWindow());
 
   // The lock window should get events on both root windows.
   aura::test::EventGenerator& event_generator(GetEventGenerator());
 
   event_generator.set_current_root_window(root_windows[0]->GetDispatcher());
   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.
   UpdateDisplay("100x100,200x200");
   root_windows = Shell::GetAllRootWindows();
   event_generator.set_current_root_window(root_windows[0]->GetDispatcher());
   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) {
   if (!SupportsMultipleDisplays())
     return;
 
   EventLocationRecordingEventHandler event_handler;
   ash::Shell::GetInstance()->AddPreTargetHandler(&event_handler);
 
   UpdateDisplay("300x300,200x200");
@@ skipping 14 matching lines @@
   generator.ReleaseLeftButton();
   EXPECT_EQ("-999,-999 -999,-999", event_handler.GetLocationsAndReset());
 
   generator.MoveMouseTo(400, 150);
   EXPECT_EQ("100,150 100,150", event_handler.GetLocationsAndReset());
 
   ash::Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
 }  // namespace ash