Index: media/cast/net/udp_transport.cc |
diff --git a/media/cast/net/udp_transport.cc b/media/cast/net/udp_transport.cc |
index 0d77a69888148e009a4240e888386399c95e487d..c15e97951138fdab5b6028983d84f7aea164e463 100644 |
--- a/media/cast/net/udp_transport.cc |
+++ b/media/cast/net/udp_transport.cc |
@@ -35,29 +35,24 @@ bool IsEqual(const net::IPEndPoint& addr1, const net::IPEndPoint& addr2) { |
} |
} // namespace |
-UdpTransport::UdpTransport( |
- net::NetLog* net_log, |
- const scoped_refptr<base::SingleThreadTaskRunner>& io_thread_proxy, |
- const net::IPEndPoint& local_end_point, |
- const net::IPEndPoint& remote_end_point, |
- int32 send_buffer_size, |
- const CastTransportStatusCallback& status_callback) |
- : io_thread_proxy_(io_thread_proxy), |
- local_addr_(local_end_point), |
- remote_addr_(remote_end_point), |
+UdpTransport::UdpTransport(const CastTransportSender::CreateParams& params, |
Irfan
2015/12/15 22:23:13
Do not think CastTransportSender::CreateParams sho
xjz
2015/12/16 18:11:34
Done. Left |UdpTransport| as is.
|
+ int32 send_buffer_size) |
+ : transport_client_(params.client), |
+ io_thread_proxy_(params.transport_task_runner), |
+ local_addr_(params.local_end_point), |
+ remote_addr_(params.remote_end_point), |
udp_socket_(new net::UDPSocket(net::DatagramSocket::DEFAULT_BIND, |
net::RandIntCallback(), |
- net_log, |
+ params.net_log, |
net::NetLog::Source())), |
send_pending_(false), |
receive_pending_(false), |
client_connected_(false), |
next_dscp_value_(net::DSCP_NO_CHANGE), |
send_buffer_size_(send_buffer_size), |
- status_callback_(status_callback), |
bytes_sent_(0), |
weak_factory_(this) { |
- DCHECK(!IsEmpty(local_end_point) || !IsEmpty(remote_end_point)); |
+ DCHECK(!IsEmpty(local_addr_) || !IsEmpty(remote_addr_)); |
} |
UdpTransport::~UdpTransport() {} |
@@ -67,7 +62,7 @@ void UdpTransport::StartReceiving( |
DCHECK(io_thread_proxy_->RunsTasksOnCurrentThread()); |
if (!udp_socket_) { |
- status_callback_.Run(TRANSPORT_SOCKET_ERROR); |
+ transport_client_->OnStatusChange(TRANSPORT_SOCKET_ERROR); |
return; |
} |
@@ -79,7 +74,7 @@ void UdpTransport::StartReceiving( |
udp_socket_->Bind(local_addr_) < 0) { |
udp_socket_->Close(); |
udp_socket_.reset(); |
- status_callback_.Run(TRANSPORT_SOCKET_ERROR); |
+ transport_client_->OnStatusChange(TRANSPORT_SOCKET_ERROR); |
LOG(ERROR) << "Failed to bind local address."; |
return; |
} |
@@ -89,7 +84,7 @@ void UdpTransport::StartReceiving( |
udp_socket_->Connect(remote_addr_) < 0) { |
udp_socket_->Close(); |
udp_socket_.reset(); |
- status_callback_.Run(TRANSPORT_SOCKET_ERROR); |
+ transport_client_->OnStatusChange(TRANSPORT_SOCKET_ERROR); |
LOG(ERROR) << "Failed to connect to remote address."; |
return; |
} |