Create an autofill Suggestion class

android_webview/native/aw_autofill_client.h

Index: android_webview/native/aw_autofill_client.h
diff --git a/android_webview/native/aw_autofill_client.h b/android_webview/native/aw_autofill_client.h
index 0d081690b08e48d8f9d45a8faf06be74cf1787cc..a6158fa769bc87c44c4f8c441e080da5d0aa2ea5 100644
--- a/android_webview/native/aw_autofill_client.h
+++ b/android_webview/native/aw_autofill_client.h
@@ -73,10 +73,7 @@ class AwAutofillClient : public autofill::AutofillClient,
   virtual void ShowAutofillPopup(
       const gfx::RectF& element_bounds,
       base::i18n::TextDirection text_direction,
-      const std::vector<base::string16>& values,
-      const std::vector<base::string16>& labels,
-      const std::vector<base::string16>& icons,
-      const std::vector<int>& identifiers,
+      const std::vector<autofill::Suggestion>& suggestions,
       base::WeakPtr<autofill::AutofillPopupDelegate> delegate) override;
   virtual void UpdateAutofillPopupDataListValues(
       const std::vector<base::string16>& values,
@@ -97,11 +94,10 @@ class AwAutofillClient : public autofill::AutofillClient,
   AwAutofillClient(content::WebContents* web_contents);
   friend class content::WebContentsUserData<AwAutofillClient>;
 
-  void ShowAutofillPopupImpl(const gfx::RectF& element_bounds,
-                             bool is_rtl,
-                             const std::vector<base::string16>& values,
-                             const std::vector<base::string16>& labels,
-                             const std::vector<int>& identifiers);
+  void ShowAutofillPopupImpl(
+      const gfx::RectF& element_bounds,
+      bool is_rtl,
+      const std::vector<autofill::Suggestion>& suggestions);
 
   // The web_contents associated with this delegate.
   content::WebContents* web_contents_;
@@ -109,8 +105,7 @@ class AwAutofillClient : public autofill::AutofillClient,
   JavaObjectWeakGlobalRef java_ref_;
 
   // The current Autofill query values.
-  std::vector<base::string16> values_;
-  std::vector<int> identifiers_;
+  std::vector<autofill::Suggestion> suggestions_;
   base::WeakPtr<autofill::AutofillPopupDelegate> delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(AwAutofillClient);