commit 2bb3afa054624802b1a9f9c457de0527a57beb00
author kwiberg <kwiberg@webrtc.org> Wed Mar 16 22:58:08 2016
committer Commit bot <commit-bot@chromium.org> Wed Mar 16 22:58:13 2016
tree c2509561dc3935e7dc53223dbb10ffbe960c1d94
parent 672b78ff6a43c63c4e9c28d34710924c6197f182

Replace scoped_ptr with unique_ptr in webrtc/modules/desktop_capture/

BUG=webrtc:5520

Review URL: https://codereview.webrtc.org/1743203002

Cr-Commit-Position: refs/heads/master@{#12023}

webrtc/modules/desktop_capture/desktop_and_cursor_composer.h

diff --git a/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h b/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h
index 6d381c8..cd0b2cf 100644
--- a/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h
+++ b/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h
@@ -11,6 +11,8 @@
 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_
 #define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_
 
+#include <memory>
+
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/desktop_capture/desktop_capturer.h"
 #include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h"
@@ -47,12 +49,12 @@
   void OnMouseCursorPosition(MouseCursorMonitor::CursorState state,
                              const DesktopVector& position) override;
 
-  rtc::scoped_ptr<DesktopCapturer> desktop_capturer_;
-  rtc::scoped_ptr<MouseCursorMonitor> mouse_monitor_;
+  std::unique_ptr<DesktopCapturer> desktop_capturer_;
+  std::unique_ptr<MouseCursorMonitor> mouse_monitor_;
 
   DesktopCapturer::Callback* callback_;
 
-  rtc::scoped_ptr<MouseCursor> cursor_;
+  std::unique_ptr<MouseCursor> cursor_;
   MouseCursorMonitor::CursorState cursor_state_;
   DesktopVector cursor_position_;