Remove ContentViewCore dependency from OverlayPanel

chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "cc/layers/solid_color_layer.h"
 #include "chrome/browser/android/compositor/layer/contextual_search_layer.h"
 #include "content/public/browser/android/compositor.h"
-#include "content/public/browser/android/content_view_core.h"
+#include "content/public/browser/web_contents.h"
 #include "jni/ContextualSearchSceneLayer_jni.h"
 #include "ui/android/resources/resource_manager_impl.h"
+#include "ui/android/view_android.h"
 #include "ui/gfx/android/java_bitmap.h"
 
 namespace chrome {
 namespace android {
 
 ContextualSearchSceneLayer::ContextualSearchSceneLayer(JNIEnv* env,
                                                        jobject jobj)
     : SceneLayer(env, jobj),
       base_page_brightness_(1.0f),
       content_container_(cc::Layer::Create()) {
@@ skipping 33 matching lines @@
     jint arrow_up_resource_id,
     jint close_icon_resource_id,
     jint progress_bar_background_resource_id,
     jint progress_bar_resource_id,
     jint search_promo_resource_id,
     jint peek_promo_ripple_resource_id,
     jint peek_promo_text_resource_id,
     jfloat dp_to_px,
     jfloat base_page_brightness,
     jfloat base_page_offset,
-    const JavaParamRef<jobject>& jcontent_view_core,
+    const JavaParamRef<jobject>& jweb_contents,
     jboolean search_promo_visible,
     jfloat search_promo_height,
     jfloat search_promo_opacity,
     jboolean search_peek_promo_visible,
     jfloat search_peek_promo_height,
     jfloat search_peek_promo_padding,
     jfloat search_peek_promo_ripple_width,
     jfloat search_peek_promo_ripple_opacity,
     jfloat search_peek_promo_text_opacity,
     jfloat search_panel_x,
@@ skipping 12 matching lines @@
     jfloat search_bar_shadow_opacity,
     jboolean search_provider_icon_sprite_visible,
     jfloat search_provider_icon_sprite_completion_percentage,
     jfloat arrow_icon_opacity,
     jfloat arrow_icon_rotation,
     jfloat close_icon_opacity,
     jboolean progress_bar_visible,
     jfloat progress_bar_height,
     jfloat progress_bar_opacity,
     jint progress_bar_completion) {
-  // NOTE(pedrosimonetti): The ContentViewCore might not exist at this time if
+  // NOTE(pedrosimonetti): The WebContents might not exist at this time if
   // the Contextual Search Result has not been requested yet. In this case,
   // we'll pass NULL to Contextual Search's Layer Tree.
-  content::ContentViewCore* content_view_core =
-      !jcontent_view_core ? NULL
-                          : content::ContentViewCore::GetNativeContentViewCore(
-                                env, jcontent_view_core);
+  content::WebContents* web_contents =
+      content::WebContents::FromJavaWebContents(jweb_contents);
+
+  scoped_refptr<cc::Layer> content_layer =
+      web_contents ? web_contents->GetNativeView()->GetLayer() : nullptr;
 
   // Fade the base page out.
   if (base_page_brightness_ != base_page_brightness) {
     base_page_brightness_ = base_page_brightness;
     cc::FilterOperations filters;
     if (base_page_brightness < 1.f) {
       filters.Append(
           cc::FilterOperation::CreateBrightnessFilter(base_page_brightness));
     }
     content_container_->SetFilters(filters);
@@ skipping 11 matching lines @@
       panel_icon_resource_id,
       search_provider_icon_sprite_metadata_resource_id,
       arrow_up_resource_id,
       close_icon_resource_id,
       progress_bar_background_resource_id,
       progress_bar_resource_id,
       search_promo_resource_id,
       peek_promo_ripple_resource_id,
       peek_promo_text_resource_id,
       dp_to_px,
-      content_view_core,
+      content_layer,
       search_promo_visible,
       search_promo_height,
       search_promo_opacity,
       search_peek_promo_visible,
       search_peek_promo_height,
       search_peek_promo_padding,
       search_peek_promo_ripple_width,
       search_peek_promo_ripple_opacity,
       search_peek_promo_text_opacity,
       search_panel_x,
@@ skipping 57 matching lines @@
       new ContextualSearchSceneLayer(env, jobj);
   return reinterpret_cast<intptr_t>(tree_provider);
 }
 
 bool RegisterContextualSearchSceneLayer(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace chrome