Index: chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm |
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm |
index d7345ca57c98ba8eb71e394de6b2e90171c82e98..41544ca0527f5796bfb42ce70dd2d2e11a86a6c3 100644 |
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm |
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm |
@@ -189,7 +189,7 @@ class TabStripControllerTest : public CocoaProfileTest { |
[NSApp postEvent:event atStart:NO]; |
} |
- scoped_ptr<TestTabStripModelDelegate> delegate_; |
+ std::unique_ptr<TestTabStripModelDelegate> delegate_; |
TabStripModel* model_; |
base::scoped_nsobject<TestTabStripControllerDelegate> controller_delegate_; |
base::scoped_nsobject<TabStripController> controller_; |
@@ -295,7 +295,7 @@ TEST_F(TabStripControllerTest, CorrectTitleAndToolTipTextFromSetTabTitle) { |
GetMediaStreamCaptureIndicator(); |
const MediaStreamDevice dummyVideoCaptureDevice( |
content::MEDIA_TAB_VIDEO_CAPTURE, "dummy_id", "dummy name"); |
- scoped_ptr<MediaStreamUI> streamUi(indicator->RegisterMediaStream( |
+ std::unique_ptr<MediaStreamUI> streamUi(indicator->RegisterMediaStream( |
contents, MediaStreamDevices(1, dummyVideoCaptureDevice))); |
streamUi->OnStarted(base::Bind(&base::DoNothing)); |
EXPECT_EQ(TabAlertState::TAB_CAPTURING, |