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

chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTapEventTest.java

 // Copyright 2016 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.chrome.browser.contextualsearch;
 
 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE;
 
 import android.content.Context;
 import android.net.Uri;
@@ skipping 71 matching lines @@
 
     /**
      * ContextualSearchManager wrapper that prevents network requests and most native calls.
      */
     private static class ContextualSearchManagerWrapper extends ContextualSearchManager {
         public ContextualSearchManagerWrapper(ChromeActivity activity,
                 WindowAndroid windowAndroid) {
             super(activity, windowAndroid, null);
             setSelectionController(new MockCSSelectionController(activity, this));
             ContentViewCore contentView = getSelectionController().getBaseContentView();
-            contentView.setSelectionPopupControllerForTesting(new SelectionPopupController(
-                    activity, null, null, null, contentView.getRenderCoordinates()));
+            contentView.setSelectionPopupControllerForTesting(
+                    new SelectionPopupController(activity, null, null, null,
+                            contentView.getRenderCoordinates(), null));
             contentView.setSelectionClient(this);
             MockContextualSearchPolicy policy = new MockContextualSearchPolicy();
             setContextualSearchPolicy(policy);
             mTranslateController = new MockedCSTranslateController(activity, policy, null);
         }
 
         @Override
         public void startSearchTermResolutionRequest(String selection) {
             // Skip native calls and immediately "resolve" the search term.
             onSearchTermResolutionResponse(
@@ skipping 158 matching lines @@
                 .equals("text"));
 
         // Fake tap on non-text.
         mockTapEmptySpace();
 
         assertTrue(mPanelManager.getRequestPanelShowCount() == 1);
         assertTrue(mPanelManager.getPanelHideCount() == 1);
         assertTrue(mContextualSearchManager.getSelectionController().getSelectedText() == null);
     }
 }