Index: remoting/host/chromeos/skia_bitmap_desktop_frame.cc |
diff --git a/remoting/host/chromeos/skia_bitmap_desktop_frame.cc b/remoting/host/chromeos/skia_bitmap_desktop_frame.cc |
index dfd9b108256a4f7ad0b992f7819f194ab392ba5f..a692a39a35addbf303290a727519de1c4f5c1da8 100644 |
--- a/remoting/host/chromeos/skia_bitmap_desktop_frame.cc |
+++ b/remoting/host/chromeos/skia_bitmap_desktop_frame.cc |
@@ -14,8 +14,7 @@ namespace remoting { |
// static |
SkiaBitmapDesktopFrame* SkiaBitmapDesktopFrame::Create( |
- scoped_ptr<SkBitmap> bitmap) { |
- |
+ std::unique_ptr<SkBitmap> bitmap) { |
webrtc::DesktopSize size(bitmap->width(), bitmap->height()); |
DCHECK_EQ(kBGRA_8888_SkColorType, bitmap->info().colorType()) |
<< "DesktopFrame objects always hold RGBA data."; |
@@ -34,7 +33,7 @@ SkiaBitmapDesktopFrame* SkiaBitmapDesktopFrame::Create( |
SkiaBitmapDesktopFrame::SkiaBitmapDesktopFrame(webrtc::DesktopSize size, |
int stride, |
uint8_t* data, |
- scoped_ptr<SkBitmap> bitmap) |
+ std::unique_ptr<SkBitmap> bitmap) |
: DesktopFrame(size, stride, data, nullptr), bitmap_(std::move(bitmap)) {} |
SkiaBitmapDesktopFrame::~SkiaBitmapDesktopFrame() {} |