Factor out ContentViewAndroidDelegate

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

Index: chrome/browser/ui/android/autofill/autofill_popup_view_android.cc
diff --git a/chrome/browser/ui/android/autofill/autofill_popup_view_android.cc b/chrome/browser/ui/android/autofill/autofill_popup_view_android.cc
index 11f2514e0ed5e3ee4441cf85d270a424e98904f3..d9a20c9c6b8ed598302f81ddc6173bacc17047dc 100644
--- a/chrome/browser/ui/android/autofill/autofill_popup_view_android.cc
+++ b/chrome/browser/ui/android/autofill/autofill_popup_view_android.cc
@@ -39,11 +39,14 @@ void AutofillPopupViewAndroid::Show() {
   ui::ViewAndroid* view_android = controller_->container_view();
 
   DCHECK(view_android);
+  popup_view_ = view_android->AcquireAnchorView();
+  const ScopedJavaLocalRef<jobject> view = popup_view_.view();
+  if (view.is_null())
+    return;
 
   java_object_.Reset(Java_AutofillPopupBridge_create(
-      env, reinterpret_cast<intptr_t>(this),
-      view_android->GetWindowAndroid()->GetJavaObject().obj(),
-      view_android->GetViewAndroidDelegate().obj()));
+      env, view.obj(), reinterpret_cast<intptr_t>(this),
+      view_android->GetWindowAndroid()->GetJavaObject().obj()));
 
   UpdateBoundsAndRedrawPopup();
 }
@@ -51,18 +54,27 @@ void AutofillPopupViewAndroid::Show() {
 void AutofillPopupViewAndroid::Hide() {
   controller_ = NULL;
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_AutofillPopupBridge_dismiss(env, java_object_.obj());
+  if (!java_object_.is_null()) {
+    Java_AutofillPopupBridge_dismiss(env, java_object_.obj());
+  } else {
+    // Hide() should delete |this| either via Java dismiss or directly.
+    delete this;
+  }
 }
 
 void AutofillPopupViewAndroid::UpdateBoundsAndRedrawPopup() {
+  if (java_object_.is_null())
+    return;
+
+  const ScopedJavaLocalRef<jobject> view = popup_view_.view();
+  if (view.is_null())
+    return;
+
+  ui::ViewAndroid* view_android = controller_->container_view();
+
+  DCHECK(view_android);
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_AutofillPopupBridge_setAnchorRect(
-      env,
-      java_object_.obj(),
-      controller_->element_bounds().x(),
-      controller_->element_bounds().y(),
-      controller_->element_bounds().width(),
-      controller_->element_bounds().height());
+  view_android->SetAnchorRect(view, controller_->element_bounds());
 
   size_t count = controller_->GetLineCount();
   ScopedJavaLocalRef<jobjectArray> data_array =
@@ -109,7 +121,7 @@ void AutofillPopupViewAndroid::DeletionRequested(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint list_index) {
-  if (!controller_)
+  if (!controller_ || java_object_.is_null())
     return;
 
   base::string16 confirmation_title, confirmation_body;