| Index: media/filters/ffmpeg_glue_unittest.cc
|
| diff --git a/media/filters/ffmpeg_glue_unittest.cc b/media/filters/ffmpeg_glue_unittest.cc
|
| index 783289f570c53c4d74f9fba2ae3d28e6af6e22c2..de123ec2727be5819dee186fcfb505d6a741d589 100644
|
| --- a/media/filters/ffmpeg_glue_unittest.cc
|
| +++ b/media/filters/ffmpeg_glue_unittest.cc
|
| @@ -2,15 +2,17 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "media/filters/ffmpeg_glue.h"
|
| +
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "media/base/mock_filters.h"
|
| #include "media/base/test_data_util.h"
|
| #include "media/ffmpeg/ffmpeg_common.h"
|
| -#include "media/filters/ffmpeg_glue.h"
|
| #include "media/filters/in_memory_url_protocol.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -67,8 +69,8 @@ class FFmpegGlueTest : public ::testing::Test {
|
| }
|
|
|
| protected:
|
| - scoped_ptr<FFmpegGlue> glue_;
|
| - scoped_ptr< StrictMock<MockProtocol> > protocol_;
|
| + std::unique_ptr<FFmpegGlue> glue_;
|
| + std::unique_ptr<StrictMock<MockProtocol>> protocol_;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(FFmpegGlueTest);
|
| @@ -101,10 +103,10 @@ class FFmpegGlueDestructionTest : public ::testing::Test {
|
| }
|
|
|
| protected:
|
| - scoped_ptr<FFmpegGlue> glue_;
|
| + std::unique_ptr<FFmpegGlue> glue_;
|
|
|
| private:
|
| - scoped_ptr<InMemoryUrlProtocol> protocol_;
|
| + std::unique_ptr<InMemoryUrlProtocol> protocol_;
|
| scoped_refptr<DecoderBuffer> data_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FFmpegGlueDestructionTest);
|
|
|