Update SetPaintToLayer to accept LayerType

chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc

 // Copyright (c) 2012 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/ui/views/location_bar/icon_label_bubble_view.h"
 
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
@@ skipping 125 matching lines @@
 }
 
 void IconLabelBubbleView::OnNativeThemeChanged(
     const ui::NativeTheme* native_theme) {
   label_->SetEnabledColor(GetTextColor());
   label_->SetBackgroundColor(GetParentBackgroundColor());
   SchedulePaint();
 }
 
 void IconLabelBubbleView::AddInkDropLayer(ui::Layer* ink_drop_layer) {
-  image()->SetPaintToLayer(true);
+  image()->SetPaintToLayer();
   image()->layer()->SetFillsBoundsOpaquely(false);
   InkDropHostView::AddInkDropLayer(ink_drop_layer);
 }
 
 void IconLabelBubbleView::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
   InkDropHostView::RemoveInkDropLayer(ink_drop_layer);
-  image()->SetPaintToLayer(false);
+  image()->DestroyLayer();
 }
 
 std::unique_ptr<views::InkDropHighlight>
 IconLabelBubbleView::CreateInkDropHighlight() const {
   // Only show a highlight effect when the label is empty/invisible.
   return label()->visible() ? nullptr
                             : InkDropHostView::CreateInkDropHighlight();
 }
 
 SkColor IconLabelBubbleView::GetInkDropBaseColor() const {
@@ skipping 77 matching lines @@
 
   // Draw the 1 px separator.
   gfx::ScopedCanvas scoped_canvas(canvas);
   const float scale = canvas->UndoDeviceScaleFactor();
   // Keep the separator aligned on a pixel center.
   const gfx::RectF pixel_aligned_bounds =
       gfx::ScaleRect(gfx::RectF(bounds), scale) - gfx::Vector2dF(0.5f, 0);
   canvas->DrawLine(pixel_aligned_bounds.top_right(),
                    pixel_aligned_bounds.bottom_right(), separator_color);
 }