Index: chrome/browser/ui/toolbar/toolbar_actions_model.cc |
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model.cc b/chrome/browser/ui/toolbar/toolbar_actions_model.cc |
index 8b8077ba35d8ba0ed3fd2b41285a30540818822f..c60bbeb38352a7bd1fbe34d13f4a5e23b1327bba 100644 |
--- a/chrome/browser/ui/toolbar/toolbar_actions_model.cc |
+++ b/chrome/browser/ui/toolbar/toolbar_actions_model.cc |
@@ -172,11 +172,11 @@ ScopedVector<ToolbarActionViewController> ToolbarActionsModel::CreateActions( |
return action_list; |
} |
-scoped_ptr<ToolbarActionViewController> |
+std::unique_ptr<ToolbarActionViewController> |
ToolbarActionsModel::CreateActionForItem(Browser* browser, |
ToolbarActionsBar* bar, |
const ToolbarItem& item) { |
- scoped_ptr<ToolbarActionViewController> result; |
+ std::unique_ptr<ToolbarActionViewController> result; |
switch (item.type) { |
case EXTENSION_ACTION: { |
// Get the extension. |