| Index: cc/base/region.h
|
| diff --git a/cc/base/region.h b/cc/base/region.h
|
| index 583311e09fe007618f133e5084db6183f5ddd288..87d7973775285b931393cc36227c1aad0f968b6b 100644
|
| --- a/cc/base/region.h
|
| +++ b/cc/base/region.h
|
| @@ -5,9 +5,9 @@
|
| #ifndef CC_BASE_REGION_H_
|
| #define CC_BASE_REGION_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "cc/base/cc_export.h"
|
| #include "third_party/skia/include/core/SkRegion.h"
|
| #include "ui/gfx/geometry/rect.h"
|
| @@ -62,7 +62,7 @@ class CC_EXPORT Region {
|
| }
|
|
|
| std::string ToString() const;
|
| - scoped_ptr<base::Value> AsValue() const;
|
| + std::unique_ptr<base::Value> AsValue() const;
|
| void AsValueInto(base::trace_event::TracedValue* array) const;
|
|
|
| class CC_EXPORT Iterator {
|
|
|