Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc |
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc |
index cc357013e0c8dace1fc1e915f62f6e0f7a6db203..c9a0381b6b85f559d6f7f856fd9263adfbbad8fe 100644 |
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc |
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc |
@@ -207,8 +207,9 @@ class LauncherPlatformAppBrowserTest |
// Returns the number of menu items, ignoring separators. |
int GetNumApplicationMenuItems(const ash::ShelfItem& item) { |
const int event_flags = 0; |
- scoped_ptr<ash::ShelfMenuModel> menu(new LauncherApplicationMenuItemModel( |
- controller_->GetApplicationList(item, event_flags))); |
+ std::unique_ptr<ash::ShelfMenuModel> menu( |
+ new LauncherApplicationMenuItemModel( |
+ controller_->GetApplicationList(item, event_flags))); |
int num_items = 0; |
for (int i = 0; i < menu->GetItemCount(); ++i) { |
if (menu->GetTypeAt(i) != ui::MenuModel::TYPE_SEPARATOR) |