Merge NativeTextfieldViews into views::Textfield.

ui/views/examples/textfield_example.cc

Index: ui/views/examples/textfield_example.cc
diff --git a/ui/views/examples/textfield_example.cc b/ui/views/examples/textfield_example.cc
index 4ae31f90d8f2d30094c0078dc0f2cde30c1defb2..404718a02f383ac7c2dc8db5a467d95272f25656 100644
--- a/ui/views/examples/textfield_example.cc
+++ b/ui/views/examples/textfield_example.cc
@@ -103,7 +103,7 @@ bool TextfieldExample::HandleMouseEvent(Textfield* sender,
 
 void TextfieldExample::ButtonPressed(Button* sender, const ui::Event& event) {
   if (sender == show_password_) {
-    PrintStatus("Password [%s]", UTF16ToUTF8(password_->text()).c_str());
+    PrintStatus("Password [%s]", UTF16ToUTF8(password_->GetText()).c_str());
   } else if (sender == clear_all_) {
     base::string16 empty;
     name_->SetText(empty);
@@ -118,12 +118,12 @@ void TextfieldExample::ButtonPressed(Button* sender, const ui::Event& event) {
     password_->SetText(ASCIIToUTF16("[set]"));
     read_only_->SetText(ASCIIToUTF16("[set]"));
   } else if (sender == set_style_) {
-    if (!name_->text().empty()) {
+    if (!name_->GetText().empty()) {
       name_->SetColor(SK_ColorGREEN);
       name_->SetStyle(gfx::BOLD, true);
 
-      if (name_->text().length() >= 5) {
-        size_t fifth = name_->text().length() / 5;
+      if (name_->GetText().length() >= 5) {
+        size_t fifth = name_->GetText().length() / 5;
         const gfx::Range big_range(1 * fifth, 4 * fifth);
         name_->ApplyStyle(gfx::BOLD, false, big_range);
         name_->ApplyStyle(gfx::UNDERLINE, true, big_range);