Merge NativeTextfieldViews into views::Textfield.

chrome/browser/chromeos/options/vpn_config_view.cc

Index: chrome/browser/chromeos/options/vpn_config_view.cc
diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc
index edd4a4cd38933a6463318902c7757edf49d034ac..eaef421b2a3d090a5595de0a0ff0e10b6b38a98b 100644
--- a/chrome/browser/chromeos/options/vpn_config_view.cc
+++ b/chrome/browser/chromeos/options/vpn_config_view.cc
@@ -314,7 +314,7 @@ void VPNConfigView::ContentsChanged(views::Textfield* sender,
   if (sender == server_textfield_ && !service_text_modified_) {
     // Set the service name to the server name up to '.', unless it has
     // been explicitly set by the user.
-    base::string16 server = server_textfield_->text();
+    base::string16 server = server_textfield_->GetText();
     base::string16::size_type n = server.find_first_of(L'.');
     service_name_from_server_ = server.substr(0, n);
     service_textfield_->SetText(service_name_from_server_);
@@ -1024,7 +1024,7 @@ const std::string VPNConfigView::GetTextFromField(views::Textfield* textfield,
                                                   bool trim_whitespace) const {
   if (!textfield)
     return std::string();
-  std::string untrimmed = base::UTF16ToUTF8(textfield->text());
+  std::string untrimmed = base::UTF16ToUTF8(textfield->GetText());
   if (!trim_whitespace)
     return untrimmed;
   std::string result;