| Index: content/browser/compositor/software_output_device_ozone.cc
|
| diff --git a/content/browser/compositor/software_output_device_ozone.cc b/content/browser/compositor/software_output_device_ozone.cc
|
| index 7de2de21d72c17c707ea8ab5db2d472f97e8773b..c65cda5dc19150566d93e979cc98488b6c40c048 100644
|
| --- a/content/browser/compositor/software_output_device_ozone.cc
|
| +++ b/content/browser/compositor/software_output_device_ozone.cc
|
| @@ -2,8 +2,10 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "content/browser/compositor/software_output_device_ozone.h"
|
| +
|
| +#include <memory>
|
| +
|
| #include "ui/compositor/compositor.h"
|
| #include "ui/gfx/skia_util.h"
|
| #include "ui/gfx/vsync_provider.h"
|
| @@ -14,9 +16,9 @@
|
| namespace content {
|
|
|
| // static
|
| -scoped_ptr<SoftwareOutputDeviceOzone> SoftwareOutputDeviceOzone::Create(
|
| +std::unique_ptr<SoftwareOutputDeviceOzone> SoftwareOutputDeviceOzone::Create(
|
| ui::Compositor* compositor) {
|
| - scoped_ptr<SoftwareOutputDeviceOzone> result(
|
| + std::unique_ptr<SoftwareOutputDeviceOzone> result(
|
| new SoftwareOutputDeviceOzone(compositor));
|
| if (!result->surface_ozone_)
|
| return nullptr;
|
|
|