| Index: ui/compositor/compositor.cc
|
| diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
|
| index 54bca2c1947107011e3789aa41c5f29c48065aad..85871cc9164cb443d1e6378db5cd815994a2a1a8 100644
|
| --- a/ui/compositor/compositor.cc
|
| +++ b/ui/compositor/compositor.cc
|
| @@ -232,7 +232,7 @@ Compositor::~Compositor() {
|
| }
|
|
|
| void Compositor::SetOutputSurface(
|
| - scoped_ptr<cc::OutputSurface> output_surface) {
|
| + std::unique_ptr<cc::OutputSurface> output_surface) {
|
| output_surface_requested_ = false;
|
| host_->SetOutputSurface(std::move(output_surface));
|
| }
|
| @@ -286,7 +286,7 @@ void Compositor::DisableSwapUntilResize() {
|
| }
|
|
|
| void Compositor::SetLatencyInfo(const ui::LatencyInfo& latency_info) {
|
| - scoped_ptr<cc::SwapPromise> swap_promise(
|
| + std::unique_ptr<cc::SwapPromise> swap_promise(
|
| new cc::LatencyInfoSwapPromise(latency_info));
|
| host_->QueueSwapPromise(std::move(swap_promise));
|
| }
|
|
|