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;
 import android.os.SystemClock;
 import android.support.test.filters.SmallTest;
 import android.view.MotionEvent;
 import android.view.View;
 
 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_public.browser.WebContents;
 import org.chromium.content_shell_apk.ContentShellTestBase;
 
-import java.util.concurrent.Callable;
-import java.util.concurrent.FutureTask;
-
 /**
  * Tests for PopupZoomer.
  */
 public class PopupZoomerTest extends ContentShellTestBase {
     private CustomCanvasPopupZoomer mPopupZoomer;
     private ContentViewCore mContentViewCore;
 
     private static class CustomCanvasPopupZoomer extends PopupZoomer {
         Canvas mCanvas;
         long mPendingDraws = 0;
@@ skipping 41 matching lines @@
                 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(), "");
-
-        // Use CVC from shell base for necessary but uninitialized parts, such as container view
-        // or web contents. This still works since they are checked only the init step,
-        // not actually used in the tests themselves.
-        ImeAdapter imeAdapter = createImeAdapterOnUiThread(getContentViewCore().getWebContents());
-        mContentViewCore.setSelectionPopupControllerForTesting(new SelectionPopupController(
-                getActivity(), null, null, null, mContentViewCore.getRenderCoordinates()));
+        ImeAdapter imeAdapter = new ImeAdapter(new TestInputMethodManagerWrapper(mContentViewCore),
+                new TestImeAdapterDelegate(getContentViewCore().getContainerView()));
+        mContentViewCore.setSelectionPopupControllerForTesting(
+                new SelectionPopupController(getActivity(), null, null, null,
+                        mContentViewCore.getRenderCoordinates(), imeAdapter));
         mContentViewCore.setPopupZoomerForTest(mPopupZoomer);
         mContentViewCore.setImeAdapterForTest(imeAdapter);
     }
 
-    private ImeAdapter createImeAdapterOnUiThread(final WebContents webContents) throws Exception {
-        // WebContents should be handled on UI thread.
-        FutureTask<ImeAdapter> task = new FutureTask<>(new Callable<ImeAdapter>() {
-            @Override
-            public ImeAdapter call() {
-                return new ImeAdapter(webContents,
-                        new TestInputMethodManagerWrapper(mContentViewCore),
-                        new TestImeAdapterDelegate(getContentViewCore().getContainerView()));
-            }
-
-        });
-        getInstrumentation().runOnMainSync(task);
-        return task.get();
-    }
-
     @SmallTest
     @Feature({"Navigation"})
     public void testDefaultCreateState() throws Exception {
         assertEquals(View.INVISIBLE, mPopupZoomer.getVisibility());
         assertFalse(mPopupZoomer.isShowing());
     }
 
     @SmallTest
     @Feature({"Navigation"})
     public void testShowWithoutBitmap() throws Exception {
@@ skipping 102 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());
     }
 }