Show icons in Android web autofill dropdown

chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupBridge.java

 // Copyright 2014 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.
 
 package org.chromium.chrome.browser.autofill;
 
 import android.app.Activity;
 import android.os.Handler;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
+import org.chromium.chrome.browser.ResourceId;
+import org.chromium.ui.DropdownItem;
 import org.chromium.ui.autofill.AutofillPopup;
 import org.chromium.ui.autofill.AutofillPopup.AutofillPopupDelegate;
 import org.chromium.ui.autofill.AutofillSuggestion;
 import org.chromium.ui.base.ViewAndroid;
 import org.chromium.ui.base.ViewAndroidDelegate;
 import org.chromium.ui.base.WindowAndroid;
 
 /**
 * JNI call glue for AutofillExternalDelagate C++ and Java objects.
 */
@@ skipping 72 matching lines @@
     @CalledByNative
     private static AutofillSuggestion[] createAutofillSuggestionArray(int size) {
         return new AutofillSuggestion[size];
     }
 
     /**
      * @param array AutofillSuggestion array that should get a new suggestion added.
      * @param index Index in the array where to place a new suggestion.
      * @param label First line of the suggestion.
      * @param sublabel Second line of the suggestion.
-     * @param uniqueId Unique suggestion id.
+     * @param iconId The resource ID for the icon associated with the suggestion, or 0 for no icon.
+     * @param suggestionId Identifier for the suggestion type.
      */
     @CalledByNative
     private static void addToAutofillSuggestionArray(AutofillSuggestion[] array, int index,
-            String label, String sublabel, int uniqueId) {
-        array[index] = new AutofillSuggestion(label, sublabel, uniqueId);
+            String label, String sublabel, int iconId, int suggestionId) {
+        int drawableId = iconId == 0 ? DropdownItem.NO_ICON : ResourceId.mapToDrawableId(iconId);
+        array[index] = new AutofillSuggestion(label, sublabel, drawableId, suggestionId);
     }
 
     private native void nativePopupDismissed(long nativeAutofillPopupViewAndroid);
     private native void nativeSuggestionSelected(long nativeAutofillPopupViewAndroid,
             int listIndex);
 }