Factor out ContentViewAndroidDelegate

content/browser/android/content_view_core_impl.h

Index: content/browser/android/content_view_core_impl.h
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
index 28ac05f084128d17ef76ae94e84f92af25869dc0..f3b053d1472ff82406f442981ec9f6958b735d3e 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -53,6 +53,7 @@ class ContentViewCoreImpl : public ContentViewCore,
       JNIEnv* env,
       jobject obj,
       WebContents* web_contents,
+      const base::android::JavaRef<jobject>& view_context,
       const base::android::JavaRef<jobject>& view_android_delegate,
       ui::WindowAndroid* window_android,
       jobject java_bridge_retained_object_set);
@@ -61,8 +62,7 @@ class ContentViewCoreImpl : public ContentViewCore,
   base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override;
   WebContents* GetWebContents() const override;
   ui::WindowAndroid* GetWindowAndroid() const override;
-  const base::android::JavaRef<jobject>& GetViewAndroidDelegate()
-      const override;
+  ui::ViewAndroid* GetViewAndroid() override;
   cc::Layer* GetLayer() const override;
   bool ShowPastePopup(int x, int y) override;
   float GetDpiScale() const override;
@@ -404,8 +404,6 @@ class ContentViewCoreImpl : public ContentViewCore,
 
   void OnShowUnhandledTapUIIfNeeded(int x_dip, int y_dip);
 
-  ui::ViewAndroid* GetViewAndroid();
-
  private:
   class ContentViewUserData;
 
@@ -453,6 +451,9 @@ class ContentViewCoreImpl : public ContentViewCore,
   // A weak reference to the Java ContentViewCore object.
   JavaObjectWeakGlobalRef java_ref_;
 
+  // Select popup view
+  base::android::ScopedJavaGlobalRef<jobject> select_popup_;
+
   ui::ViewAndroid view_;
 
   // Reference to the current WebContents used to determine how and what to