| Index: media/filters/decrypting_audio_decoder_unittest.cc
|
| diff --git a/media/filters/decrypting_audio_decoder_unittest.cc b/media/filters/decrypting_audio_decoder_unittest.cc
|
| index 81f2504e8273cc260b92ad385c3d6d21470bacda..4b9784ee1a747d93554a333464fad8027b57d0a2 100644
|
| --- a/media/filters/decrypting_audio_decoder_unittest.cc
|
| +++ b/media/filters/decrypting_audio_decoder_unittest.cc
|
| @@ -43,7 +43,7 @@ const int kDecodingDelay = 3;
|
| static scoped_refptr<DecoderBuffer> CreateFakeEncryptedBuffer() {
|
| const int buffer_size = 16; // Need a non-empty buffer;
|
| scoped_refptr<DecoderBuffer> buffer(new DecoderBuffer(buffer_size));
|
| - buffer->set_decrypt_config(scoped_ptr<DecryptConfig>(new DecryptConfig(
|
| + buffer->set_decrypt_config(std::unique_ptr<DecryptConfig>(new DecryptConfig(
|
| std::string(reinterpret_cast<const char*>(kFakeKeyId),
|
| arraysize(kFakeKeyId)),
|
| std::string(reinterpret_cast<const char*>(kFakeIv), arraysize(kFakeIv)),
|
| @@ -256,9 +256,9 @@ class DecryptingAudioDecoderTest : public testing::Test {
|
| MOCK_METHOD0(OnWaitingForDecryptionKey, void(void));
|
|
|
| base::MessageLoop message_loop_;
|
| - scoped_ptr<DecryptingAudioDecoder> decoder_;
|
| - scoped_ptr<StrictMock<MockCdmContext>> cdm_context_;
|
| - scoped_ptr<StrictMock<MockDecryptor>> decryptor_;
|
| + std::unique_ptr<DecryptingAudioDecoder> decoder_;
|
| + std::unique_ptr<StrictMock<MockCdmContext>> cdm_context_;
|
| + std::unique_ptr<StrictMock<MockDecryptor>> decryptor_;
|
| AudioDecoderConfig config_;
|
|
|
| // Variables to help the |decryptor_| to simulate decoding delay and flushing.
|
|
|