Remove ContentViewCore dependency from OverlayPanel

chrome/browser/android/compositor/layer/contextual_search_layer.cc

 // Copyright 2014 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/layer/contextual_search_layer.h"
 
 #include "cc/layers/layer.h"
 #include "cc/layers/nine_patch_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/ui_resource_layer.h"
 #include "cc/resources/scoped_ui_resource.h"
 #include "chrome/browser/android/compositor/layer/crushed_sprite_layer.h"
 #include "content/public/browser/android/compositor.h"
-#include "content/public/browser/android/content_view_core.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/android/resources/crushed_sprite_resource.h"
 #include "ui/android/resources/resource_manager.h"
 #include "ui/base/l10n/l10n_util_android.h"
 #include "ui/gfx/color_utils.h"
 
 namespace {
 
 const SkColor kSearchBackgroundColor = SkColorSetRGB(0xee, 0xee, 0xee);
 const SkColor kSearchBarBackgroundColor = SkColorSetRGB(0xff, 0xff, 0xff);
@@ skipping 45 matching lines @@
     int panel_icon_resource_id,
     int search_provider_icon_sprite_metadata_resource_id,
     int arrow_up_resource_id,
     int close_icon_resource_id,
     int progress_bar_background_resource_id,
     int progress_bar_resource_id,
     int search_promo_resource_id,
     int peek_promo_ripple_resource_id,
     int peek_promo_text_resource_id,
     float dp_to_px,
-    content::ContentViewCore* content_view_core,
+    const scoped_refptr<cc::Layer>& content_layer,
     bool search_promo_visible,
     float search_promo_height,
     float search_promo_opacity,
     bool search_peek_promo_visible,
     float search_peek_promo_height,
     float search_peek_promo_padding,
     float search_peek_promo_ripple_width,
     float search_peek_promo_ripple_opacity,
     float search_peek_promo_text_opacity,
     float search_panel_x,
@@ skipping 48 matching lines @@
 
   float content_view_top = search_bar_bottom + search_promo_height;
   float should_render_bar_border = search_bar_border_visible
       && !should_render_progress_bar;
 
   // -----------------------------------------------------------------
   // Overlay Panel
   // -----------------------------------------------------------------
   OverlayPanelLayer::SetProperties(
       dp_to_px,
-      content_view_core,
+      content_layer,
       content_view_top,
       search_panel_x,
       search_panel_y,
       search_panel_width,
       search_panel_height,
       search_bar_margin_side,
       search_bar_height,
       search_bar_top,
       search_term_opacity,
       should_render_bar_border,
@@ skipping 343 matching lines @@
   // Progress Bar
   progress_bar_->SetIsDrawable(true);
   progress_bar_->SetFillCenter(true);
 }
 
 ContextualSearchLayer::~ContextualSearchLayer() {
 }
 
 }  //  namespace android
 }  //  namespace chrome