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/datachannel.cc

diff --git a/webrtc/api/datachannel.cc b/webrtc/api/datachannel.cc
index 612d7e0..452e4b3 100644
--- a/webrtc/api/datachannel.cc
+++ b/webrtc/api/datachannel.cc
@@ -10,6 +10,7 @@
 
 #include "webrtc/api/datachannel.h"
 
+#include <memory>
 #include <string>
 
 #include "webrtc/api/mediastreamprovider.h"
@@ -363,7 +364,7 @@
   }
 
   bool binary = (params.type == cricket::DMT_BINARY);
-  rtc::scoped_ptr<DataBuffer> buffer(new DataBuffer(payload, binary));
+  std::unique_ptr<DataBuffer> buffer(new DataBuffer(payload, binary));
   if (state_ == kOpen && observer_) {
     observer_->OnMessage(*buffer.get());
   } else {
@@ -494,7 +495,7 @@
   }
 
   while (!queued_received_data_.Empty()) {
-    rtc::scoped_ptr<DataBuffer> buffer(queued_received_data_.Front());
+    std::unique_ptr<DataBuffer> buffer(queued_received_data_.Front());
     observer_->OnMessage(*buffer);
     queued_received_data_.Pop();
   }
@@ -589,7 +590,7 @@
   control_packets.Swap(&queued_control_data_);
 
   while (!control_packets.Empty()) {
-    rtc::scoped_ptr<DataBuffer> buf(control_packets.Front());
+    std::unique_ptr<DataBuffer> buf(control_packets.Front());
     SendControlMessage(buf->data);
     control_packets.Pop();
   }