diff options
| author | mpearson@chromium.org <mpearson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 03:36:52 +0000 |
|---|---|---|
| committer | mpearson@chromium.org <mpearson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 03:36:52 +0000 |
| commit | 07d5b9217d2cdc2cd00978ce1ed638703f735a7b (patch) | |
| tree | 0a5fc1c5cccf0659d350ae3fe8cdbb1fc27a3620 /remoting/protocol | |
| parent | 947f36a7de0b78169ff8e1bb851f528068bb1ecd (diff) | |
| download | chromium_src-07d5b9217d2cdc2cd00978ce1ed638703f735a7b.zip chromium_src-07d5b9217d2cdc2cd00978ce1ed638703f735a7b.tar.gz chromium_src-07d5b9217d2cdc2cd00978ce1ed638703f735a7b.tar.bz2 | |
Revert 185114
DEPS change introduces new static initializers, which is forbidden.
It's causing failures in checks that look at how many static
initializers chrome has.
http://build.chromium.org/p/chromium/builders/Linux%20x64/builds/46069
> Roll libjingle r281:r286
>
> BUG=172316,177139
>
> Review URL: https://codereview.chromium.org/12382004
TBR=hclam@google.com
Review URL: https://codereview.chromium.org/12388009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185129 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
| -rw-r--r-- | remoting/protocol/libjingle_transport_factory.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc index e27b619..c16677b 100644 --- a/remoting/protocol/libjingle_transport_factory.cc +++ b/remoting/protocol/libjingle_transport_factory.cc @@ -140,7 +140,8 @@ void LibjingleStreamTransport::Connect( // TODO(sergeyu): Specify correct component ID for the channel. channel_.reset(new cricket::P2PTransportChannel( "", 0, NULL, port_allocator_)); - channel_->SetIceCredentials(ice_username_fragment_, ice_password_); + channel_->SetIceUfrag(ice_username_fragment_); + channel_->SetIcePwd(ice_password_); channel_->SignalRequestSignaling.connect( this, &LibjingleStreamTransport::OnRequestSignaling); channel_->SignalCandidateReady.connect( |