Merge NativeTextfieldViews into views::Textfield.

chrome/browser/ui/views/find_bar_view.cc

Index: chrome/browser/ui/views/find_bar_view.cc
diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc
index a87902df1c5c059914bbaf6cefb3bed0aed4160e..51a04ead8da187dead370b54ebf370febb911a96 100644
--- a/chrome/browser/ui/views/find_bar_view.cc
+++ b/chrome/browser/ui/views/find_bar_view.cc
@@ -172,7 +172,7 @@ void FindBarView::SetFindTextAndSelectedRange(
 }
 
 base::string16 FindBarView::GetFindText() const {
-  return find_text_->text();
+  return find_text_->GetText();
 }
 
 gfx::Range FindBarView::GetSelectedRange() const {
@@ -195,7 +195,7 @@ void FindBarView::UpdateForResult(const FindNotificationDetails& result,
   // http://crbug.com/34970: some IMEs get confused if we change the text
   // composed by them. To avoid this problem, we should check the IME status and
   // update the text only when the IME is not composing text.
-  if (find_text_->text() != find_text && !find_text_->IsIMEComposing()) {
+  if (find_text_->GetText() != find_text && !find_text_->IsIMEComposing()) {
     find_text_->SetText(find_text);
     find_text_->SelectAll(true);
   }
@@ -230,7 +230,7 @@ void FindBarView::ClearMatchCount() {
 
 void FindBarView::SetFocusAndSelection(bool select_all) {
   find_text_->RequestFocus();
-  if (select_all && !find_text_->text().empty())
+  if (select_all && !find_text_->GetText().empty())
     find_text_->SelectAll(true);
 }
 
@@ -369,10 +369,10 @@ void FindBarView::ButtonPressed(
   switch (sender->tag()) {
     case FIND_PREVIOUS_TAG:
     case FIND_NEXT_TAG:
-      if (!find_text_->text().empty()) {
+      if (!find_text_->GetText().empty()) {
         FindTabHelper* find_tab_helper = FindTabHelper::FromWebContents(
             find_bar_host()->GetFindBarController()->web_contents());
-        find_tab_helper->StartFinding(find_text_->text(),
+        find_tab_helper->StartFinding(find_text_->GetText(),
                                       sender->tag() == FIND_NEXT_TAG,
                                       false);  // Not case sensitive.
       }
@@ -410,7 +410,7 @@ bool FindBarView::HandleKeyEvent(views::Textfield* sender,
 
   if (key_event.key_code() == ui::VKEY_RETURN) {
     // Pressing Return/Enter starts the search (unless text box is empty).
-    base::string16 find_string = find_text_->text();
+    base::string16 find_string = find_text_->GetText();
     if (!find_string.empty()) {
       FindBarController* controller = find_bar_host()->GetFindBarController();
       FindTabHelper* find_tab_helper =
@@ -429,8 +429,8 @@ bool FindBarView::HandleKeyEvent(views::Textfield* sender,
 void FindBarView::OnAfterUserAction(views::Textfield* sender) {
   // The composition text wouldn't be what the user is really looking for.
   // We delay the search until the user commits the composition text.
-  if (!sender->IsIMEComposing() && sender->text() != last_searched_text_)
-    Find(sender->text());
+  if (!sender->IsIMEComposing() && sender->GetText() != last_searched_text_)
+    Find(sender->GetText());
 }
 
 void FindBarView::OnAfterPaste() {