Merge NativeTextfieldViews into views::Textfield.

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

Index: chrome/browser/ui/views/autofill/autofill_dialog_views.cc
diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
index 50571b7a99b13f49fa0ac2f6ddc1e7203c931ecf..6297150cf7e9b48aeac2691f2a30f678a42ac682 100644
--- a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
+++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
@@ -1343,7 +1343,7 @@ void AutofillDialogViews::GetUserInput(DialogSection section,
   DetailsGroup* group = GroupForSection(section);
   for (TextfieldMap::const_iterator it = group->textfields.begin();
        it != group->textfields.end(); ++it) {
-    output->insert(std::make_pair(it->first, it->second->text()));
+    output->insert(std::make_pair(it->first, it->second->GetText()));
   }
   for (ComboboxMap::const_iterator it = group->comboboxes.begin();
        it != group->comboboxes.end(); ++it) {
@@ -1354,7 +1354,7 @@ void AutofillDialogViews::GetUserInput(DialogSection section,
 
 base::string16 AutofillDialogViews::GetCvc() {
   return GroupForSection(GetCreditCardSection())->suggested_info->
-      decorated_textfield()->text();
+      decorated_textfield()->GetText();
 }
 
 bool AutofillDialogViews::HitTestInput(const DetailInput& input,
@@ -1446,7 +1446,7 @@ base::string16 AutofillDialogViews::GetTextContentsOfInput(
     const DetailInput& input) {
   views::Textfield* textfield = TextfieldForType(input.type);
   if (textfield)
-    return textfield->text();
+    return textfield->GetText();
 
   views::Combobox* combobox = ComboboxForType(input.type);
   if (combobox)
@@ -2057,7 +2057,7 @@ void AutofillDialogViews::UpdateSectionImpl(
 
     if (text_mapping != group->textfields.end()) {
       DecoratedTextfield* decorated = text_mapping->second;
-      if (decorated->text().empty() || clobber_inputs)
+      if (decorated->GetText().empty() || clobber_inputs)
         decorated->SetText(input.initial_value);
     }
 
@@ -2215,7 +2215,7 @@ bool AutofillDialogViews::ValidateGroup(const DetailsGroup& group,
       if (!iter->second->editable())
         continue;
 
-      detail_outputs[iter->first] = iter->second->text();
+      detail_outputs[iter->first] = iter->second->GetText();
     }
     for (ComboboxMap::const_iterator iter = group.comboboxes.begin();
          iter != group.comboboxes.end(); ++iter) {
@@ -2231,7 +2231,7 @@ bool AutofillDialogViews::ValidateGroup(const DetailsGroup& group,
     DecoratedTextfield* decorated_cvc =
         group.suggested_info->decorated_textfield();
     if (decorated_cvc->visible())
-      detail_outputs[CREDIT_CARD_VERIFICATION_CODE] = decorated_cvc->text();
+      detail_outputs[CREDIT_CARD_VERIFICATION_CODE] = decorated_cvc->GetText();
   }
 
   ValidityMessages validity = delegate_->InputsAreValid(group.section,
@@ -2279,7 +2279,7 @@ void AutofillDialogViews::TextfieldEditedOrActivated(
                                             iter->first,
                                             GetWidget()->GetNativeView(),
                                             textfield->GetBoundsInScreen(),
-                                            textfield->text(),
+                                            textfield->GetText(),
                                             was_edit);
       type = iter->first;
       break;
@@ -2301,7 +2301,7 @@ void AutofillDialogViews::TextfieldEditedOrActivated(
     SetValidityForInput(
         decorated,
         delegate_->InputValidityMessage(group->section, type,
-                                        textfield->text()));
+                                        textfield->GetText()));
 
     // If the field transitioned from invalid to valid, re-validate the group,
     // since inter-field checks become meaningful with valid fields.