Chromium Code Reviews| Index: net/test/embedded_test_server/embedded_test_server.cc |
| diff --git a/net/test/embedded_test_server/embedded_test_server.cc b/net/test/embedded_test_server/embedded_test_server.cc |
| index 152d46020691d3398d569b1ae219657ca883e145..3b6dc531f6c60270116c4b91d01e76ca0f3fa2ec 100644 |
| --- a/net/test/embedded_test_server/embedded_test_server.cc |
| +++ b/net/test/embedded_test_server/embedded_test_server.cc |
| @@ -170,6 +170,9 @@ void EmbeddedTestServer::HandleRequest(HttpConnection* connection, |
| std::unique_ptr<HttpRequest> request) { |
| DCHECK(io_thread_->task_runner()->BelongsToCurrentThread()); |
| + for (const auto& handler : request_monitors_) |
|
Paweł Hajdan Jr.
2016/05/13 10:37:08
nit: Since we differentiate between handlers and m
Takashi Toyoshima
2016/05/18 03:56:37
Done.
|
| + handler.Run(*request); |
| + |
| std::unique_ptr<HttpResponse> response; |
| for (const auto& handler : request_handlers_) { |
| @@ -284,15 +287,22 @@ void EmbeddedTestServer::AddDefaultHandlers(const base::FilePath& directory) { |
| void EmbeddedTestServer::RegisterRequestHandler( |
| const HandleRequestCallback& callback) { |
| - // TODO(svaldez): Add check to prevent RegisterHandler from being called |
| - // after the server has started. https://crbug.com/546060 |
| + // TODO(svaldez): Add check to prevent RegisterRequestHandler from being |
| + // called after the server has started. https://crbug.com/546060 |
| request_handlers_.push_back(callback); |
| } |
| +void EmbeddedTestServer::RegisterRequestMonitor( |
| + const MonitorRequestCallback& callback) { |
| + // TODO(svaldez): Add check to prevent RegisterRequestMonitor from being |
| + // called after the server has started. https://crbug.com/546060 |
| + request_monitors_.push_back(callback); |
| +} |
| + |
| void EmbeddedTestServer::RegisterDefaultHandler( |
| const HandleRequestCallback& callback) { |
| - // TODO(svaldez): Add check to prevent RegisterHandler from being called |
| - // after the server has started. https://crbug.com/546060 |
| + // TODO(svaldez): Add check to prevent RegisterDefaultHandler from being |
| + // called after the server has started. https://crbug.com/546060 |
| default_request_handlers_.push_back(callback); |
| } |