[Autofill] Distinguish between native field types and potentially HTML field types.

chrome/browser/ui/autofill/mock_autofill_dialog_view_delegate.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_MOCK_AUTOFILL_DIALOG_VIEW_DELEGATE_H_
 #define CHROME_BROWSER_UI_AUTOFILL_MOCK_AUTOFILL_DIALOG_VIEW_DELEGATE_H_
 
 #include "chrome/browser/ui/autofill/autofill_dialog_view_delegate.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ skipping 21 matching lines @@
   MOCK_CONST_METHOD0(ButtonStripImage, gfx::Image());
   MOCK_CONST_METHOD0(GetDialogButtons, int());
   MOCK_CONST_METHOD0(ShouldShowDetailArea, bool());
   MOCK_CONST_METHOD1(IsDialogButtonEnabled, bool(ui::DialogButton button));
   MOCK_CONST_METHOD0(GetDialogOverlay, DialogOverlayState());
   MOCK_METHOD0(LegalDocumentLinks, const std::vector<ui::Range>&());
   MOCK_CONST_METHOD1(SectionIsActive, bool(DialogSection));
   MOCK_CONST_METHOD1(RequestedFieldsForSection,
                      const DetailInputs&(DialogSection));
   MOCK_METHOD1(ComboboxModelForAutofillType,
-               ui::ComboboxModel*(AutofillFieldType));
+               ui::ComboboxModel*(ServerFieldType));
   MOCK_METHOD1(MenuModelForSection, ui::MenuModel*(DialogSection));
   MOCK_CONST_METHOD1(LabelForSection, string16(DialogSection section));
   MOCK_METHOD1(SuggestionStateForSection, SuggestionState(DialogSection));
   MOCK_METHOD1(EditClickedForSection, void(DialogSection section));
   MOCK_METHOD1(EditCancelledForSection, void(DialogSection section));
   MOCK_CONST_METHOD2(IconForField,
-                     gfx::Image(AutofillFieldType, const string16&));
+                     gfx::Image(ServerFieldType, const string16&));
   MOCK_METHOD3(InputValidityMessage,
-      string16(DialogSection, AutofillFieldType, const string16&));
+      string16(DialogSection, ServerFieldType, const string16&));
   MOCK_METHOD3(InputsAreValid, ValidityData(DialogSection,
                                             const DetailOutputMap&,
                                             ValidationType));
   MOCK_METHOD6(UserEditedOrActivatedInput,void(DialogSection,
                                                const DetailInput*,
                                                gfx::NativeView,
                                                const gfx::Rect&,
                                                const string16&,
                                                bool was_edit));
   MOCK_METHOD1(HandleKeyPressEventInInput,
@@ skipping 15 matching lines @@
   MOCK_METHOD0(web_contents, content::WebContents*());
  private:
   DetailInputs default_inputs_;
   DetailInputs cc_default_inputs_;  // Default inputs for SECTION_CC.
   std::vector<ui::Range> range_;
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_MOCK_AUTOFILL_DIALOG_VIEW_DELEGATE_H_