| Index: media/filters/decrypting_video_decoder_unittest.cc
|
| diff --git a/media/filters/decrypting_video_decoder_unittest.cc b/media/filters/decrypting_video_decoder_unittest.cc
|
| index a3786cd992942e7f743006a1bb11f9d2036839b1..5f333c64babcd28d349d283800d8f00576a37156 100644
|
| --- a/media/filters/decrypting_video_decoder_unittest.cc
|
| +++ b/media/filters/decrypting_video_decoder_unittest.cc
|
| @@ -36,7 +36,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)),
|
| @@ -232,9 +232,9 @@ class DecryptingVideoDecoderTest : public testing::Test {
|
| MOCK_METHOD0(OnWaitingForDecryptionKey, void(void));
|
|
|
| base::MessageLoop message_loop_;
|
| - scoped_ptr<DecryptingVideoDecoder> decoder_;
|
| - scoped_ptr<StrictMock<MockCdmContext>> cdm_context_;
|
| - scoped_ptr<StrictMock<MockDecryptor>> decryptor_;
|
| + std::unique_ptr<DecryptingVideoDecoder> decoder_;
|
| + std::unique_ptr<StrictMock<MockCdmContext>> cdm_context_;
|
| + std::unique_ptr<StrictMock<MockDecryptor>> decryptor_;
|
|
|
| // Variables to help the |decryptor_| to simulate decoding delay and flushing.
|
| int num_decrypt_and_decode_calls_;
|
|
|