Index: ui/views/controls/menu/menu_model_adapter_unittest.cc |
diff --git a/ui/views/controls/menu/menu_model_adapter_unittest.cc b/ui/views/controls/menu/menu_model_adapter_unittest.cc |
index 63d7788c4bc9284dd127e464e1fbe62d55b77f24..9fddfaf9317286617f52e4bd4b14cc1dd983d5a2 100644 |
--- a/ui/views/controls/menu/menu_model_adapter_unittest.cc |
+++ b/ui/views/controls/menu/menu_model_adapter_unittest.cc |
@@ -154,7 +154,7 @@ class RootModel : public MenuModelBase { |
~RootModel() override {} |
private: |
- scoped_ptr<MenuModel> submenu_model_; |
+ std::unique_ptr<MenuModel> submenu_model_; |
DISALLOW_COPY_AND_ASSIGN(RootModel); |
}; |
@@ -173,7 +173,7 @@ TEST_F(MenuModelAdapterTest, BasicTest) { |
// Create menu. Build menu twice to check that rebuilding works properly. |
MenuItemView* menu = new views::MenuItemView(&delegate); |
// MenuRunner takes ownership of menu. |
- scoped_ptr<MenuRunner> menu_runner(new MenuRunner(menu, 0)); |
+ std::unique_ptr<MenuRunner> menu_runner(new MenuRunner(menu, 0)); |
delegate.BuildMenu(menu); |
delegate.BuildMenu(menu); |
EXPECT_TRUE(menu->HasSubmenu()); |