Merge NativeTextfieldViews into views::Textfield.

chrome/browser/chromeos/options/vpn_config_view.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 "chrome/browser/chromeos/options/vpn_config_view.h"
 
 #include "ash/system/chromeos/network/network_connect.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 296 matching lines @@
     return false;
 
   return true;
 }
 
 void VPNConfigView::ContentsChanged(views::Textfield* sender,
                                     const base::string16& new_contents) {
   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_);
   }
   if (sender == service_textfield_) {
     if (new_contents.empty())
       service_text_modified_ = false;
     else if (new_contents != service_name_from_server_)
       service_text_modified_ = true;
   }
@@ skipping 689 matching lines @@
       !CertLibrary::Get()->IsCertHardwareBackedAt(
           CertLibrary::CERT_TYPE_USER, index))
     return false;
   return true;
 }
 
 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;
   TrimWhitespaceASCII(untrimmed, TRIM_ALL, &result);
   return result;
 }
 
 const std::string VPNConfigView::GetPassphraseFromField(
     PassphraseTextfield* textfield) const {
   if (!textfield)
@@ skipping 14 matching lines @@
   property_ui_data->ParseOncProperty(
       onc_source,
       onc,
       base::StringPrintf("%s.%s.%s",
                          ::onc::network_config::kVPN,
                          dict_key.c_str(),
                          key.c_str()));
 }
 
 }  // namespace chromeos