Merge NativeTextfieldViews into views::Textfield.

chrome/browser/ui/views/edit_search_engine_dialog.cc

Index: chrome/browser/ui/views/edit_search_engine_dialog.cc
diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc
index 711422266c1827483262057fb947c0a77f29e6d1..21e2d5abe087ef4fe6377e9095abf9516432276f 100644
--- a/chrome/browser/ui/views/edit_search_engine_dialog.cc
+++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc
@@ -81,9 +81,9 @@ base::string16 EditSearchEngineDialog::GetWindowTitle() const {
 bool EditSearchEngineDialog::IsDialogButtonEnabled(
     ui::DialogButton button) const {
   if (button == ui::DIALOG_BUTTON_OK) {
-    return (controller_->IsKeywordValid(keyword_tf_->text()) &&
-            controller_->IsTitleValid(title_tf_->text()) &&
-            controller_->IsURLValid(base::UTF16ToUTF8(url_tf_->text())));
+    return (controller_->IsKeywordValid(keyword_tf_->GetText()) &&
+            controller_->IsTitleValid(title_tf_->GetText()) &&
+            controller_->IsURLValid(base::UTF16ToUTF8(url_tf_->GetText())));
   }
   return true;
 }
@@ -94,8 +94,8 @@ bool EditSearchEngineDialog::Cancel() {
 }
 
 bool EditSearchEngineDialog::Accept() {
-  controller_->AcceptAddOrEdit(title_tf_->text(), keyword_tf_->text(),
-                               base::UTF16ToUTF8(url_tf_->text()));
+  controller_->AcceptAddOrEdit(title_tf_->GetText(), keyword_tf_->GetText(),
+                               base::UTF16ToUTF8(url_tf_->GetText()));
   return true;
 }
 
@@ -233,13 +233,14 @@ Textfield* EditSearchEngineDialog::CreateTextfield(const base::string16& text,
 }
 
 void EditSearchEngineDialog::UpdateImageViews() {
-  UpdateImageView(keyword_iv_, controller_->IsKeywordValid(keyword_tf_->text()),
-                  IDS_SEARCH_ENGINES_INVALID_KEYWORD_TT);
+  UpdateImageView(keyword_iv_,
+      controller_->IsKeywordValid(keyword_tf_->GetText()),
+      IDS_SEARCH_ENGINES_INVALID_KEYWORD_TT);
   UpdateImageView(url_iv_,
-                  controller_->IsURLValid(base::UTF16ToUTF8(url_tf_->text())),
-                  IDS_SEARCH_ENGINES_INVALID_URL_TT);
-  UpdateImageView(title_iv_, controller_->IsTitleValid(title_tf_->text()),
-                  IDS_SEARCH_ENGINES_INVALID_TITLE_TT);
+      controller_->IsURLValid(base::UTF16ToUTF8(url_tf_->GetText())),
+      IDS_SEARCH_ENGINES_INVALID_URL_TT);
+  UpdateImageView(title_iv_, controller_->IsTitleValid(title_tf_->GetText()),
+      IDS_SEARCH_ENGINES_INVALID_TITLE_TT);
 }
 
 void EditSearchEngineDialog::UpdateImageView(views::ImageView* image_view,