| Index: content/renderer/media/media_stream_video_capture_source_unittest.cc
|
| diff --git a/content/renderer/media/media_stream_video_capture_source_unittest.cc b/content/renderer/media/media_stream_video_capture_source_unittest.cc
|
| index 6ebecadb37c58f3738e770f90e9ade2ea52a4910..db7ff9ec3926ee74dff714b575ccc01c4dd737ab 100644
|
| --- a/content/renderer/media/media_stream_video_capture_source_unittest.cc
|
| +++ b/content/renderer/media/media_stream_video_capture_source_unittest.cc
|
| @@ -30,6 +30,7 @@ class MockVideoCapturerDelegate : public VideoCapturerDelegate {
|
| const RunningCallback& running_callback));
|
| MOCK_METHOD0(StopCapture, void());
|
|
|
| + protected:
|
| virtual ~MockVideoCapturerDelegate() {}
|
| };
|
|
|
| @@ -48,14 +49,14 @@ class MediaStreamVideoCapturerSourceTest : public testing::Test {
|
| }
|
|
|
| void InitWithDeviceInfo(const StreamDeviceInfo& device_info) {
|
| - scoped_ptr<MockVideoCapturerDelegate> delegate(
|
| + scoped_refptr<MockVideoCapturerDelegate> delegate(
|
| new MockVideoCapturerDelegate(device_info));
|
| delegate_ = delegate.get();
|
| source_ = new MediaStreamVideoCapturerSource(
|
| device_info,
|
| base::Bind(&MediaStreamVideoCapturerSourceTest::OnSourceStopped,
|
| base::Unretained(this)),
|
| - delegate.Pass());
|
| + delegate);
|
|
|
| webkit_source_.initialize(base::UTF8ToUTF16("dummy_source_id"),
|
| blink::WebMediaStreamSource::TypeVideo,
|
| @@ -135,14 +136,14 @@ TEST_F(MediaStreamVideoCapturerSourceTest,
|
| TEST_F(MediaStreamVideoCapturerSourceTest, Ended) {
|
| StreamDeviceInfo device_info;
|
| device_info.device.type = MEDIA_DESKTOP_VIDEO_CAPTURE;
|
| - scoped_ptr<VideoCapturerDelegate> delegate(
|
| + scoped_refptr<VideoCapturerDelegate> delegate(
|
| new VideoCapturerDelegate(device_info));
|
| VideoCapturerDelegate* delegate_ptr = delegate.get();
|
| source_ = new MediaStreamVideoCapturerSource(
|
| device_info,
|
| base::Bind(&MediaStreamVideoCapturerSourceTest::OnSourceStopped,
|
| base::Unretained(this)),
|
| - delegate.Pass());
|
| + delegate);
|
| webkit_source_.initialize(base::UTF8ToUTF16("dummy_source_id"),
|
| blink::WebMediaStreamSource::TypeVideo,
|
| base::UTF8ToUTF16("dummy_source_name"),
|
| @@ -203,7 +204,7 @@ TEST_F(MediaStreamVideoCapturerSourceTest, CaptureTime) {
|
| testing::SaveArg<2>(&running_cb)));
|
| EXPECT_CALL(mock_delegate(), StopCapture());
|
| blink::WebMediaStreamTrack track = StartSource();
|
| - running_cb.Run(MEDIA_DEVICE_OK);
|
| + running_cb.Run(true);
|
|
|
| base::RunLoop run_loop;
|
| base::TimeTicks reference_capture_time =
|
|
|