diff options
| author | hclam@google.com <hclam@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 04:17:40 +0000 |
|---|---|---|
| committer | hclam@google.com <hclam@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 04:17:40 +0000 |
| commit | 3d41c0f08b222ae29f0405f00f072fefcd4b9c92 (patch) | |
| tree | c38d5db85303551441f1b7e33152ce1dd485cc11 /remoting | |
| parent | 8e530cb2830ff6538ac6bab1d195035fefa3b236 (diff) | |
| download | chromium_src-3d41c0f08b222ae29f0405f00f072fefcd4b9c92.zip chromium_src-3d41c0f08b222ae29f0405f00f072fefcd4b9c92.tar.gz chromium_src-3d41c0f08b222ae29f0405f00f072fefcd4b9c92.tar.bz2 | |
Reland r185114 "Roll libjingle r281:r286"
BUG=172316,177139,178968
TBR=sergeyu,macpherson,cmp
Landing libjingle roll again after perf expectations has been updated.
Review URL: https://codereview.chromium.org/12387008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185153 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/protocol/libjingle_transport_factory.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc index c16677b..e27b619 100644 --- a/remoting/protocol/libjingle_transport_factory.cc +++ b/remoting/protocol/libjingle_transport_factory.cc @@ -140,8 +140,7 @@ void LibjingleStreamTransport::Connect( // TODO(sergeyu): Specify correct component ID for the channel. channel_.reset(new cricket::P2PTransportChannel( "", 0, NULL, port_allocator_)); - channel_->SetIceUfrag(ice_username_fragment_); - channel_->SetIcePwd(ice_password_); + channel_->SetIceCredentials(ice_username_fragment_, ice_password_); channel_->SignalRequestSignaling.connect( this, &LibjingleStreamTransport::OnRequestSignaling); channel_->SignalCandidateReady.connect( |