Remove ContentViewCore dependency from OverlayPanel

chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java
index 74367d929360748f74ce1d369684bd5d559525ac..748ec012fa963c9cf3064af54975bbc8c78f7464 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java
@@ -11,7 +11,7 @@ import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.Context
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPeekPromoControl;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPromoControl;
-import org.chromium.content.browser.ContentViewCore;
+import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.resources.ResourceManager;
 
 /**
@@ -106,6 +106,9 @@ public class ContextualSearchSceneLayer extends SceneOverlayLayer {
         float progressBarOpacity = panel.getProgressBarOpacity();
         int progressBarCompletion = panel.getProgressBarCompletion();
 
+        WebContents panelWebContents = panel.getContentViewCore() != null

[no sievers, 2016/07/12 23:44:16]

hmm how do you get away with not importing CVC? :)

[mdjones, 2016/07/13 00:21:31]

Java black magic :). If you don't have an explicit reference, you don't have to
import it (unlike c++).

+                ? panel.getContentViewCore().getWebContents() : null;
+
         nativeUpdateContextualSearchLayer(mNativePtr,
                 R.drawable.contextual_search_bar_background,
                 searchContextViewId,
@@ -124,7 +127,7 @@ public class ContextualSearchSceneLayer extends SceneOverlayLayer {
                 mDpToPx,
                 panel.getBasePageBrightness(),
                 panel.getBasePageY() * mDpToPx,
-                panel.getContentViewCore(),
+                panelWebContents,
                 searchPromoVisible,
                 searchPromoHeightPx,
                 searchPromoOpacity,
@@ -218,7 +221,7 @@ public class ContextualSearchSceneLayer extends SceneOverlayLayer {
             float dpToPx,
             float basePageBrightness,
             float basePageYOffset,
-            ContentViewCore contentViewCore,
+            WebContents contentViewCore,

[no sievers, 2016/07/12 23:44:16]

nit: s/contentViewCore/webContents

[mdjones, 2016/07/13 00:21:31]

Done.

             boolean searchPromoVisible,
             float searchPromoHeight,
             float searchPromoOpacity,