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 0a554c964b3d43f39cdd6f107e7ace6e7e5b7b6c..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 |
@@ -79,8 +79,6 @@ |
@Override |
public void setUp() throws Exception { |
super.setUp(); |
- mPopupZoomer = createPopupZoomerForTest(getInstrumentation().getTargetContext()); |
- mContentViewCore = new ContentViewCore(getActivity(), ""); |
final Context context = getActivity(); |
@@ -89,11 +87,12 @@ |
public void run() { |
mPopupZoomer = createPopupZoomerForTest(getInstrumentation().getTargetContext()); |
mContentViewCore = new ContentViewCore(context, ""); |
- ImeAdapter imeAdapter = new ImeAdapter(getContentViewCore().getWebContents(), |
+ ImeAdapter imeAdapter = new ImeAdapter( |
new TestInputMethodManagerWrapper(mContentViewCore), |
new TestImeAdapterDelegate(getContentViewCore().getContainerView())); |
- mContentViewCore.setSelectionPopupControllerForTesting(new SelectionPopupController( |
- context, null, null, null, mContentViewCore.getRenderCoordinates())); |
+ mContentViewCore.setSelectionPopupControllerForTesting( |
+ new SelectionPopupController(context, null, null, null, |
+ mContentViewCore.getRenderCoordinates(), imeAdapter)); |
mContentViewCore.setPopupZoomerForTest(mPopupZoomer); |
mContentViewCore.setImeAdapterForTest(imeAdapter); |
} |