diff options
| author | kelvinp@chromium.org <kelvinp@chromium.org> | 2016-01-26 09:36:53 -0800 |
|---|---|---|
| committer | kelvinp@chromium.org <kelvinp@chromium.org> | 2016-01-26 17:39:06 +0000 |
| commit | 24077152a678647e2db25d814a74ddc3cc2d368b (patch) | |
| tree | cc892551770c6e88057f1d75ebade977ea2152f2 /remoting | |
| parent | 57ba5fc250ca9f056d4ac46ffe7bbe9df3b92c8c (diff) | |
| download | chromium_src-24077152a678647e2db25d814a74ddc3cc2d368b.zip chromium_src-24077152a678647e2db25d814a74ddc3cc2d368b.tar.gz chromium_src-24077152a678647e2db25d814a74ddc3cc2d368b.tar.bz2 | |
Fix crash on It2Me host.
This is a regression from https://codereview.chromium.org/1530523002.
We should be passing signal_strategy_.get() instead of signal_strategy.get()
to the underlying JingleSessionManager in
it2me_host.cc
BUG=579758
Review URL: https://codereview.chromium.org/1638733002
Cr-Commit-Position: refs/heads/master@{#371452}
(cherry picked from commit 12faacc97b94a1d8ead4e290dfdc9b22b122bbe7)
Review URL: https://codereview.chromium.org/1631153003 .
Cr-Commit-Position: refs/branch-heads/2623@{#141}
Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/it2me/it2me_host.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/host/it2me/it2me_host.cc b/remoting/host/it2me/it2me_host.cc index c7733fe..99f3177 100644 --- a/remoting/host/it2me/it2me_host.cc +++ b/remoting/host/it2me/it2me_host.cc @@ -243,7 +243,7 @@ void It2MeHost::FinishConnect() { network_settings, protocol::TransportRole::SERVER); scoped_ptr<protocol::SessionManager> session_manager( - new protocol::JingleSessionManager(signal_strategy.get())); + new protocol::JingleSessionManager(signal_strategy_.get())); scoped_ptr<protocol::CandidateSessionConfig> protocol_config = protocol::CandidateSessionConfig::CreateDefault(); |