Merge NativeTextfieldViews into views::Textfield.

chrome/browser/chromeos/options/wifi_config_view.cc

Index: chrome/browser/chromeos/options/wifi_config_view.cc
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
index c0e1bcdaa65eb66f5cd9c027f6e2d28c5b7aafb3..727d1381ce3053e6cd9cd295e118e97d004f84f1 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -407,7 +407,7 @@ bool WifiConfigView::CanLogin() {
   if (passphrase_textfield_ != NULL &&
       passphrase_textfield_->enabled() &&
       !passphrase_textfield_->show_fake() &&
-      passphrase_textfield_->text().length() < kMinWirelessPasswordLen)
+      passphrase_textfield_->GetText().length() < kMinWirelessPasswordLen)
     return false;
 
   // If we're using EAP, we must have a method.
@@ -732,7 +732,7 @@ bool WifiConfigView::Login() {
 std::string WifiConfigView::GetSsid() const {
   std::string result;
   if (ssid_textfield_ != NULL) {
-    std::string untrimmed = base::UTF16ToUTF8(ssid_textfield_->text());
+    std::string untrimmed = base::UTF16ToUTF8(ssid_textfield_->GetText());
     TrimWhitespaceASCII(untrimmed, TRIM_ALL, &result);
   }
   return result;
@@ -741,7 +741,7 @@ std::string WifiConfigView::GetSsid() const {
 std::string WifiConfigView::GetPassphrase() const {
   std::string result;
   if (passphrase_textfield_ != NULL)
-    result = base::UTF16ToUTF8(passphrase_textfield_->text());
+    result = base::UTF16ToUTF8(passphrase_textfield_->GetText());
   return result;
 }
 
@@ -820,7 +820,7 @@ bool WifiConfigView::GetEapUseSystemCas() const {
 
 std::string WifiConfigView::GetEapSubjectMatch() const {
   DCHECK(subject_match_textfield_);
-  return base::UTF16ToUTF8(subject_match_textfield_->text());
+  return base::UTF16ToUTF8(subject_match_textfield_->GetText());
 }
 
 std::string WifiConfigView::GetEapClientCertPkcs11Id() const {
@@ -837,12 +837,12 @@ std::string WifiConfigView::GetEapClientCertPkcs11Id() const {
 
 std::string WifiConfigView::GetEapIdentity() const {
   DCHECK(identity_textfield_);
-  return base::UTF16ToUTF8(identity_textfield_->text());
+  return base::UTF16ToUTF8(identity_textfield_->GetText());
 }
 
 std::string WifiConfigView::GetEapAnonymousIdentity() const {
   DCHECK(identity_anonymous_textfield_);
-  return base::UTF16ToUTF8(identity_anonymous_textfield_->text());
+  return base::UTF16ToUTF8(identity_anonymous_textfield_->GetText());
 }
 
 void WifiConfigView::SetEapProperties(base::DictionaryValue* properties) {