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

Unified Diff: webrtc/modules/desktop_capture/win/cursor_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/win/cursor_unittest.cc
diff --git a/webrtc/modules/desktop_capture/win/cursor_unittest.cc b/webrtc/modules/desktop_capture/win/cursor_unittest.cc
index 32bab13e00b92b83fb364edeccfc6a86501918f7..4d52f70812c4d701e18f05645dc1ca90ba48dd49 100644
--- a/webrtc/modules/desktop_capture/win/cursor_unittest.cc
+++ b/webrtc/modules/desktop_capture/win/cursor_unittest.cc
@@ -8,8 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <memory>
+
#include "testing/gmock/include/gmock/gmock.h"
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/desktop_capture/desktop_frame.h"
#include "webrtc/modules/desktop_capture/desktop_geometry.h"
#include "webrtc/modules/desktop_capture/mouse_cursor.h"
@@ -34,7 +35,7 @@ bool ConvertToMouseShapeAndCompare(unsigned left, unsigned right) {
// Convert |cursor| to |mouse_shape|.
HDC dc = GetDC(NULL);
- rtc::scoped_ptr<MouseCursor> mouse_shape(
+ std::unique_ptr<MouseCursor> mouse_shape(
CreateMouseCursorFromHCursor(dc, cursor));
ReleaseDC(NULL, dc);
@@ -62,7 +63,7 @@ bool ConvertToMouseShapeAndCompare(unsigned left, unsigned right) {
// Get the pixels from |scoped_color|.
int size = width * height;
- rtc::scoped_ptr<uint32_t[]> data(new uint32_t[size]);
+ std::unique_ptr<uint32_t[]> data(new uint32_t[size]);
EXPECT_TRUE(GetBitmapBits(scoped_color, size * sizeof(uint32_t), data.get()));
// Compare the 32bpp image in |mouse_shape| with the one loaded from |right|.

Powered by Google App Engine
This is Rietveld 408576698