Revert "Refactor ContentViewClient (6/6)"

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 43f443b0d0f3a77a839cda125ef777cdf90021bb..2ef1267db8addf9bbcac6eea8506d615842d4f92 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
@@ -16,6 +16,7 @@ import android.view.View;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.input.ImeAdapter;
+import org.chromium.content.browser.input.TestImeAdapterDelegate;
 import org.chromium.content.browser.test.util.TestInputMethodManagerWrapper;
 import org.chromium.content_shell_apk.ContentShellTestBase;
 
@@ -84,15 +85,16 @@ public class PopupZoomerTest extends ContentShellTestBase {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                mContentViewCore = new ContentViewCore(context, "");
-                mContentViewCore.setSelectionPopupControllerForTesting(new SelectionPopupController(
-                        context, null, null, null, mContentViewCore.getRenderCoordinates()));
-                mContentViewCore.setImeAdapterForTest(
-                        new ImeAdapter(getContentViewCore().getWebContents(),
-                                getContentViewCore().getContainerView(),
-                                new TestInputMethodManagerWrapper(mContentViewCore)));
                 mPopupZoomer = createPopupZoomerForTest(getInstrumentation().getTargetContext());
+                mContentViewCore = new ContentViewCore(context, "");
+                ImeAdapter imeAdapter = new ImeAdapter(
+                        new TestInputMethodManagerWrapper(mContentViewCore),
+                        new TestImeAdapterDelegate(getContentViewCore().getContainerView()));
+                mContentViewCore.setSelectionPopupControllerForTesting(
+                        new SelectionPopupController(context, null, null, null,
+                                mContentViewCore.getRenderCoordinates(), imeAdapter));
                 mContentViewCore.setPopupZoomerForTest(mPopupZoomer);
+                mContentViewCore.setImeAdapterForTest(imeAdapter);
             }
         });
     }