| Index: chrome/browser/ui/toolbar/media_router_action_unittest.cc
|
| diff --git a/chrome/browser/ui/toolbar/media_router_action_unittest.cc b/chrome/browser/ui/toolbar/media_router_action_unittest.cc
|
| index a6bf28c30aa78f04ac137f3d91497dd906323ded..e6bad740727713a04230d4e43151784a59b1e631 100644
|
| --- a/chrome/browser/ui/toolbar/media_router_action_unittest.cc
|
| +++ b/chrome/browser/ui/toolbar/media_router_action_unittest.cc
|
| @@ -170,9 +170,9 @@ class MediaRouterActionUnitTest : public MediaRouterTest {
|
| private:
|
| // A BrowserActionTestUtil object constructed with the associated
|
| // ToolbarActionsBar.
|
| - scoped_ptr<BrowserActionTestUtil> browser_action_test_util_;
|
| + std::unique_ptr<BrowserActionTestUtil> browser_action_test_util_;
|
|
|
| - scoped_ptr<TestMediaRouterAction> action_;
|
| + std::unique_ptr<TestMediaRouterAction> action_;
|
|
|
| // The associated ToolbarActionsModel (owned by the keyed service setup).
|
| ToolbarActionsModel* toolbar_model_;
|
| @@ -336,7 +336,7 @@ TEST_F(MediaRouterActionUnitTest, IconPressedState) {
|
| action()->SetMediaRouterDialogController(dialog_controller_);
|
|
|
| // Create a ToolbarActionViewDelegate to use for MediaRouterAction.
|
| - scoped_ptr<MockToolbarActionViewDelegate> mock_delegate(
|
| + std::unique_ptr<MockToolbarActionViewDelegate> mock_delegate(
|
| new MockToolbarActionViewDelegate());
|
|
|
| EXPECT_CALL(*mock_delegate, GetCurrentWebContents()).WillOnce(
|
|
|