Let ImeAdapterAndroid have the same lifecycle as its Java peer

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 b8394ca23a122b07ceb199e6d97c1ffcb87213a3..bd27a7999c41132a14194aa76e6fa8b59699477e 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
@@ -494,8 +494,8 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
     }
 
     private ImeAdapter createImeAdapter() {
-        return new ImeAdapter(
-                new InputMethodManagerWrapper(mContext), new ImeAdapter.ImeAdapterDelegate() {
+        return new ImeAdapter(mWebContents, new InputMethodManagerWrapper(mContext),
+                new ImeAdapter.ImeAdapterDelegate() {
                     @Override
                     public void onImeEvent() {
                         mPopupZoomer.hide(true);
@@ -583,10 +583,9 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
 
         initPopupZoomer(mContext);
         mImeAdapter = createImeAdapter();
-        attachImeAdapter();
 
         mSelectionPopupController = new SelectionPopupController(mContext, windowAndroid,
-                webContents, viewDelegate.getContainerView(), mRenderCoordinates, mImeAdapter);
+                webContents, viewDelegate.getContainerView(), mRenderCoordinates);
         mSelectionPopupController.setCallback(ActionModeCallbackHelper.EMPTY_CALLBACK);
         mSelectionPopupController.setContainerView(getContainerView());
 
@@ -1752,16 +1751,14 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
     }
 
     @CalledByNative
-    private void updateImeAdapter(long nativeImeAdapterAndroid, int textInputType,
-            int textInputFlags, int textInputMode, String text, int selectionStart,
-            int selectionEnd, int compositionStart, int compositionEnd, boolean showImeIfNeeded,
-            boolean replyToRequest) {
+    private void updateImeAdapter(int textInputType, int textInputFlags, int textInputMode,
+            String text, int selectionStart, int selectionEnd, int compositionStart,
+            int compositionEnd, boolean showImeIfNeeded, boolean replyToRequest) {
         try {
             TraceEvent.begin("ContentViewCore.updateImeAdapter");
             boolean focusedNodeEditable = (textInputType != TextInputType.NONE);
             boolean focusedNodeIsPassword = (textInputType == TextInputType.PASSWORD);
 
-            mImeAdapter.attach(nativeImeAdapterAndroid);
             mImeAdapter.updateState(textInputType, textInputFlags, textInputMode, showImeIfNeeded,
                     text, selectionStart, selectionEnd, compositionStart, compositionEnd,
                     replyToRequest);
@@ -1778,11 +1775,6 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
         }
     }
 
-    @CalledByNative
-    private void forceUpdateImeAdapter(long nativeImeAdapterAndroid) {
-        mImeAdapter.attach(nativeImeAdapterAndroid);
-    }
-
     /**
      * Called (from native) when the <select> popup needs to be shown.
      * @param anchorView View anchored for popup.
@@ -1893,21 +1885,11 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
     @SuppressWarnings("unused")
     @CalledByNative
     private void onRenderProcessChange() {
-        attachImeAdapter();
         // Immediately sync closed caption settings to the new render process.
         mSystemCaptioningBridge.syncToListener(this);
     }
 
     /**
-     * Attaches the native ImeAdapter object to the java ImeAdapter to allow communication via JNI.
-     */
-    public void attachImeAdapter() {
-        if (mImeAdapter != null && mNativeContentViewCore != 0) {
-            mImeAdapter.attach(nativeGetNativeImeAdapter(mNativeContentViewCore));
-        }
-    }
-
-    /**
      * @see View#hasFocus()
      */
     @CalledByNative
@@ -2651,9 +2633,6 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
     private native void nativeSelectPopupMenuItems(long nativeContentViewCoreImpl,
             long nativeSelectPopupSourceFrame, int[] indices);
 
-
-    private native long nativeGetNativeImeAdapter(long nativeContentViewCoreImpl);
-
     private native int nativeGetCurrentRenderProcessId(long nativeContentViewCoreImpl);
 
     private native void nativeSetAllowJavascriptInterfacesInspection(