| 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 885a56009b8bf48e6fe6db5bee5c84fe106469f9..9fd15aa2c1959416c2569f356aa81c7b9093632e 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
|
| @@ -25,6 +25,7 @@ import org.chromium.base.test.util.Feature;
|
| import org.chromium.content.browser.input.ImeAdapter;
|
| import org.chromium.content.browser.test.ContentJUnit4ClassRunner;
|
| import org.chromium.content.browser.test.util.TestInputMethodManagerWrapper;
|
| +import org.chromium.content_public.browser.WebContents;
|
| import org.chromium.content_shell_apk.ContentShellActivityTestRule;
|
|
|
| /**
|
| @@ -94,13 +95,13 @@ public class PopupZoomerTest {
|
| @Override
|
| public void run() {
|
| Context context = mActivityTestRule.getActivity();
|
| + WebContents webContents = mActivityTestRule.getContentViewCore().getWebContents();
|
| mContentViewCore = new ContentViewCore(context, "");
|
| mContentViewCore.setSelectionPopupControllerForTesting(new SelectionPopupController(
|
| - context, null, null, null, mContentViewCore.getRenderCoordinates()));
|
| - mContentViewCore.setImeAdapterForTest(
|
| - new ImeAdapter(mActivityTestRule.getContentViewCore().getWebContents(),
|
| - mActivityTestRule.getContentViewCore().getContainerView(),
|
| - new TestInputMethodManagerWrapper(mContentViewCore)));
|
| + context, null, webContents, null, mContentViewCore.getRenderCoordinates()));
|
| + mContentViewCore.setImeAdapterForTest(new ImeAdapter(webContents,
|
| + mActivityTestRule.getContentViewCore().getContainerView(),
|
| + new TestInputMethodManagerWrapper(mContentViewCore)));
|
| mPopupZoomer = createPopupZoomerForTest(InstrumentationRegistry.getTargetContext());
|
| mContentViewCore.setPopupZoomerForTest(mPopupZoomer);
|
| }
|
|
|