| Index: cc/base/math_util.h
|
| diff --git a/cc/base/math_util.h b/cc/base/math_util.h
|
| index c596348a0b740934a76be47445542c7792fe2ead..4e3347e3935cb0c70e1c7ff850174bbe712a9484 100644
|
| --- a/cc/base/math_util.h
|
| +++ b/cc/base/math_util.h
|
| @@ -7,10 +7,10 @@
|
|
|
| #include <algorithm>
|
| #include <cmath>
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/logging.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "cc/base/cc_export.h"
|
| #include "ui/gfx/geometry/box_f.h"
|
| #include "ui/gfx/geometry/point3_f.h"
|
| @@ -254,10 +254,10 @@ class CC_EXPORT MathUtil {
|
| const gfx::Vector2dF& destination);
|
|
|
| // Conversion to value.
|
| - static scoped_ptr<base::Value> AsValue(const gfx::Size& s);
|
| - static scoped_ptr<base::Value> AsValue(const gfx::Rect& r);
|
| + static std::unique_ptr<base::Value> AsValue(const gfx::Size& s);
|
| + static std::unique_ptr<base::Value> AsValue(const gfx::Rect& r);
|
| static bool FromValue(const base::Value*, gfx::Rect* out_rect);
|
| - static scoped_ptr<base::Value> AsValue(const gfx::PointF& q);
|
| + static std::unique_ptr<base::Value> AsValue(const gfx::PointF& q);
|
|
|
| static void AddToTracedValue(const char* name,
|
| const gfx::Size& s,
|
|
|