summaryrefslogtreecommitdiff
path: root/chromium/net/test/embedded_test_server/embedded_test_server.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-05 14:08:31 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-11 07:46:53 +0000
commit6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (patch)
treeab00f70a5e89278d6a0d16ff0c42578dc4d84a2d /chromium/net/test/embedded_test_server/embedded_test_server.h
parente733310db58160074f574c429d48f8308c0afe17 (diff)
downloadqtwebengine-chromium-6a4cabb866f66d4128a97cdc6d9d08ce074f1247.tar.gz
BASELINE: Update Chromium to 57.0.2987.144
Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/net/test/embedded_test_server/embedded_test_server.h')
-rw-r--r--chromium/net/test/embedded_test_server/embedded_test_server.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/chromium/net/test/embedded_test_server/embedded_test_server.h b/chromium/net/test/embedded_test_server/embedded_test_server.h
index bc34d0a3f01..f2a93072720 100644
--- a/chromium/net/test/embedded_test_server/embedded_test_server.h
+++ b/chromium/net/test/embedded_test_server/embedded_test_server.h
@@ -205,16 +205,21 @@ class EmbeddedTestServer {
// The most general purpose method. Any request processing can be added using
// this method. Takes ownership of the object. The |callback| is called
- // on the server's IO thread.
+ // on the server's IO thread so all handlers must be registered before the
+ // server is started.
void RegisterRequestHandler(const HandleRequestCallback& callback);
// Adds request monitors. The |callback| is called before any handlers are
// called, but can not respond it. This is useful to monitor requests that
- // will be handled by other request handlers.
+ // will be handled by other request handlers. The |callback| is called
+ // on the server's IO thread so all monitors must be registered before the
+ // server is started.
void RegisterRequestMonitor(const MonitorRequestCallback& callback);
// Adds default handlers, including those added by AddDefaultHandlers, to be
- // tried after all other user-specified handlers have been tried.
+ // tried after all other user-specified handlers have been tried. The
+ // |callback| is called on the server's IO thread so all handlers must be
+ // registered before the server is started.
void RegisterDefaultHandler(const HandleRequestCallback& callback);
bool FlushAllSocketsAndConnectionsOnUIThread();