| Index: device/serial/serial_connection.cc
|
| diff --git a/device/serial/serial_connection.cc b/device/serial/serial_connection.cc
|
| index 0d3e4171c84b64a74c2f9807322448548ecff5bd..30e8fa65fbf3f1ebcfac56416c576865c58b3b53 100644
|
| --- a/device/serial/serial_connection.cc
|
| +++ b/device/serial/serial_connection.cc
|
| @@ -15,20 +15,18 @@ namespace device {
|
| SerialConnection::SerialConnection(
|
| scoped_refptr<SerialIoHandler> io_handler,
|
| mojo::InterfaceRequest<serial::DataSink> sink,
|
| - mojo::InterfaceRequest<serial::DataSource> source)
|
| + mojo::InterfaceRequest<serial::DataSource> source,
|
| + mojo::InterfacePtr<serial::DataSourceClient> source_client)
|
| : io_handler_(io_handler) {
|
| - receiver_ = mojo::WeakBindToRequest(
|
| - new DataSinkReceiver(base::Bind(&SerialConnection::OnSendPipeReady,
|
| - base::Unretained(this)),
|
| - base::Bind(&SerialConnection::OnSendCancelled,
|
| - base::Unretained(this)),
|
| - base::Bind(base::DoNothing)),
|
| - &sink);
|
| - sender_ = mojo::WeakBindToRequest(
|
| - new DataSourceSender(base::Bind(&SerialConnection::OnReceivePipeReady,
|
| - base::Unretained(this)),
|
| - base::Bind(base::DoNothing)),
|
| - &source);
|
| + receiver_ = new DataSinkReceiver(
|
| + sink.Pass(),
|
| + base::Bind(&SerialConnection::OnSendPipeReady, base::Unretained(this)),
|
| + base::Bind(&SerialConnection::OnSendCancelled, base::Unretained(this)),
|
| + base::Bind(base::DoNothing));
|
| + sender_ = new DataSourceSender(
|
| + source.Pass(), source_client.Pass(),
|
| + base::Bind(&SerialConnection::OnReceivePipeReady, base::Unretained(this)),
|
| + base::Bind(base::DoNothing));
|
| }
|
|
|
| SerialConnection::~SerialConnection() {
|
|
|