| Index: remoting/protocol/pseudotcp_channel_factory.cc
|
| diff --git a/remoting/protocol/pseudotcp_channel_factory.cc b/remoting/protocol/pseudotcp_channel_factory.cc
|
| index 1fc9ca831c149b1aee617236e0eae76fe5d42fdf..432a2a92967261882dd66c7f48b2b275edc4f07c 100644
|
| --- a/remoting/protocol/pseudotcp_channel_factory.cc
|
| +++ b/remoting/protocol/pseudotcp_channel_factory.cc
|
| @@ -6,9 +6,9 @@
|
|
|
| #include "base/bind.h"
|
| #include "net/base/net_errors.h"
|
| -#include "net/socket/stream_socket.h"
|
| #include "remoting/base/constants.h"
|
| #include "remoting/protocol/datagram_channel_factory.h"
|
| +#include "remoting/protocol/p2p_datagram_socket.h"
|
| #include "remoting/protocol/pseudotcp_adapter.h"
|
|
|
| namespace remoting {
|
| @@ -59,7 +59,7 @@ void PseudoTcpChannelFactory::CancelChannelCreation(const std::string& name) {
|
| void PseudoTcpChannelFactory::OnDatagramChannelCreated(
|
| const std::string& name,
|
| const ChannelCreatedCallback& callback,
|
| - scoped_ptr<net::Socket> datagram_socket) {
|
| + scoped_ptr<P2PDatagramSocket> datagram_socket) {
|
| PseudoTcpAdapter* adapter = new PseudoTcpAdapter(datagram_socket.Pass());
|
| pending_sockets_[name] = adapter;
|
|
|
| @@ -86,7 +86,7 @@ void PseudoTcpChannelFactory::OnPseudoTcpConnected(
|
| int result) {
|
| PendingSocketsMap::iterator it = pending_sockets_.find(name);
|
| DCHECK(it != pending_sockets_.end());
|
| - scoped_ptr<net::StreamSocket> socket(it->second);
|
| + scoped_ptr<P2PStreamSocket> socket(it->second);
|
| pending_sockets_.erase(it);
|
|
|
| if (result != net::OK)
|
|
|