diff options
| author | sergeyu <sergeyu@chromium.org> | 2015-04-23 10:44:11 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-23 17:44:28 +0000 |
| commit | da3ba0c9e7d2f0ae81f4d89097a6df56b3ec0df1 (patch) | |
| tree | 86d9897125f1ef05a9095b8ca49fe2997b59d8e2 /remoting/client/jni/chromoting_jni_instance.cc | |
| parent | 0df00e0661defe6707ad888dd9146aa25bfed63a (diff) | |
| download | chromium_src-da3ba0c9e7d2f0ae81f4d89097a6df56b3ec0df1.zip chromium_src-da3ba0c9e7d2f0ae81f4d89097a6df56b3ec0df1.tar.gz chromium_src-da3ba0c9e7d2f0ae81f4d89097a6df56b3ec0df1.tar.bz2 | |
Revert of Use standard ICE in Chromoting. (patchset #7 id:160001 of https://codereview.chromium.org/1085703003/)
Reason for revert:
This change did cause test failure: http://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20Mac%20%28valgrind%29%282%29/builds/34169/ (the link in the first revert was incorrect)
Original issue's description:
> Use standard ICE in Chromoting.
>
> Previously we were using legacy, non-standard version of ICE. This
> change adds ICE version negotiation and enabled standard ICE by default,
> when both peers support it.
>
> BUG=473758
>
> Committed: https://crrev.com/5a5854ee3e1c5760b422f26d31909bfb5dca631f
> Cr-Commit-Position: refs/heads/master@{#326560}
TBR=rmsousa@chromium.org,wez@chromium.org,dcaiafa@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=473758
Review URL: https://codereview.chromium.org/1089253005
Cr-Commit-Position: refs/heads/master@{#326570}
Diffstat (limited to 'remoting/client/jni/chromoting_jni_instance.cc')
| -rw-r--r-- | remoting/client/jni/chromoting_jni_instance.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/remoting/client/jni/chromoting_jni_instance.cc b/remoting/client/jni/chromoting_jni_instance.cc index fd19dea..33bd246 100644 --- a/remoting/client/jni/chromoting_jni_instance.cc +++ b/remoting/client/jni/chromoting_jni_instance.cc @@ -434,8 +434,7 @@ void ChromotingJniInstance::ConnectToHostOnNetworkThread() { scoped_ptr<protocol::TransportFactory> transport_factory( new protocol::LibjingleTransportFactory( - signaling_.get(), port_allocator.Pass(), network_settings, - protocol::TransportRole::CLIENT)); + signaling_.get(), port_allocator.Pass(), network_settings)); client_->Start(signaling_.get(), authenticator_.Pass(), transport_factory.Pass(), host_jid_, capabilities_); |