| Index: remoting/protocol/jingle_session.cc
|
| diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc
|
| index 72043a978153391b58e7a92d44031e88d99b3acb..14d3350d2559affad1ca7ce0a958c0da7cc683a2 100644
|
| --- a/remoting/protocol/jingle_session.cc
|
| +++ b/remoting/protocol/jingle_session.cc
|
| @@ -197,13 +197,13 @@ ErrorCode JingleSession::error() {
|
| }
|
|
|
| void JingleSession::StartConnection(
|
| - const std::string& peer_jid,
|
| + const SignalingAddress& peer_address,
|
| std::unique_ptr<Authenticator> authenticator) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| DCHECK(authenticator.get());
|
| DCHECK_EQ(authenticator->state(), Authenticator::MESSAGE_READY);
|
|
|
| - peer_address_ = SignalingAddress(peer_jid);
|
| + peer_address_ = peer_address;
|
| authenticator_ = std::move(authenticator);
|
|
|
| // Generate random session ID. There are usually not more than 1
|
| @@ -792,7 +792,8 @@ void JingleSession::SendSessionInitiateMessage() {
|
| }
|
| std::unique_ptr<JingleMessage> message(new JingleMessage(
|
| peer_address_, JingleMessage::SESSION_INITIATE, session_id_));
|
| - message->initiator = session_manager_->signal_strategy_->GetLocalJid();
|
| + message->initiator =
|
| + session_manager_->signal_strategy_->GetLocalAddress().jid();
|
| message->description.reset(new ContentDescription(
|
| session_manager_->protocol_config_->Clone(),
|
| authenticator_->GetNextMessage()));
|
|
|