| Index: chromecast/media/cma/test/mock_frame_provider.h
|
| diff --git a/chromecast/media/cma/test/mock_frame_provider.h b/chromecast/media/cma/test/mock_frame_provider.h
|
| index bf42e9513a96731be566ded206e0b506a51172b7..4ef1586721d8dd27f0ca63d2525aa38eb01d7a93 100644
|
| --- a/chromecast/media/cma/test/mock_frame_provider.h
|
| +++ b/chromecast/media/cma/test/mock_frame_provider.h
|
| @@ -7,10 +7,10 @@
|
|
|
| #include <stddef.h>
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "chromecast/media/cma/base/coded_frame_provider.h"
|
|
|
| namespace chromecast {
|
| @@ -22,9 +22,8 @@ class MockFrameProvider : public CodedFrameProvider {
|
| MockFrameProvider();
|
| ~MockFrameProvider() override;
|
|
|
| - void Configure(
|
| - const std::vector<bool>& delayed_task_pattern,
|
| - scoped_ptr<FrameGeneratorForTest> frame_generator);
|
| + void Configure(const std::vector<bool>& delayed_task_pattern,
|
| + std::unique_ptr<FrameGeneratorForTest> frame_generator);
|
| void SetDelayFlush(bool delay_flush);
|
|
|
| // CodedFrameProvider implementation.
|
| @@ -45,7 +44,7 @@ class MockFrameProvider : public CodedFrameProvider {
|
| size_t pattern_idx_;
|
| bool delay_flush_;
|
|
|
| - scoped_ptr<FrameGeneratorForTest> frame_generator_;
|
| + std::unique_ptr<FrameGeneratorForTest> frame_generator_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MockFrameProvider);
|
| };
|
|
|