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 ae645d3f6ea727b6ccc7a2aebd10ba468ff5e623..a426bcbb62c04d8522c1e2d6742bb9fc9bedbbf6 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -61,8 +61,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();
   cc::Layer* GetLayer() const override;
   bool ShowPastePopup(int x, int y) override;
   void PauseOrResumeGeolocation(bool should_pause) override;
@@ -403,8 +402,6 @@ class ContentViewCoreImpl : public ContentViewCore,
 
   void OnShowUnhandledTapUIIfNeeded(int x_dip, int y_dip);
 
-  ui::ViewAndroid* GetViewAndroid();
-
  private:
   class ContentViewUserData;
 
@@ -452,6 +449,9 @@ class ContentViewCoreImpl : public ContentViewCore,
   // A weak reference to the Java ContentViewCore object.
   JavaObjectWeakGlobalRef java_ref_;
 
+  // Select popup view
+  std::unique_ptr<ui::ViewAndroid::ScopedAnchorView> select_popup_;
+
   ui::ViewAndroid view_;
 
   // Reference to the current WebContents used to determine how and what to