| Index: remoting/host/chromeos/aura_desktop_capturer.cc
|
| diff --git a/remoting/host/chromeos/aura_desktop_capturer.cc b/remoting/host/chromeos/aura_desktop_capturer.cc
|
| index dbaea58006bd5d4ca60e4375f7c51ecc96aeecf2..ee80cd2f25d679686c597059c54d991db8f5eaa4 100644
|
| --- a/remoting/host/chromeos/aura_desktop_capturer.cc
|
| +++ b/remoting/host/chromeos/aura_desktop_capturer.cc
|
| @@ -42,11 +42,9 @@ void AuraDesktopCapturer::Start(webrtc::DesktopCapturer::Callback* callback) {
|
| }
|
|
|
| void AuraDesktopCapturer::Capture(const webrtc::DesktopRegion&) {
|
| - scoped_ptr<cc::CopyOutputRequest> request =
|
| - cc::CopyOutputRequest::CreateBitmapRequest(
|
| - base::Bind(
|
| - &AuraDesktopCapturer::OnFrameCaptured,
|
| - weak_factory_.GetWeakPtr()));
|
| + std::unique_ptr<cc::CopyOutputRequest> request =
|
| + cc::CopyOutputRequest::CreateBitmapRequest(base::Bind(
|
| + &AuraDesktopCapturer::OnFrameCaptured, weak_factory_.GetWeakPtr()));
|
|
|
| gfx::Rect window_rect(desktop_window_->bounds().size());
|
|
|
| @@ -55,7 +53,7 @@ void AuraDesktopCapturer::Capture(const webrtc::DesktopRegion&) {
|
| }
|
|
|
| void AuraDesktopCapturer::OnFrameCaptured(
|
| - scoped_ptr<cc::CopyOutputResult> result) {
|
| + std::unique_ptr<cc::CopyOutputResult> result) {
|
| if (result->IsEmpty()) {
|
| callback_->OnCaptureCompleted(nullptr);
|
| return;
|
| @@ -63,9 +61,9 @@ void AuraDesktopCapturer::OnFrameCaptured(
|
|
|
| DCHECK(result->HasBitmap());
|
|
|
| - scoped_ptr<SkBitmap> bitmap = result->TakeBitmap();
|
| + std::unique_ptr<SkBitmap> bitmap = result->TakeBitmap();
|
|
|
| - scoped_ptr<webrtc::DesktopFrame> frame(
|
| + std::unique_ptr<webrtc::DesktopFrame> frame(
|
| SkiaBitmapDesktopFrame::Create(std::move(bitmap)));
|
|
|
| // |VideoFramePump| will not encode the frame if |updated_region| is empty.
|
|
|