Cleaning up Android's Autofill call suggestionSelected.

Cleaning up Android's Autofill call suggestionSelected to remove unused
parameters from the function.

BUG=


Review URL: https://chromiumcodereview.appspot.com/11778043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175778 0039d316-1c4b-4281-b951-d872f2087c98

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

@@ -64,10 +64,8 @@ public class AutofillPopup extends ListPopupWindow implements AdapterView.OnItem
         /**
          * Handles the selection of an Autofill suggestion from an AutofillPopup.
          * @param listIndex The index of the selected Autofill suggestion.
-         * @param value The value of the selected Autofill suggestion.
-         * @param uniqueId The unique id of the selected Autofill suggestion.
          */
-        public void suggestionSelected(int listIndex, String value, int uniqueId);
+        public void suggestionSelected(int listIndex);
     }
 
     // ListPopupWindow needs an anchor view to determine it's size and position.  We create a view
@@ -223,14 +221,7 @@ public class AutofillPopup extends ListPopupWindow implements AdapterView.OnItem
 
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        try {
-            ListAdapter adapter = (ListAdapter) parent.getAdapter();
-            AutofillSuggestion data = (AutofillSuggestion) adapter.getItem(position);
-            mAutofillCallback.suggestionSelected(position, data.mName, data.mUniqueId);
-        } catch (ClassCastException e) {
-            Log.w("AutofillWindow", "error in onItemClick", e);
-            assert false;
-        }
+        mAutofillCallback.suggestionSelected(position);
     }
 
 }

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

@@ -35,8 +35,8 @@ public class AutofillPopupGlue implements AutofillPopupDelegate{
     }
 
     @Override
-    public void suggestionSelected(int listIndex, String value, int uniqueId) {
-        nativeSuggestionSelected(mNativeAutofillPopup, listIndex, value, uniqueId);
+    public void suggestionSelected(int listIndex) {
+        nativeSuggestionSelected(mNativeAutofillPopup, listIndex);
     }
 
     /**
@@ -84,6 +84,6 @@ public class AutofillPopupGlue implements AutofillPopupDelegate{
 
     private native void nativeDismissed(int nativeAutofillPopupViewAndroid);
     private native void nativeSuggestionSelected(int nativeAutofillPopupViewAndroid,
-            int listIndex, String value, int uniqueId);
+            int listIndex);
 
 }
\ No newline at end of file

chrome/android/javatests/src/org/chromium/chrome/browser/test/AutofillTest.java

@@ -76,19 +76,15 @@ public class AutofillTest extends ChromiumTestShellTestBase {
         private static final int CALLBACK_TIMEOUT_MS = 4000;
         private static final int CHECK_INTERVAL_MS = 100;
         private final AtomicBoolean mGotPopupSelection = new AtomicBoolean(false);
-        private Pair<String, Integer> mSelectedData = null;
+        public int mListIndex = -1;
 
         @Override
-        public void suggestionSelected(int listIndex, String value, int uniqueId) {
-            mSelectedData = new Pair<String, Integer>(value, uniqueId);
+        public void suggestionSelected(int listIndex) {
+            mListIndex = listIndex;
             mAutofillPopup.dismiss();
             mGotPopupSelection.set(true);
         }
 
-        public Pair<String, Integer> getSelectedData() {
-            return mSelectedData;
-        }
-
         public boolean waitForCallback() throws InterruptedException {
             return CriteriaHelper.pollForCriteria(new Criteria() {
                 @Override
@@ -157,8 +153,6 @@ public class AutofillTest extends ChromiumTestShellTestBase {
         touchCommon.singleClickViewRelative(mAutofillPopup.getListView(), 10, 10);
         assertTrue(mMockAutofillCallback.waitForCallback());
 
-        Pair<String, Integer> selected = mMockAutofillCallback.getSelectedData();
-        assertEquals(suggestions[0].mName, selected.first);
-        assertEquals(suggestions[0].mUniqueId, selected.second.intValue());
+        assertEquals(0, mMockAutofillCallback.mListIndex);
     }
 }

chrome/browser/ui/android/autofill/autofill_popup_view_android.cc

@@ -80,9 +80,7 @@ void AutofillPopupViewAndroid::UpdateBoundsAndRedrawPopup() {
 
 void AutofillPopupViewAndroid::SuggestionSelected(JNIEnv* env,
                                                   jobject obj,
-                                                  jint list_index,
-                                                  jstring /*name*/,
-                                                  jint /*identifier*/) {
+                                                  jint list_index) {
   controller_->AcceptSuggestion(list_index);
 }
 

chrome/browser/ui/android/autofill/autofill_popup_view_android.h

@@ -24,13 +24,8 @@ class AutofillPopupViewAndroid : public AutofillPopupView {
   // --------------------------------------------------------------------------
   // Methods called from Java via JNI
   // --------------------------------------------------------------------------
-  // Called when an autofill item was selected. TODO(estade): remove |name| and
-  // |unique_id|.
-  void SuggestionSelected(JNIEnv* env,
-                          jobject obj,
-                          jint list_index,
-                          jstring name,
-                          jint unique_id);
+  // Called when an autofill item was selected.
+  void SuggestionSelected(JNIEnv* env, jobject obj, jint list_index);
 
   void Dismissed(JNIEnv *env, jobject obj);