commit bfefb03ec124105f49a19952fa73cf1861b0f262
author kwiberg <kwiberg@webrtc.org> Sun May 01 14:53:46 2016 -0700
committer Commit bot <commit-bot@chromium.org> Sun May 01 21:53:55 2016 +0000
tree 2142689beaf4b3f17c5561dae18d18c14db39080
parent e319059de29e142b92095f56a8149e3209de17d0

Replace scoped_ptr with unique_ptr everywhere

But keep #including scoped_ptr.h in .h files, so as not to break
WebRTC users who expect those .h files to give them rtc::scoped_ptr.

BUG=webrtc:5520

Review-Url: https://codereview.webrtc.org/1937693002
Cr-Commit-Position: refs/heads/master@{#12581}

webrtc/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm

diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm b/webrtc/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm
index 2c99cfe..3413dfc 100644
--- a/webrtc/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm
+++ b/webrtc/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm
@@ -10,6 +10,8 @@
 
 #import <Foundation/Foundation.h>
 
+#include <memory>
+
 #include "webrtc/base/gunit.h"
 
 #import "NSString+StdString.h"
@@ -29,7 +31,7 @@
   RTCMediaConstraints *constraints = [[RTCMediaConstraints alloc]
       initWithMandatoryConstraints:mandatory
                optionalConstraints:optional];
-  rtc::scoped_ptr<webrtc::MediaConstraints> nativeConstraints =
+  std::unique_ptr<webrtc::MediaConstraints> nativeConstraints =
       [constraints nativeConstraints];
 
   webrtc::MediaConstraintsInterface::Constraints nativeMandatory =