| Index: chromecast/media/cma/test/mock_frame_consumer.h
|
| diff --git a/chromecast/media/cma/test/mock_frame_consumer.h b/chromecast/media/cma/test/mock_frame_consumer.h
|
| index cb00a9a2c4693f526da7a977d92d0913ab9a63ab..acdce71705f1a7e9ed65a4bacc03600c5a977c27 100644
|
| --- a/chromecast/media/cma/test/mock_frame_consumer.h
|
| +++ b/chromecast/media/cma/test/mock_frame_consumer.h
|
| @@ -7,11 +7,11 @@
|
|
|
| #include <stddef.h>
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
|
|
| namespace media {
|
| class AudioDecoderConfig;
|
| @@ -31,7 +31,7 @@ class MockFrameConsumer {
|
|
|
| void Configure(const std::vector<bool>& delayed_task_pattern,
|
| bool last_read_aborted_by_flush,
|
| - scoped_ptr<FrameGeneratorForTest> frame_generator);
|
| + std::unique_ptr<FrameGeneratorForTest> frame_generator);
|
|
|
| // Starts consuming frames. Invoke |done_cb| when all the expected frames
|
| // have been received.
|
| @@ -61,7 +61,7 @@ class MockFrameConsumer {
|
| bool last_read_aborted_by_flush_;
|
|
|
| // Expected results.
|
| - scoped_ptr<FrameGeneratorForTest> frame_generator_;
|
| + std::unique_ptr<FrameGeneratorForTest> frame_generator_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MockFrameConsumer);
|
| };
|
|
|