| Index: media/base/yuv_convert_perftest.cc
|
| diff --git a/media/base/yuv_convert_perftest.cc b/media/base/yuv_convert_perftest.cc
|
| index f92be0462e4c56438f99e216d937c1bc4a027df0..ddf777cf3ba0ec82f9b8a798dd07a78dc58818ce 100644
|
| --- a/media/base/yuv_convert_perftest.cc
|
| +++ b/media/base/yuv_convert_perftest.cc
|
| @@ -4,12 +4,13 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/base_paths.h"
|
| #include "base/cpu.h"
|
| #include "base/files/file_util.h"
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/path_service.h"
|
| #include "base/time/time.h"
|
| #include "build/build_config.h"
|
| @@ -63,8 +64,8 @@ class YUVConvertPerfTest : public testing::Test {
|
| CHECK_EQ(bytes_read, kYUV12Size);
|
| }
|
|
|
| - scoped_ptr<uint8_t[]> yuv_bytes_;
|
| - scoped_ptr<uint8_t[]> rgb_bytes_converted_;
|
| + std::unique_ptr<uint8_t[]> yuv_bytes_;
|
| + std::unique_ptr<uint8_t[]> rgb_bytes_converted_;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(YUVConvertPerfTest);
|
|
|