| Index: media/base/vector_math_unittest.cc
|
| diff --git a/media/base/vector_math_unittest.cc b/media/base/vector_math_unittest.cc
|
| index e9519cc54cd930507c6c1fb119e72f2db8c2cd2b..3fcb3fad494f000efcdea5c8a659b1f3f0db0c0f 100644
|
| --- a/media/base/vector_math_unittest.cc
|
| +++ b/media/base/vector_math_unittest.cc
|
| @@ -6,9 +6,10 @@
|
| #define _USE_MATH_DEFINES
|
| #include <cmath>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| #include "base/memory/aligned_memory.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/stringize_macros.h"
|
| #include "build/build_config.h"
|
| @@ -49,8 +50,8 @@ class VectorMathTest : public testing::Test {
|
| }
|
|
|
| protected:
|
| - scoped_ptr<float[], base::AlignedFreeDeleter> input_vector_;
|
| - scoped_ptr<float[], base::AlignedFreeDeleter> output_vector_;
|
| + std::unique_ptr<float[], base::AlignedFreeDeleter> input_vector_;
|
| + std::unique_ptr<float[], base::AlignedFreeDeleter> output_vector_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(VectorMathTest);
|
| };
|
| @@ -247,7 +248,7 @@ class EWMATestScenario {
|
|
|
| private:
|
| float initial_value_;
|
| - scoped_ptr<float, base::AlignedFreeDeleter> data_;
|
| + std::unique_ptr<float, base::AlignedFreeDeleter> data_;
|
| int data_len_;
|
| float smoothing_factor_;
|
| float expected_final_avg_;
|
|
|