Index: chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc |
diff --git a/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc b/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc |
index f449733952e99f0b62d5ef7659f5e4c458824de4..f4e75a92de03938737b29b734c5563df7f11b96f 100644 |
--- a/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc |
+++ b/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc |
@@ -35,13 +35,13 @@ MockComponentToolbarActionsFactory::GetInitialComponentIds(Profile* profile) { |
return ids; |
} |
-scoped_ptr<ToolbarActionViewController> |
+std::unique_ptr<ToolbarActionViewController> |
MockComponentToolbarActionsFactory::GetComponentToolbarActionForId( |
const std::string& id, |
Browser* browser, |
ToolbarActionsBar* bar) { |
DCHECK_EQ(kActionIdForTesting, id); |
- return scoped_ptr<ToolbarActionViewController>( |
+ return std::unique_ptr<ToolbarActionViewController>( |
new TestToolbarActionViewController( |
MockComponentToolbarActionsFactory::kActionIdForTesting)); |
} |