Index: ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc |
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc |
index 86e60d31fc83e654015998e8bf50f6b6262fbc02..ae44f4b7e8b9fd0be351ec9a7cd487ebb67d1314 100644 |
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc |
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc |
@@ -40,7 +40,7 @@ typedef ViewsTestBase DesktopNativeWidgetAuraTest; |
// Verifies creating a Widget with a parent that is not in a RootWindow doesn't |
// crash. |
TEST_F(DesktopNativeWidgetAuraTest, CreateWithParentNotInRootWindow) { |
- scoped_ptr<aura::Window> window(new aura::Window(NULL)); |
+ std::unique_ptr<aura::Window> window(new aura::Window(NULL)); |
window->Init(ui::LAYER_NOT_DRAWN); |
Widget widget; |
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW); |
@@ -219,14 +219,14 @@ TEST_F(DesktopNativeWidgetAuraTest, DontAccessContentWindowDuringDestruction) { |
} |
} |
-void QuitNestedLoopAndCloseWidget(scoped_ptr<Widget> widget, |
+void QuitNestedLoopAndCloseWidget(std::unique_ptr<Widget> widget, |
base::Closure* quit_runloop) { |
quit_runloop->Run(); |
} |
// Verifies that a widget can be destroyed when running a nested message-loop. |
TEST_F(DesktopNativeWidgetAuraTest, WidgetCanBeDestroyedFromNestedLoop) { |
- scoped_ptr<Widget> widget(new Widget); |
+ std::unique_ptr<Widget> widget(new Widget); |
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW); |
params.bounds = gfx::Rect(0, 0, 200, 200); |
params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |