Let ImeAdapterAndroid have the same lifecycle as its Java peer

content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java

Index: content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java b/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java
index ae53c847293e0d35ae3d7bb650375720b1a156a2..96a4100bcde0569052d78cef428bee0a2d60fbb5 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java
@@ -80,11 +80,11 @@ public class PopupZoomerTest extends ContentShellTestBase {
         super.setUp();
         mPopupZoomer = createPopupZoomerForTest(getInstrumentation().getTargetContext());
         mContentViewCore = new ContentViewCore(getActivity(), "");
-        ImeAdapter imeAdapter = new ImeAdapter(new TestInputMethodManagerWrapper(mContentViewCore),
+        ImeAdapter imeAdapter = new ImeAdapter(mContentViewCore.getWebContents(),
+                new TestInputMethodManagerWrapper(mContentViewCore),
                 new TestImeAdapterDelegate(getContentViewCore().getContainerView()));
-        mContentViewCore.setSelectionPopupControllerForTesting(
-                new SelectionPopupController(getActivity(), null, null, null,
-                        mContentViewCore.getRenderCoordinates(), imeAdapter));
+        mContentViewCore.setSelectionPopupControllerForTesting(new SelectionPopupController(
+                getActivity(), null, null, null, mContentViewCore.getRenderCoordinates()));
         mContentViewCore.setPopupZoomerForTest(mPopupZoomer);
         mContentViewCore.setImeAdapterForTest(imeAdapter);
     }