OverlayPanel Manager

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchEventFilterTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchEventFilterTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchEventFilterTest.java
index 95bc4cc1220b4b15243b5cd0f72e539543a935d8..ac8d0521b1ef49e3dd85bca34b15a1f5b41ca612 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchEventFilterTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchEventFilterTest.java
@@ -13,7 +13,9 @@ import android.view.MotionEvent;
 import android.view.ViewConfiguration;
 
 import org.chromium.base.test.util.Feature;
+import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelContent;
+import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel;
 import org.chromium.chrome.browser.compositor.eventfilter.MockEventFilterHost;
 import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost;
@@ -105,8 +107,8 @@ public class ContextualSearchEventFilterTest extends InstrumentationTestCase
      */
     public class ContextualSearchEventFilterWrapper extends ContextualSearchEventFilter {
         public ContextualSearchEventFilterWrapper(Context context, EventFilterHost host,
-                GestureHandler handler, ContextualSearchPanel contextualSearchPanel) {
-            super(context, host, handler, contextualSearchPanel);
+                GestureHandler handler, OverlayPanelManager panelManager) {
+            super(context, host, handler, panelManager);
         }
 
         @Override
@@ -131,8 +133,9 @@ public class ContextualSearchEventFilterTest extends InstrumentationTestCase
      */
     public static class MockContextualSearchPanel extends ContextualSearchPanel {
 
-        public MockContextualSearchPanel(Context context, LayoutUpdateHost updateHost) {
-            super(context, updateHost);
+        public MockContextualSearchPanel(Context context, LayoutUpdateHost updateHost,
+                OverlayPanelManager panelManager) {
+            super(context, updateHost, panelManager);
         }
 
         @Override
@@ -165,6 +168,30 @@ public class ContextualSearchEventFilterTest extends InstrumentationTestCase
     }
 
     // --------------------------------------------------------------------------------------------
+    // MockOverlayPanelManager
+    // --------------------------------------------------------------------------------------------
+
+    /**
+     * OverlayPanelManager that always returns the MockContextualSearchPanel as the active
+     * panel.
+     */
+    private static class MockOverlayPanelManager extends OverlayPanelManager {
+        private OverlayPanel mPanel;
+
+        public MockOverlayPanelManager() {
+        }
+
+        public void setOverlayPanel(OverlayPanel panel) {
+            mPanel = panel;
+        }
+
+        @Override
+        public OverlayPanel getActivePanel() {
+            return mPanel;
+        }
+    }
+
+    // --------------------------------------------------------------------------------------------
     // Test Suite
     // --------------------------------------------------------------------------------------------
 
@@ -178,9 +205,11 @@ public class ContextualSearchEventFilterTest extends InstrumentationTestCase
         mTouchSlopDp = ViewConfiguration.get(context).getScaledTouchSlop() / mDpToPx;
 
         EventFilterHost eventFilterHost = new MockEventFilterHostWrapper(context);
-        mContextualSearchPanel = new MockContextualSearchPanel(context, null);
+        MockOverlayPanelManager panelManager = new MockOverlayPanelManager();
+        mContextualSearchPanel = new MockContextualSearchPanel(context, null, panelManager);
+        panelManager.setOverlayPanel(mContextualSearchPanel);
         mEventFilter = new ContextualSearchEventFilterWrapper(context, eventFilterHost, this,
-                mContextualSearchPanel);
+                panelManager);
 
         mContextualSearchPanel.setSearchBarHeightForTesting(SEARCH_BAR_HEIGHT_DP);
         mContextualSearchPanel.setHeightForTesting(LAYOUT_HEIGHT_DP);