| Index: webrtc/api/peerconnectionendtoend_unittest.cc
|
| diff --git a/webrtc/api/peerconnectionendtoend_unittest.cc b/webrtc/api/peerconnectionendtoend_unittest.cc
|
| index 20df17bc63e439924002ab9f0dbb912256c3b77a..95369b15c0823a0bbb81f6e517780711f94d2c1d 100644
|
| --- a/webrtc/api/peerconnectionendtoend_unittest.cc
|
| +++ b/webrtc/api/peerconnectionendtoend_unittest.cc
|
| @@ -8,6 +8,8 @@
|
| * be found in the AUTHORS file in the root of the source tree.
|
| */
|
|
|
| +#include <memory>
|
| +
|
| #include "webrtc/api/test/peerconnectiontestwrapper.h"
|
| // Notice that mockpeerconnectionobservers.h must be included after the above!
|
| #include "webrtc/api/test/mockpeerconnectionobservers.h"
|
| @@ -112,10 +114,10 @@ class PeerConnectionEndToEndTest
|
| // Tests that |dc1| and |dc2| can send to and receive from each other.
|
| void TestDataChannelSendAndReceive(
|
| DataChannelInterface* dc1, DataChannelInterface* dc2) {
|
| - rtc::scoped_ptr<webrtc::MockDataChannelObserver> dc1_observer(
|
| + std::unique_ptr<webrtc::MockDataChannelObserver> dc1_observer(
|
| new webrtc::MockDataChannelObserver(dc1));
|
|
|
| - rtc::scoped_ptr<webrtc::MockDataChannelObserver> dc2_observer(
|
| + std::unique_ptr<webrtc::MockDataChannelObserver> dc2_observer(
|
| new webrtc::MockDataChannelObserver(dc2));
|
|
|
| static const std::string kDummyData = "abcdefg";
|
| @@ -294,10 +296,10 @@ TEST_F(PeerConnectionEndToEndTest,
|
| WaitForDataChannelsToOpen(caller_dc_1, callee_signaled_data_channels_, 0);
|
| WaitForDataChannelsToOpen(caller_dc_2, callee_signaled_data_channels_, 1);
|
|
|
| - rtc::scoped_ptr<webrtc::MockDataChannelObserver> dc_1_observer(
|
| + std::unique_ptr<webrtc::MockDataChannelObserver> dc_1_observer(
|
| new webrtc::MockDataChannelObserver(callee_signaled_data_channels_[0]));
|
|
|
| - rtc::scoped_ptr<webrtc::MockDataChannelObserver> dc_2_observer(
|
| + std::unique_ptr<webrtc::MockDataChannelObserver> dc_2_observer(
|
| new webrtc::MockDataChannelObserver(callee_signaled_data_channels_[1]));
|
|
|
| const std::string message_1 = "hello 1";
|
|
|