| Index: remoting/protocol/jingle_session.cc
|
| diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc
|
| index 501e6afab304cba96ed2cbc529905d385bce22f1..3638e893746c280b8c1f1a8cbf1125d15309fd1d 100644
|
| --- a/remoting/protocol/jingle_session.cc
|
| +++ b/remoting/protocol/jingle_session.cc
|
| @@ -250,9 +250,8 @@ void JingleSession::AddPendingRemoteCandidates(Transport* channel,
|
| }
|
| }
|
|
|
| -void JingleSession::CreateStreamChannel(
|
| - const std::string& name,
|
| - const StreamChannelCallback& callback) {
|
| +void JingleSession::CreateChannel(const std::string& name,
|
| + const ChannelCreatedCallback& callback) {
|
| DCHECK(!channels_[name]);
|
|
|
| scoped_ptr<ChannelAuthenticator> channel_authenticator =
|
| @@ -265,21 +264,6 @@ void JingleSession::CreateStreamChannel(
|
| channels_[name] = channel.release();
|
| }
|
|
|
| -void JingleSession::CreateDatagramChannel(
|
| - const std::string& name,
|
| - const DatagramChannelCallback& callback) {
|
| - DCHECK(!channels_[name]);
|
| -
|
| - scoped_ptr<ChannelAuthenticator> channel_authenticator =
|
| - authenticator_->CreateChannelAuthenticator();
|
| - scoped_ptr<DatagramTransport> channel =
|
| - session_manager_->transport_factory_->CreateDatagramTransport();
|
| - channel->Initialize(name, this, channel_authenticator.Pass());
|
| - channel->Connect(callback);
|
| - AddPendingRemoteCandidates(channel.get(), name);
|
| - channels_[name] = channel.release();
|
| -}
|
| -
|
| void JingleSession::CancelChannelCreation(const std::string& name) {
|
| ChannelsMap::iterator it = channels_.find(name);
|
| if (it != channels_.end() && !it->second->is_connected()) {
|
|
|