Revert of Let ImeAdapterAndroid have the same lifecycle as its Java peer

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

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Rect;
@@ skipping 61 matching lines @@
         final long downEvent = SystemClock.uptimeMillis();
         view.onTouchEvent(
                 MotionEvent.obtain(downEvent, downEvent, MotionEvent.ACTION_DOWN, x, y, 0));
         view.onTouchEvent(
                 MotionEvent.obtain(downEvent, downEvent + 10, MotionEvent.ACTION_UP, x, y, 0));
     }
 
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        mPopupZoomer = createPopupZoomerForTest(getInstrumentation().getTargetContext());
-        mContentViewCore = new ContentViewCore(getActivity(), "");
 
         final Context context = getActivity();
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 mPopupZoomer = createPopupZoomerForTest(getInstrumentation().getTargetContext());
                 mContentViewCore = new ContentViewCore(context, "");
-                ImeAdapter imeAdapter = new ImeAdapter(getContentViewCore().getWebContents(),
+                ImeAdapter imeAdapter = new ImeAdapter(
                         new TestInputMethodManagerWrapper(mContentViewCore),
                         new TestImeAdapterDelegate(getContentViewCore().getContainerView()));
-                mContentViewCore.setSelectionPopupControllerForTesting(new SelectionPopupController(
-                        context, null, null, null, mContentViewCore.getRenderCoordinates()));
+                mContentViewCore.setSelectionPopupControllerForTesting(
+                        new SelectionPopupController(context, null, null, null,
+                                mContentViewCore.getRenderCoordinates(), imeAdapter));
                 mContentViewCore.setPopupZoomerForTest(mPopupZoomer);
                 mContentViewCore.setImeAdapterForTest(imeAdapter);
             }
         });
     }
 
     @SmallTest
     @Feature({"Navigation"})
     public void testDefaultCreateState() throws Exception {
         assertEquals(View.INVISIBLE, mPopupZoomer.getVisibility());
@@ skipping 108 matching lines @@
         mContentViewCore.onFocusChanged(false, true);
 
         // Wait for the hide animation to finish.
         mPopupZoomer.finishPendingDraws();
 
         // Now that another view has been focused, the view should be invisible.
         assertEquals(View.INVISIBLE, mPopupZoomer.getVisibility());
         assertFalse(mPopupZoomer.isShowing());
     }
 }