| Index: net/socket/socket_test_util.cc
|
| diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
|
| index ff8bc505f5e73fb2cef5e95e10def7614c967739..d928e6a509cfc4f62b3ffa9bdb4c21982ae01698 100644
|
| --- a/net/socket/socket_test_util.cc
|
| +++ b/net/socket/socket_test_util.cc
|
| @@ -1344,10 +1344,11 @@ void MockUDPClientSocket::RunCallback(const CompletionCallback& callback,
|
| }
|
|
|
| TestSocketRequest::TestSocketRequest(
|
| - std::vector<TestSocketRequest*>* request_order,
|
| - size_t* completion_count)
|
| + std::vector<TestSocketRequest*>* request_order, size_t* completion_count)
|
| : request_order_(request_order),
|
| - completion_count_(completion_count) {
|
| + completion_count_(completion_count),
|
| + ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
|
| + base::Bind(&TestSocketRequest::OnComplete, base::Unretained(this)))) {
|
| DCHECK(request_order);
|
| DCHECK(completion_count);
|
| }
|
| @@ -1355,12 +1356,7 @@ TestSocketRequest::TestSocketRequest(
|
| TestSocketRequest::~TestSocketRequest() {
|
| }
|
|
|
| -int TestSocketRequest::WaitForResult() {
|
| - return callback_.WaitForResult();
|
| -}
|
| -
|
| -void TestSocketRequest::RunWithParams(const Tuple1<int>& params) {
|
| - callback_.RunWithParams(params);
|
| +void TestSocketRequest::OnComplete(int result) {
|
| (*completion_count_)++;
|
| request_order_->push_back(this);
|
| }
|
|
|