| Index: net/tools/quic/test_tools/mock_epoll_server.cc
|
| diff --git a/net/tools/quic/test_tools/mock_epoll_server.cc b/net/tools/quic/test_tools/mock_epoll_server.cc
|
| index 4101c5e9ab023a0f5624e989065ca993be3b3eff..5a08c5027912b09ced0346bd8109a107074e8d1e 100644
|
| --- a/net/tools/quic/test_tools/mock_epoll_server.cc
|
| +++ b/net/tools/quic/test_tools/mock_epoll_server.cc
|
| @@ -8,7 +8,7 @@ namespace net {
|
| namespace tools {
|
| namespace test {
|
|
|
| -FakeTimeEpollServer::FakeTimeEpollServer(): now_in_usec_(0) {
|
| +FakeTimeEpollServer::FakeTimeEpollServer() : now_in_usec_(0) {
|
| }
|
|
|
| FakeTimeEpollServer::~FakeTimeEpollServer() {
|
| @@ -29,12 +29,10 @@ int MockEpollServer::epoll_wait_impl(int epfd,
|
| int max_events,
|
| int timeout_in_ms) {
|
| int num_events = 0;
|
| - while (!event_queue_.empty() &&
|
| - num_events < max_events &&
|
| + while (!event_queue_.empty() && num_events < max_events &&
|
| event_queue_.begin()->first <= NowInUsec() &&
|
| ((until_in_usec_ == -1) ||
|
| - (event_queue_.begin()->first < until_in_usec_))
|
| - ) {
|
| + (event_queue_.begin()->first < until_in_usec_))) {
|
| int64 event_time_in_usec = event_queue_.begin()->first;
|
| events[num_events] = event_queue_.begin()->second;
|
| if (event_time_in_usec > NowInUsec()) {
|
| @@ -43,7 +41,7 @@ int MockEpollServer::epoll_wait_impl(int epfd,
|
| event_queue_.erase(event_queue_.begin());
|
| ++num_events;
|
| }
|
| - if (num_events == 0) { // then we'd have waited 'till the timeout.
|
| + if (num_events == 0) { // then we'd have waited 'till the timeout.
|
| if (until_in_usec_ < 0) { // then we don't care what the final time is.
|
| if (timeout_in_ms > 0) {
|
| AdvanceBy(timeout_in_ms * 1000);
|
|
|