Update SetPaintToLayer to accept LayerType

ash/common/system/tray/tray_details_view_unittest.cc

 // Copyright 2013 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 "ash/common/system/tray/tray_details_view.h"
 
 #include "ash/common/ash_view_ids.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/special_popup_row.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_header_button.h"
 #include "ash/common/system/tray/view_click_listener.h"
 #include "ash/test/ash_test_base.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/test/scoped_mock_time_message_loop_task_runner.h"
 #include "base/test/test_mock_time_task_runner.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
+#include "ui/compositor/layer_type.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace test {
 
 namespace {
 
@@ skipping 286 matching lines @@
 TEST_F(TrayDetailsViewTest, ScrollContentsTest) {
   SystemTray* tray = GetPrimarySystemTray();
   TestItem* test_item = new TestItem;
   tray->AddTrayItem(base::WrapUnique(test_item));
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   RunAllPendingInMessageLoop();
   tray->ShowDetailedView(test_item, 0, true, BUBBLE_USE_EXISTING);
   RunAllPendingInMessageLoop();
   test_item->detailed_view()->CreateScrollerViews();
 
-  test_item->detailed_view()->scroll_content()->SetPaintToLayer(true);
+  test_item->detailed_view()->scroll_content()->SetPaintToLayer(
+      ui::LAYER_TEXTURED);
   views::View* view1 = new views::View();
   test_item->detailed_view()->scroll_content()->AddChildView(view1);
   views::View* view2 = new views::View();
-  view2->SetPaintToLayer(true);
+  view2->SetPaintToLayer(ui::LAYER_TEXTURED);
   test_item->detailed_view()->scroll_content()->AddChildView(view2);
   views::View* view3 = new views::View();
-  view3->SetPaintToLayer(true);
+  view3->SetPaintToLayer(ui::LAYER_TEXTURED);
   test_item->detailed_view()->scroll_content()->AddChildView(view3);
 
   // Child layers should have same order as the child views.
   const std::vector<ui::Layer*>& layers =
       test_item->detailed_view()->scroll_content()->layer()->children();
   EXPECT_EQ(2u, layers.size());
   EXPECT_EQ(view2->layer(), layers[0]);
   EXPECT_EQ(view3->layer(), layers[1]);
 
   // Mark |view2| as sticky and add one more child (which will reorder layers).
   view2->set_id(VIEW_ID_STICKY_HEADER);
   views::View* view4 = new views::View();
-  view4->SetPaintToLayer(true);
+  view4->SetPaintToLayer(ui::LAYER_TEXTURED);
   test_item->detailed_view()->scroll_content()->AddChildView(view4);
 
   // Sticky header layer should be above the last child's layer.
   EXPECT_EQ(3u, layers.size());
   EXPECT_EQ(view3->layer(), layers[0]);
   EXPECT_EQ(view4->layer(), layers[1]);
   EXPECT_EQ(view2->layer(), layers[2]);
 }
 
 }  // namespace test
 }  // namespace ash