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

Unified Diff: webrtc/modules/desktop_capture/screen_capturer_mac_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/screen_capturer_mac_unittest.cc
diff --git a/webrtc/modules/desktop_capture/screen_capturer_mac_unittest.cc b/webrtc/modules/desktop_capture/screen_capturer_mac_unittest.cc
index 737d5391b2c88fb0612fe26df815d5a7ea20d113..64d649cd9d1a8474088aaaff1adc99c1c7bfb0e9 100644
--- a/webrtc/modules/desktop_capture/screen_capturer_mac_unittest.cc
+++ b/webrtc/modules/desktop_capture/screen_capturer_mac_unittest.cc
@@ -12,10 +12,10 @@
#include <ApplicationServices/ApplicationServices.h>
+#include <memory>
#include <ostream>
#include "testing/gtest/include/gtest/gtest.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/desktop_region.h"
@@ -40,13 +40,13 @@ class ScreenCapturerMacTest : public testing::Test {
protected:
void SetUp() override { capturer_.reset(ScreenCapturer::Create()); }
- rtc::scoped_ptr<ScreenCapturer> capturer_;
+ std::unique_ptr<ScreenCapturer> capturer_;
MockScreenCapturerCallback callback_;
};
void ScreenCapturerMacTest::CaptureDoneCallback1(
DesktopFrame* frame) {
- rtc::scoped_ptr<DesktopFrame> owned_frame(frame);
+ std::unique_ptr<DesktopFrame> owned_frame(frame);
MacDesktopConfiguration config = MacDesktopConfiguration::GetCurrent(
MacDesktopConfiguration::BottomLeftOrigin);
@@ -58,7 +58,7 @@ void ScreenCapturerMacTest::CaptureDoneCallback1(
void ScreenCapturerMacTest::CaptureDoneCallback2(
DesktopFrame* frame) {
- rtc::scoped_ptr<DesktopFrame> owned_frame(frame);
+ std::unique_ptr<DesktopFrame> owned_frame(frame);
MacDesktopConfiguration config = MacDesktopConfiguration::GetCurrent(
MacDesktopConfiguration::BottomLeftOrigin);

Powered by Google App Engine
This is Rietveld 408576698