| Index: net/socket/socket_test_util.cc
|
| diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
|
| index 072cbe0890cc9547a092ce90299af9cad7be794b..46f337eb8f83ce95fa539ffb37e6ffc62f49b04f 100644
|
| --- a/net/socket/socket_test_util.cc
|
| +++ b/net/socket/socket_test_util.cc
|
| @@ -716,6 +716,7 @@ MockClientSocketFactory::CreateDatagramClientSocket(
|
|
|
| scoped_ptr<StreamSocket> MockClientSocketFactory::CreateTransportClientSocket(
|
| const AddressList& addresses,
|
| + SocketPerformanceWatcherFactory* socket_performance_watcher_factory,
|
| NetLog* net_log,
|
| const NetLog::Source& source) {
|
| SocketDataProvider* data_provider = mock_data_.GetNext();
|
| @@ -1601,12 +1602,12 @@ MockTransportClientSocketPool::MockTransportClientSocketPool(
|
| max_sockets_per_group,
|
| NULL,
|
| NULL,
|
| + NULL,
|
| NULL),
|
| client_socket_factory_(socket_factory),
|
| last_request_priority_(DEFAULT_PRIORITY),
|
| release_count_(0),
|
| - cancel_count_(0) {
|
| -}
|
| + cancel_count_(0) {}
|
|
|
| MockTransportClientSocketPool::~MockTransportClientSocketPool() {}
|
|
|
| @@ -1621,7 +1622,7 @@ int MockTransportClientSocketPool::RequestSocket(
|
| last_request_priority_ = priority;
|
| scoped_ptr<StreamSocket> socket =
|
| client_socket_factory_->CreateTransportClientSocket(
|
| - AddressList(), net_log.net_log(), NetLog::Source());
|
| + AddressList(), NULL, net_log.net_log(), NetLog::Source());
|
| MockConnectJob* job = new MockConnectJob(std::move(socket), handle, callback);
|
| job_list_.push_back(make_scoped_ptr(job));
|
| handle->set_pool_id(1);
|
| @@ -1654,9 +1655,9 @@ MockSOCKSClientSocketPool::MockSOCKSClientSocketPool(
|
| max_sockets_per_group,
|
| NULL,
|
| transport_pool,
|
| + NULL,
|
| NULL),
|
| - transport_pool_(transport_pool) {
|
| -}
|
| + transport_pool_(transport_pool) {}
|
|
|
| MockSOCKSClientSocketPool::~MockSOCKSClientSocketPool() {}
|
|
|
|
|