Remove java ViewAndroid class

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index 46d3c7dec2a71f0bbaaa573ef25b897753c88213..3dc0d71c13b0e9b8e9bad975d1dcecfd5d0a1a09 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -82,7 +82,6 @@ import org.chromium.content_public.browser.GestureStateListener;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.browser.WebContentsObserver;
 import org.chromium.ui.base.DeviceFormFactor;
-import org.chromium.ui.base.ViewAndroid;
 import org.chromium.ui.base.ViewAndroidDelegate;
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.base.ime.TextInputType;
@@ -588,8 +587,6 @@ public class ContentViewCore
     // onNativeFlingStopped() is called asynchronously.
     private int mPotentiallyActiveFlingCount;
 
-    private ViewAndroid mViewAndroid;
-
     private SmartClipDataListener mSmartClipDataListener = null;
     private ObserverList<ContainerViewObserver> mContainerViewObservers;
 
@@ -749,11 +746,6 @@ public class ContentViewCore
         return mInputConnection;
     }
 
-    @VisibleForTesting
-    ViewAndroid getViewAndroid() {
-        return mViewAndroid;
-    }
-
     private ImeAdapter createImeAdapter() {
         return new ImeAdapter(mInputMethodManagerWrapper,
                 new ImeAdapter.ImeAdapterDelegate() {
@@ -832,12 +824,11 @@ public class ContentViewCore
         setContainerView(containerView);
         long windowNativePointer = windowAndroid.getNativePointer();
         assert windowNativePointer != 0;
-        createViewAndroid(windowAndroid);
 
         mZoomControlsDelegate = NO_OP_ZOOM_CONTROLS_DELEGATE;
 
         mNativeContentViewCore = nativeInit(
-                webContents, mViewAndroid, windowNativePointer, mRetainedJavaScriptObjects);
+                webContents, mViewAndroidDelegate, windowNativePointer, mRetainedJavaScriptObjects);
         mWebContents = nativeGetWebContentsAndroid(mNativeContentViewCore);
 
         setContainerViewInternals(internalDispatcher);
@@ -857,11 +848,6 @@ public class ContentViewCore
                 new ContentViewAndroidDelegate(mContext, mContainerView, mRenderCoordinates);
     }
 
-    @VisibleForTesting
-    void createViewAndroid(WindowAndroid windowAndroid) {
-        mViewAndroid = new ViewAndroid(mViewAndroidDelegate);
-    }
-
     /**
      * Sets a new container view for this {@link ContentViewCore}.
      *
@@ -3124,7 +3110,7 @@ public class ContentViewCore
         if (potentiallyActiveFlingCount > 0) updateGestureStateListener(GestureEventType.FLING_END);
     }
 
-    private native long nativeInit(WebContents webContents, ViewAndroid viewAndroid,
+    private native long nativeInit(WebContents webContents, ViewAndroidDelegate viewAndroidDelegate,
             long windowAndroidPtr, HashSet<Object> retainedObjectSet);
     private static native ContentViewCore nativeFromWebContentsAndroid(WebContents webContents);
     ContentVideoViewClient getContentVideoViewClient() {