Let ImeAdapterAndroid have the same lifecycle as its Java peer

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTapEventTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTapEventTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTapEventTest.java
index abd1943ea33ec76c796349c42b2737d0ce7f0ae5..ec07ca42d6fadb7cf9adc34a23f8a2b2e9126307 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTapEventTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTapEventTest.java
@@ -88,9 +88,8 @@ public class ContextualSearchTapEventTest extends ChromeActivityTestCaseBase<Chr
             super(activity, windowAndroid, null);
             setSelectionController(new MockCSSelectionController(activity, this));
             ContentViewCore contentView = getSelectionController().getBaseContentView();
-            contentView.setSelectionPopupControllerForTesting(
-                    new SelectionPopupController(activity, null, null, null,
-                            contentView.getRenderCoordinates(), null));
+            contentView.setSelectionPopupControllerForTesting(new SelectionPopupController(
+                    activity, null, null, null, contentView.getRenderCoordinates()));
             contentView.setSelectionClient(this);
             MockContextualSearchPolicy policy = new MockContextualSearchPolicy();
             setContextualSearchPolicy(policy);