diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-03 13:42:47 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:27:51 +0000 |
| commit | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (patch) | |
| tree | d29d987c4d7b173cf853279b79a51598f104b403 /chromium/net/server/http_server_fuzzer.cc | |
| parent | 830c9e163d31a9180fadca926b3e1d7dfffb5021 (diff) | |
| download | qtwebengine-chromium-8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec.tar.gz | |
BASELINE: Update Chromium to 66.0.3359.156
Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/net/server/http_server_fuzzer.cc')
| -rw-r--r-- | chromium/net/server/http_server_fuzzer.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chromium/net/server/http_server_fuzzer.cc b/chromium/net/server/http_server_fuzzer.cc index f9af04fd439..c301a06d088 100644 --- a/chromium/net/server/http_server_fuzzer.cc +++ b/chromium/net/server/http_server_fuzzer.cc @@ -10,6 +10,7 @@ #include "net/log/test_net_log.h" #include "net/server/http_server.h" #include "net/socket/fuzzed_server_socket.h" +#include "net/traffic_annotation/network_traffic_annotation_test_helper.h" namespace { @@ -39,7 +40,7 @@ class WaitTillHttpCloseDelegate : public net::HttpServer::Delegate { if (action_flags_ & REPLY_TO_MESSAGE) { server_->Send200(connection_id, data_provider_->ConsumeRandomLengthString(64), - "text/html"); + "text/html", TRAFFIC_ANNOTATION_FOR_TESTS); } } @@ -51,7 +52,8 @@ class WaitTillHttpCloseDelegate : public net::HttpServer::Delegate { } if (action_flags_ & ACCEPT_WEBSOCKET) - server_->AcceptWebSocket(connection_id, info); + server_->AcceptWebSocket(connection_id, info, + TRAFFIC_ANNOTATION_FOR_TESTS); } void OnWebSocketMessage(int connection_id, const std::string& data) override { @@ -62,7 +64,8 @@ class WaitTillHttpCloseDelegate : public net::HttpServer::Delegate { if (action_flags_ & REPLY_TO_MESSAGE) { server_->SendOverWebSocket(connection_id, - data_provider_->ConsumeRandomLengthString(64)); + data_provider_->ConsumeRandomLengthString(64), + TRAFFIC_ANNOTATION_FOR_TESTS); } } |