summaryrefslogtreecommitdiffstats
path: root/remoting/protocol
diff options
context:
space:
mode:
authormikescarlett <mikescarlett@webrtc.org>2016-03-01 10:47:42 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-01 18:48:34 +0000
commita853c29e66ef5f85ee51dadfae9b224228b8c5f5 (patch)
tree25fcbbd31687af70e5c0185993f680436d2f8808 /remoting/protocol
parent6f0b265ae2d4b84b1b93ea5b96ad2d6c14529bb3 (diff)
downloadchromium_src-a853c29e66ef5f85ee51dadfae9b224228b8c5f5.zip
chromium_src-a853c29e66ef5f85ee51dadfae9b224228b8c5f5.tar.gz
chromium_src-a853c29e66ef5f85ee51dadfae9b224228b8c5f5.tar.bz2
Refactor IceTransportChannel to use non-deprecated P2PTransportChannel constructor
P2PTransportChannel no longer requires a P2PTransport* parameter due to: https://codereview.chromium.org/1691673002/. so IceTransportChannel should use the new constructor now. NOPRESUBMIT=true Review URL: https://codereview.chromium.org/1735523007 Cr-Commit-Position: refs/heads/master@{#378492}
Diffstat (limited to 'remoting/protocol')
-rw-r--r--remoting/protocol/ice_transport_channel.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/protocol/ice_transport_channel.cc b/remoting/protocol/ice_transport_channel.cc
index 78e5c83..bc07953 100644
--- a/remoting/protocol/ice_transport_channel.cc
+++ b/remoting/protocol/ice_transport_channel.cc
@@ -88,7 +88,7 @@ void IceTransportChannel::Connect(const std::string& name,
// Create P2PTransportChannel, attach signal handlers and connect it.
// TODO(sergeyu): Specify correct component ID for the channel.
channel_.reset(new cricket::P2PTransportChannel(
- std::string(), 0, nullptr, port_allocator_.get()));
+ std::string(), 0, port_allocator_.get()));
std::string ice_password = rtc::CreateRandomString(cricket::ICE_PWD_LENGTH);
channel_->SetIceProtocolType(cricket::ICEPROTO_RFC5245);
channel_->SetIceRole((transport_context_->role() == TransportRole::CLIENT)