Merge 187018

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

Index: chrome/browser/ui/android/autofill/autofill_popup_view_android.cc
===================================================================
--- chrome/browser/ui/android/autofill/autofill_popup_view_android.cc	(revision 187366)
+++ chrome/browser/ui/android/autofill/autofill_popup_view_android.cc	(working copy)
@@ -38,7 +38,8 @@
   AutofillPopupView::Hide();
 
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_AutofillPopupGlue_dismiss(env, java_object_.obj());
+  Java_AutofillPopupGlue_hide(env, java_object_.obj());
+  delete this;
 }
 
 void AutofillPopupViewAndroid::UpdateBoundsAndRedrawPopup() {
@@ -84,8 +85,8 @@
   controller_->AcceptSuggestion(list_index);
 }
 
-void AutofillPopupViewAndroid::Dismissed(JNIEnv* env, jobject obj) {
-  delete this;
+void AutofillPopupViewAndroid::RequestHide(JNIEnv* env, jobject obj) {
+  controller_->Hide();
 }
 
 void AutofillPopupViewAndroid::InvalidateRow(size_t) {}