| Index: chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
|
| diff --git a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
|
| index c64eadfe5a408cf5786f5a503719af4e9e0ee3f4..487a59a88d9ba57f538fb13f71c930c0a21db8ee 100644
|
| --- a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
|
| +++ b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
|
| @@ -47,7 +47,7 @@ std::set<std::string> ComponentToolbarActionsFactory::GetInitialComponentIds(
|
| return component_ids;
|
| }
|
|
|
| -scoped_ptr<ToolbarActionViewController>
|
| +std::unique_ptr<ToolbarActionViewController>
|
| ComponentToolbarActionsFactory::GetComponentToolbarActionForId(
|
| const std::string& id,
|
| Browser* browser,
|
| @@ -64,12 +64,12 @@ ComponentToolbarActionsFactory::GetComponentToolbarActionForId(
|
| // e.g., RegisterChromeAction().
|
| #if defined(ENABLE_MEDIA_ROUTER)
|
| if (id == kMediaRouterActionId)
|
| - return scoped_ptr<ToolbarActionViewController>(
|
| + return std::unique_ptr<ToolbarActionViewController>(
|
| new MediaRouterAction(browser, bar));
|
| #endif // defined(ENABLE_MEDIA_ROUTER)
|
|
|
| NOTREACHED();
|
| - return scoped_ptr<ToolbarActionViewController>();
|
| + return std::unique_ptr<ToolbarActionViewController>();
|
| }
|
|
|
| // static
|
|
|