Factor out ContentViewAndroidDelegate

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 ca4119d62f4e8fe3795d351010d4e283bfa3e0ad..2d4feb2d8ea86b16996e2d7c165959d5f030bb10 100644
--- a/android_webview/native/aw_autofill_client.h
+++ b/android_webview/native/aw_autofill_client.h
@@ -105,6 +105,7 @@ class AwAutofillClient : public autofill::AutofillClient,
   void SuggestionSelected(JNIEnv* env,
                           const base::android::JavaParamRef<jobject>& obj,
                           jint position);
+  void SetViewAndroid(ui::ViewAndroid* view_android);
 
  private:
   AwAutofillClient(content::WebContents* web_contents);
@@ -120,6 +121,9 @@ class AwAutofillClient : public autofill::AutofillClient,
   bool save_form_data_;
   JavaObjectWeakGlobalRef java_ref_;
 
+  base::android::ScopedJavaGlobalRef<jobject> anchor_view_;
+  ui::ViewAndroid* view_android_;
+
   // The current Autofill query values.
   std::vector<autofill::Suggestion> suggestions_;
   base::WeakPtr<autofill::AutofillPopupDelegate> delegate_;