Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(265)

Unified Diff: webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc

Issue 1743203002: Replace scoped_ptr with unique_ptr in webrtc/modules/desktop_capture/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: More Windows reverts Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc
diff --git a/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc b/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc
index 5d5a81cabac4574823fc1a91116ef58668fd6996..35197ef9dca74bc4f780d8ee1f66f13bb31e2125 100644
--- a/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc
+++ b/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc
@@ -8,10 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <memory>
+
#include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/desktop_capture/desktop_capture_options.h"
#include "webrtc/modules/desktop_capture/desktop_frame.h"
#include "webrtc/modules/desktop_capture/mouse_cursor.h"
@@ -40,7 +41,7 @@ class MouseCursorMonitorTest : public testing::Test,
}
protected:
- rtc::scoped_ptr<MouseCursor> cursor_image_;
+ std::unique_ptr<MouseCursor> cursor_image_;
MouseCursorMonitor::CursorState state_;
DesktopVector position_;
bool position_received_;
@@ -62,7 +63,7 @@ class MouseCursorMonitorTest : public testing::Test,
#endif
TEST_F(MouseCursorMonitorTest, MAYBE(FromScreen)) {
- rtc::scoped_ptr<MouseCursorMonitor> capturer(
+ std::unique_ptr<MouseCursorMonitor> capturer(
MouseCursorMonitor::CreateForScreen(
DesktopCaptureOptions::CreateDefault(),
webrtc::kFullDesktopScreenId));
@@ -86,7 +87,7 @@ TEST_F(MouseCursorMonitorTest, MAYBE(FromWindow)) {
DesktopCaptureOptions options = DesktopCaptureOptions::CreateDefault();
// First get list of windows.
- rtc::scoped_ptr<WindowCapturer> window_capturer(
+ std::unique_ptr<WindowCapturer> window_capturer(
WindowCapturer::Create(options));
// If window capturing is not supported then skip this test.
@@ -101,7 +102,7 @@ TEST_F(MouseCursorMonitorTest, MAYBE(FromWindow)) {
cursor_image_.reset();
position_received_ = false;
- rtc::scoped_ptr<MouseCursorMonitor> capturer(
+ std::unique_ptr<MouseCursorMonitor> capturer(
MouseCursorMonitor::CreateForWindow(
DesktopCaptureOptions::CreateDefault(), windows[i].id));
assert(capturer.get());
@@ -116,7 +117,7 @@ TEST_F(MouseCursorMonitorTest, MAYBE(FromWindow)) {
// Make sure that OnMouseCursorPosition() is not called in the SHAPE_ONLY mode.
TEST_F(MouseCursorMonitorTest, MAYBE(ShapeOnly)) {
- rtc::scoped_ptr<MouseCursorMonitor> capturer(
+ std::unique_ptr<MouseCursorMonitor> capturer(
MouseCursorMonitor::CreateForScreen(
DesktopCaptureOptions::CreateDefault(),
webrtc::kFullDesktopScreenId));

Powered by Google App Engine
This is Rietveld 408576698