Merge NativeTextfieldViews into views::Textfield.

chrome/browser/ui/views/autofill/decorated_textfield.cc

Index: chrome/browser/ui/views/autofill/decorated_textfield.cc
diff --git a/chrome/browser/ui/views/autofill/decorated_textfield.cc b/chrome/browser/ui/views/autofill/decorated_textfield.cc
index fa3e816f95fbd7497dd65912d21bc21fb2063b31..20607a10fd2bad20a330e8e261027af365ccf696 100644
--- a/chrome/browser/ui/views/autofill/decorated_textfield.cc
+++ b/chrome/browser/ui/views/autofill/decorated_textfield.cc
@@ -10,7 +10,6 @@
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/focusable_border.h"
-#include "ui/views/controls/textfield/native_textfield_views.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 
 namespace {
@@ -125,7 +124,7 @@ views::View* DecoratedTextfield::GetEventHandlerForRect(const gfx::Rect& rect) {
   views::View* handler = views::Textfield::GetEventHandlerForRect(rect);
   if (handler->GetClassName() == TooltipIcon::kViewClassName)
     return handler;
-  return textfield_view_;
+  return this;
 }
 
 void DecoratedTextfield::OnFocus() {
@@ -171,7 +170,7 @@ void DecoratedTextfield::UpdateBackground() {
 
 void DecoratedTextfield::IconChanged() {
   // Don't show the icon if nothing else is showing.
-  icon_view_->SetVisible(editable_ || !text().empty());
+  icon_view_->SetVisible(editable_ || !GetText().empty());
 
   int icon_space = icon_view_ ?
       icon_view_->GetPreferredSize().width() + 2 * kTextfieldIconPadding : 0;