| Index: cc/tiles/tile_priority.h
|
| diff --git a/cc/tiles/tile_priority.h b/cc/tiles/tile_priority.h
|
| index 023fac53cf04244c9ca20666e10fe462084e8cbe..cf0bbd138179ef61f4819944206bec1406b25db7 100644
|
| --- a/cc/tiles/tile_priority.h
|
| +++ b/cc/tiles/tile_priority.h
|
| @@ -9,9 +9,9 @@
|
|
|
| #include <algorithm>
|
| #include <limits>
|
| +#include <memory>
|
| #include <string>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/trace_event/trace_event_argument.h"
|
| #include "cc/base/cc_export.h"
|
|
|
| @@ -29,7 +29,7 @@ enum WhichTree {
|
| LAST_TREE = 1
|
| // Be sure to update WhichTreeAsValue when adding new fields.
|
| };
|
| -scoped_ptr<base::Value> WhichTreeAsValue(WhichTree tree);
|
| +std::unique_ptr<base::Value> WhichTreeAsValue(WhichTree tree);
|
|
|
| enum TileResolution {
|
| LOW_RESOLUTION = 0 ,
|
|
|