Index: ash/shelf/shelf_tooltip_manager_unittest.cc |
diff --git a/ash/shelf/shelf_tooltip_manager_unittest.cc b/ash/shelf/shelf_tooltip_manager_unittest.cc |
index 7f6650ecb6eee268078c0726dff9af8882a8c805..f300a64377ff4bb2df47513a8e4673ea04e8b89c 100644 |
--- a/ash/shelf/shelf_tooltip_manager_unittest.cc |
+++ b/ash/shelf/shelf_tooltip_manager_unittest.cc |
@@ -50,8 +50,8 @@ class ShelfTooltipManagerTest : public AshTestBase { |
} |
protected: |
- scoped_ptr<views::Widget> widget_; |
- scoped_ptr<views::View> dummy_anchor_; |
+ std::unique_ptr<views::Widget> widget_; |
+ std::unique_ptr<views::View> dummy_anchor_; |
Shelf* shelf_; |
ShelfTooltipManager* tooltip_manager_; |
@@ -89,7 +89,7 @@ TEST_F(ShelfTooltipManagerTest, HideWhenShelfIsHidden) { |
ASSERT_TRUE(TooltipIsVisible()); |
// Create a full-screen window to hide the shelf. |
- scoped_ptr<views::Widget> widget(new views::Widget); |
+ std::unique_ptr<views::Widget> widget(new views::Widget); |
views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW); |
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
params.context = CurrentContext(); |