diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-06 12:48:11 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:33:43 +0000 |
| commit | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (patch) | |
| tree | fa14ba0ca8d2683ba2efdabd246dc9b18a1229c6 /chromium/net/server | |
| parent | 79b4f909db1049fca459c07cca55af56a9b54fe3 (diff) | |
| download | qtwebengine-chromium-7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3.tar.gz | |
BASELINE: Update Chromium to 84.0.4147.141
Change-Id: Ib85eb4cfa1cbe2b2b81e5022c8cad5c493969535
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/net/server')
| -rw-r--r-- | chromium/net/server/http_server_fuzzer.cc | 2 | ||||
| -rw-r--r-- | chromium/net/server/http_server_unittest.cc | 3 | ||||
| -rw-r--r-- | chromium/net/server/web_socket.cc | 2 | ||||
| -rw-r--r-- | chromium/net/server/web_socket_encoder.cc | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/chromium/net/server/http_server_fuzzer.cc b/chromium/net/server/http_server_fuzzer.cc index 0509bde4ca7..3bee3faf090 100644 --- a/chromium/net/server/http_server_fuzzer.cc +++ b/chromium/net/server/http_server_fuzzer.cc @@ -4,7 +4,7 @@ #include <fuzzer/FuzzedDataProvider.h> -#include "base/logging.h" +#include "base/check_op.h" #include "base/macros.h" #include "base/run_loop.h" #include "net/base/net_errors.h" diff --git a/chromium/net/server/http_server_unittest.cc b/chromium/net/server/http_server_unittest.cc index 509ece87cc8..824dbe484eb 100644 --- a/chromium/net/server/http_server_unittest.cc +++ b/chromium/net/server/http_server_unittest.cc @@ -15,13 +15,14 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback_helpers.h" +#include "base/check_op.h" #include "base/compiler_specific.h" #include "base/format_macros.h" #include "base/location.h" -#include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" +#include "base/notreached.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h" diff --git a/chromium/net/server/web_socket.cc b/chromium/net/server/web_socket.cc index 60d90741667..89f4be2d1d2 100644 --- a/chromium/net/server/web_socket.cc +++ b/chromium/net/server/web_socket.cc @@ -7,8 +7,8 @@ #include <vector> #include "base/base64.h" +#include "base/check.h" #include "base/hash/sha1.h" -#include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/sys_byteorder.h" diff --git a/chromium/net/server/web_socket_encoder.cc b/chromium/net/server/web_socket_encoder.cc index e6d4c64248b..760ff6b9ebd 100644 --- a/chromium/net/server/web_socket_encoder.cc +++ b/chromium/net/server/web_socket_encoder.cc @@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/logging.h" +#include "base/check.h" #include "base/memory/ptr_util.h" #include "base/strings/string_number_conversions.h" #include "net/base/io_buffer.h" |