Implement OverlayPanels as SceneOverlays

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 36ebe189b966b5d83d5bb357da81bc8f2a14b1cc..53578e70cc8084c17caebf6c370706b6b9aae644 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
@@ -14,8 +14,11 @@ import android.widget.LinearLayout;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManagerWrapper;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel;
+import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost;
+import org.chromium.chrome.browser.compositor.layouts.eventfilter.EventFilterHost;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.ContextualSearchClient;
@@ -53,6 +56,21 @@ public class ContextualSearchTapEventTest extends ChromeActivityTestCaseBase<Chr
     // --------------------------------------------------------------------------------------------
 
     /**
+     * ContextualSearchPanel wrapper that prevents native calls.
+     */
+    private static class ContextualSearchPanelWrapper extends ContextualSearchPanel {
+        public ContextualSearchPanelWrapper(Context context, LayoutUpdateHost updateHost,
+                EventFilterHost eventHost, OverlayPanelManager panelManager) {
+            super(context, updateHost, eventHost, panelManager);
+        }
+
+        @Override
+        public void setBasePageTextControlsVisibility(boolean visible) {}
+    }
+
+    // --------------------------------------------------------------------------------------------
+
+    /**
      * ContextualSearchManager wrapper that prevents network requests and most native calls.
      */
     private static class ContextualSearchManagerWrapper extends ContextualSearchManager {
@@ -166,7 +184,7 @@ public class ContextualSearchTapEventTest extends ChromeActivityTestCaseBase<Chr
 
         mContextualSearchManager =
                 new ContextualSearchManagerWrapper(getActivity(), getActivity().getWindowAndroid());
-        mPanel = new ContextualSearchPanel(getActivity(), null, mPanelManager);
+        mPanel = new ContextualSearchPanelWrapper(getActivity(), null, null, mPanelManager);
         mPanel.setManagementDelegate(mContextualSearchManager);
         mContextualSearchManager.setContextualSearchPanel(mPanel);