| Index: net/tools/quic/quic_client.cc
|
| diff --git a/net/tools/quic/quic_client.cc b/net/tools/quic/quic_client.cc
|
| index f8f75314a24a7acf74b5263821fecf433483f92f..dccec95aa663d4d6a31574f80075c4cf455dda97 100644
|
| --- a/net/tools/quic/quic_client.cc
|
| +++ b/net/tools/quic/quic_client.cc
|
| @@ -27,7 +27,6 @@
|
| #endif
|
|
|
| using std::string;
|
| -using std::vector;
|
|
|
| namespace net {
|
| namespace tools {
|
| @@ -253,19 +252,19 @@
|
| stream->set_visitor(this);
|
| }
|
|
|
| -void QuicClient::SendRequestAndWaitForResponse(
|
| - const BalsaHeaders& headers,
|
| - StringPiece body,
|
| - bool fin) {
|
| - SendRequest(headers, body, fin);
|
| - while (WaitForEvents()) {}
|
| +void QuicClient::SendRequestAndWaitForResponse(const BalsaHeaders& headers,
|
| + StringPiece body,
|
| + bool fin) {
|
| + SendRequest(headers, "", true);
|
| + while (WaitForEvents()) {
|
| + }
|
| }
|
|
|
| void QuicClient::SendRequestsAndWaitForResponse(
|
| - const vector<string>& url_list) {
|
| - for (size_t i = 0; i < url_list.size(); ++i) {
|
| + const base::CommandLine::StringVector& args) {
|
| + for (size_t i = 0; i < args.size(); ++i) {
|
| BalsaHeaders headers;
|
| - headers.SetRequestFirstlineFromStringPieces("GET", url_list[i], "HTTP/1.1");
|
| + headers.SetRequestFirstlineFromStringPieces("GET", args[i], "HTTP/1.1");
|
| SendRequest(headers, "", true);
|
| }
|
| while (WaitForEvents()) {}
|
| @@ -283,7 +282,7 @@
|
| DCHECK(connected());
|
|
|
| while (connected() && !session_->IsClosedStream(id)) {
|
| - WaitForEvents();
|
| + epoll_server_->WaitForEventsAndExecuteCallbacks();
|
| }
|
| }
|
|
|
| @@ -291,7 +290,7 @@
|
| DCHECK(connected());
|
|
|
| while (connected() && !session_->IsCryptoHandshakeConfirmed()) {
|
| - WaitForEvents();
|
| + epoll_server_->WaitForEventsAndExecuteCallbacks();
|
| }
|
| }
|
|
|
|
|