Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(763)

Unified Diff: media/filters/decrypting_demuxer_stream_unittest.cc

Issue 1904213003: Convert //media/filters from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/filters/decrypting_demuxer_stream_unittest.cc
diff --git a/media/filters/decrypting_demuxer_stream_unittest.cc b/media/filters/decrypting_demuxer_stream_unittest.cc
index f08733b22ba1e4394fb83356fc5006b3e2cf48cd..a245d25fea360820fb2965eb8d22e69776e886fc 100644
--- a/media/filters/decrypting_demuxer_stream_unittest.cc
+++ b/media/filters/decrypting_demuxer_stream_unittest.cc
@@ -39,10 +39,10 @@ static scoped_refptr<DecoderBuffer> CreateFakeEncryptedStreamBuffer(
scoped_refptr<DecoderBuffer> buffer(new DecoderBuffer(kFakeBufferSize));
std::string iv = is_clear ? std::string() :
std::string(reinterpret_cast<const char*>(kFakeIv), arraysize(kFakeIv));
- buffer->set_decrypt_config(scoped_ptr<DecryptConfig>(new DecryptConfig(
- std::string(reinterpret_cast<const char*>(kFakeKeyId),
- arraysize(kFakeKeyId)),
- iv, std::vector<SubsampleEntry>())));
+ buffer->set_decrypt_config(std::unique_ptr<DecryptConfig>(
+ new DecryptConfig(std::string(reinterpret_cast<const char*>(kFakeKeyId),
+ arraysize(kFakeKeyId)),
+ iv, std::vector<SubsampleEntry>())));
return buffer;
}
@@ -254,13 +254,13 @@ class DecryptingDemuxerStreamTest : public testing::Test {
MOCK_METHOD0(OnWaitingForDecryptionKey, void(void));
base::MessageLoop message_loop_;
- scoped_ptr<DecryptingDemuxerStream> demuxer_stream_;
- scoped_ptr<StrictMock<MockCdmContext>> cdm_context_;
- scoped_ptr<StrictMock<MockDecryptor>> decryptor_;
+ std::unique_ptr<DecryptingDemuxerStream> demuxer_stream_;
+ std::unique_ptr<StrictMock<MockCdmContext>> cdm_context_;
+ std::unique_ptr<StrictMock<MockDecryptor>> decryptor_;
// Whether the |demuxer_stream_| is successfully initialized.
bool is_initialized_;
- scoped_ptr<StrictMock<MockDemuxerStream> > input_audio_stream_;
- scoped_ptr<StrictMock<MockDemuxerStream> > input_video_stream_;
+ std::unique_ptr<StrictMock<MockDemuxerStream>> input_audio_stream_;
+ std::unique_ptr<StrictMock<MockDemuxerStream>> input_video_stream_;
DemuxerStream::ReadCB pending_demuxer_read_cb_;
Decryptor::NewKeyCB key_added_cb_;

Powered by Google App Engine
This is Rietveld 408576698