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 b3f4d557ca1330ad26cc1d429119ed53cc3167ed..abd1943ea33ec76c796349c42b2737d0ce7f0ae5 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 |
@@ -225,17 +225,24 @@ public class ContextualSearchTapEventTest extends ChromeActivityTestCaseBase<Chr |
protected void setUp() throws Exception { |
super.setUp(); |
- mPanelManager = new OverlayPanelManagerWrapper(); |
- mPanelManager.setContainerView(new LinearLayout(getActivity())); |
- mPanelManager.setDynamicResourceLoader(new DynamicResourceLoader(0, null)); |
+ final ChromeActivity activity = getActivity(); |
- mContextualSearchManager = |
- new ContextualSearchManagerWrapper(getActivity(), getActivity().getWindowAndroid()); |
- mPanel = new ContextualSearchPanelWrapper(getActivity(), null, mPanelManager); |
- mPanel.setManagementDelegate(mContextualSearchManager); |
- mContextualSearchManager.setContextualSearchPanel(mPanel); |
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
+ @Override |
+ public void run() { |
+ mPanelManager = new OverlayPanelManagerWrapper(); |
+ mPanelManager.setContainerView(new LinearLayout(activity)); |
+ mPanelManager.setDynamicResourceLoader(new DynamicResourceLoader(0, null)); |
- mContextualSearchClient = mContextualSearchManager; |
+ mContextualSearchManager = |
+ new ContextualSearchManagerWrapper(activity, activity.getWindowAndroid()); |
+ mPanel = new ContextualSearchPanelWrapper(activity, null, mPanelManager); |
+ mPanel.setManagementDelegate(mContextualSearchManager); |
+ mContextualSearchManager.setContextualSearchPanel(mPanel); |
+ |
+ mContextualSearchClient = mContextualSearchManager; |
+ } |
+ }); |
} |
@Override |