From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/base/logging.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'chromium/base/logging.cc') diff --git a/chromium/base/logging.cc b/chromium/base/logging.cc index fdd86299aa4..2da71c73819 100644 --- a/chromium/base/logging.cc +++ b/chromium/base/logging.cc @@ -8,16 +8,20 @@ // build time. Try not to raise this limit unless absolutely necessary. See // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md #ifndef NACL_TC_REV -#pragma clang max_tokens_here 370000 +#pragma clang max_tokens_here 350000 #endif // NACL_TC_REV +#ifdef BASE_CHECK_H_ +#error "logging.h should not include check.h" +#endif + #include #include #include "base/pending_task.h" #include "base/stl_util.h" #include "base/task/common/task_annotator.h" -#include "base/trace_event/trace_event.h" +#include "base/trace_event/base_tracing.h" #include "build/build_config.h" #if defined(OS_WIN) -- cgit v1.2.1