| Index: cc/trees/proxy_common.h
|
| diff --git a/cc/trees/proxy_common.h b/cc/trees/proxy_common.h
|
| index 046f1056ea96e0bac347b50943e38610da1e84a6..2516ecd137405c1a27d013da8c1be70f3a9e7796 100644
|
| --- a/cc/trees/proxy_common.h
|
| +++ b/cc/trees/proxy_common.h
|
| @@ -25,7 +25,7 @@ struct CC_EXPORT BeginMainFrameAndCommitState {
|
|
|
| unsigned int begin_frame_id;
|
| BeginFrameArgs begin_frame_args;
|
| - scoped_ptr<ScrollAndScaleSet> scroll_info;
|
| + std::unique_ptr<ScrollAndScaleSet> scroll_info;
|
| size_t memory_allocation_limit_bytes;
|
| bool evicted_ui_resources;
|
|
|
|
|