| Index: media/filters/video_frame_stream_unittest.cc
|
| diff --git a/media/filters/video_frame_stream_unittest.cc b/media/filters/video_frame_stream_unittest.cc
|
| index 247b25eacc6a3f5b190536b5b5bb3b15b016f737..5cd46288bbadbddf8d621be6fb53841040446eab 100644
|
| --- a/media/filters/video_frame_stream_unittest.cc
|
| +++ b/media/filters/video_frame_stream_unittest.cc
|
| @@ -353,13 +353,13 @@ class VideoFrameStreamTest
|
|
|
| base::MessageLoop message_loop_;
|
|
|
| - scoped_ptr<VideoFrameStream> video_frame_stream_;
|
| - scoped_ptr<FakeDemuxerStream> demuxer_stream_;
|
| - scoped_ptr<StrictMock<MockCdmContext>> cdm_context_;
|
| + std::unique_ptr<VideoFrameStream> video_frame_stream_;
|
| + std::unique_ptr<FakeDemuxerStream> demuxer_stream_;
|
| + std::unique_ptr<StrictMock<MockCdmContext>> cdm_context_;
|
|
|
| // Use NiceMock since we don't care about most of calls on the decryptor,
|
| // e.g. RegisterNewKeyCB().
|
| - scoped_ptr<NiceMock<MockDecryptor>> decryptor_;
|
| + std::unique_ptr<NiceMock<MockDecryptor>> decryptor_;
|
|
|
| // Three decoders are needed to test that decoder fallback can occur more than
|
| // once on a config change. They are owned by |video_frame_stream_|.
|
|
|