Create an autofill Suggestion class

chrome/browser/ui/autofill/autofill_dialog_controller_impl.h

Index: chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
index 8053a08b4ccb356de398c5572f53c95d4c8379cd..732deced97080a10e160f7c0d5f7b9f06b646b1d 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
@@ -468,11 +468,10 @@ class AutofillDialogControllerImpl
 
   // Suggests address completions using the downloaded i18n validation rules.
   // Stores the suggestions in |i18n_validator_suggestions_|.
-  void GetI18nValidatorSuggestions(DialogSection section,
-                                   ServerFieldType type,
-                                   std::vector<base::string16>* popup_values,
-                                   std::vector<base::string16>* popup_labels,
-                                   std::vector<base::string16>* popup_icons);
+  void GetI18nValidatorSuggestions(
+      DialogSection section,
+      ServerFieldType type,
+      std::vector<autofill::Suggestion>* popup_suggestions);
 
   // Like RequestedFieldsForSection, but returns a pointer.
   DetailInputs* MutableRequestedFieldsForSection(DialogSection section);
@@ -743,8 +742,10 @@ class AutofillDialogControllerImpl
   base::string16 transaction_amount_;
   base::string16 transaction_currency_;
 
-  // The GUIDs for the currently showing unverified profiles popup.
-  std::vector<PersonalDataManager::GUIDPair> popup_guids_;
+  // The IDs for the currently showing unverified profiles popup. This will
+  // be the first section in the list. The rest of the items will be the
+  // i18n_validator_suggestions_.
+  std::vector<autofill::SuggestionBackendID> popup_suggestion_ids_;
 
   // The autofill suggestions based on downloaded i18n validation rules.
   std::vector< ::i18n::addressinput::AddressData> i18n_validator_suggestions_;