commit d1fe281e12efd938683eae470bf01ce0d5ed3f9d
author kwiberg <kwiberg@webrtc.org> Wed Apr 27 06:47:29 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed Apr 27 13:47:40 2016 +0000
tree 91e3c58ee2cf4a0e2814bc15a199064b0de7e9b8
parent 034154b46a716387298a19f07a2e40983d84d78d

Replace scoped_ptr with unique_ptr in webrtc/api/

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/1930463002

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

webrtc/api/peerconnectionfactoryproxy.h

diff --git a/webrtc/api/peerconnectionfactoryproxy.h b/webrtc/api/peerconnectionfactoryproxy.h
index ef47cdb..f60f9e9 100644
--- a/webrtc/api/peerconnectionfactoryproxy.h
+++ b/webrtc/api/peerconnectionfactoryproxy.h
@@ -11,6 +11,7 @@
 #ifndef WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_
 #define WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_
 
+#include <memory>
 #include <string>
 #include <utility>
 
@@ -22,13 +23,13 @@
 
 BEGIN_SIGNALING_PROXY_MAP(PeerConnectionFactory)
   PROXY_METHOD1(void, SetOptions, const Options&)
-  // Can't use PROXY_METHOD5 because scoped_ptr must be moved.
-  // TODO(tommi,hbos): Use of templates to support scoped_ptr?
+  // Can't use PROXY_METHOD5 because unique_ptr must be moved.
+  // TODO(tommi,hbos): Use of templates to support unique_ptr?
   rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
       const PeerConnectionInterface::RTCConfiguration& a1,
       const MediaConstraintsInterface* a2,
-      rtc::scoped_ptr<cricket::PortAllocator> a3,
-      rtc::scoped_ptr<DtlsIdentityStoreInterface> a4,
+      std::unique_ptr<cricket::PortAllocator> a3,
+      std::unique_ptr<DtlsIdentityStoreInterface> a4,
       PeerConnectionObserver* a5) override {
     return signaling_thread_
         ->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(
@@ -37,8 +38,8 @@
   }
   rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
       const PeerConnectionInterface::RTCConfiguration& a1,
-      rtc::scoped_ptr<cricket::PortAllocator> a3,
-      rtc::scoped_ptr<DtlsIdentityStoreInterface> a4,
+      std::unique_ptr<cricket::PortAllocator> a3,
+      std::unique_ptr<DtlsIdentityStoreInterface> a4,
       PeerConnectionObserver* a5) override {
     return signaling_thread_
         ->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(
@@ -77,8 +78,8 @@
       cricket::PortAllocator* a3,
       DtlsIdentityStoreInterface* a4,
       PeerConnectionObserver* a5) {
-    rtc::scoped_ptr<cricket::PortAllocator> ptr_a3(a3);
-    rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4);
+    std::unique_ptr<cricket::PortAllocator> ptr_a3(a3);
+    std::unique_ptr<DtlsIdentityStoreInterface> ptr_a4(a4);
     return c_->CreatePeerConnection(a1, a2, std::move(ptr_a3),
                                     std::move(ptr_a4), a5);
   }
@@ -88,8 +89,8 @@
       cricket::PortAllocator* a3,
       DtlsIdentityStoreInterface* a4,
       PeerConnectionObserver* a5) {
-    rtc::scoped_ptr<cricket::PortAllocator> ptr_a3(a3);
-    rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4);
+    std::unique_ptr<cricket::PortAllocator> ptr_a3(a3);
+    std::unique_ptr<DtlsIdentityStoreInterface> ptr_a4(a4);
     return c_->CreatePeerConnection(a1, std::move(ptr_a3), std::move(ptr_a4),
                                     a5);
   }