Index: ash/common/system/tray/tray_details_view_unittest.cc |
diff --git a/ash/common/system/tray/tray_details_view_unittest.cc b/ash/common/system/tray/tray_details_view_unittest.cc |
index 0fb4de64ea8e9cded6427b6fef247bdbe43c12c6..9a4fe6e2daef79fb175d4c76b1503d6dfd3c8137 100644 |
--- a/ash/common/system/tray/tray_details_view_unittest.cc |
+++ b/ash/common/system/tray/tray_details_view_unittest.cc |
@@ -20,6 +20,7 @@ |
#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" |
@@ -326,14 +327,15 @@ TEST_F(TrayDetailsViewTest, ScrollContentsTest) { |
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. |
@@ -346,7 +348,7 @@ TEST_F(TrayDetailsViewTest, ScrollContentsTest) { |
// 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. |