BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

9 files changed, 9 insertions, 7 deletions

diff --git a/chromium/third_party/libaddressinput/README.chromium b/chromium/third_party/libaddressinput/README.chromium
index 0dd6a54a8ac..49c473f8ca0 100644
--- a/chromium/third_party/libaddressinput/README.chromium
+++ b/chromium/third_party/libaddressinput/README.chromium
@@ -19,6 +19,7 @@ Local Modifications:
 - Use Chrome's version of JSON reader in chromium/json.cc.
 - Use Chrome's version of loose string comparison in chromium/string_compare.cc.
 - fuzz/: Added fuzz targets.
+- Use base/check_op.h in chromium/input_suggester.cc.
 
 Note:
 
diff --git a/chromium/third_party/libaddressinput/chromium/addressinput_util.cc b/chromium/third_party/libaddressinput/chromium/addressinput_util.cc
index 590448a6b31..3f73bd9bcdb 100644
--- a/chromium/third_party/libaddressinput/chromium/addressinput_util.cc
+++ b/chromium/third_party/libaddressinput/chromium/addressinput_util.cc
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h"
diff --git a/chromium/third_party/libaddressinput/chromium/canonicalize_string.cc b/chromium/third_party/libaddressinput/chromium/canonicalize_string.cc
index d1fc1ce10aa..07a501b1667 100644
--- a/chromium/third_party/libaddressinput/chromium/canonicalize_string.cc
+++ b/chromium/third_party/libaddressinput/chromium/canonicalize_string.cc
@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "base/macros.h"
 #include "third_party/icu/source/common/unicode/errorcode.h"
 #include "third_party/icu/source/common/unicode/locid.h"
diff --git a/chromium/third_party/libaddressinput/chromium/chrome_address_validator.cc b/chromium/third_party/libaddressinput/chromium/chrome_address_validator.cc
index 65a4db8fe6e..70ae4d28aa5 100644
--- a/chromium/third_party/libaddressinput/chromium/chrome_address_validator.cc
+++ b/chromium/third_party/libaddressinput/chromium/chrome_address_validator.cc
@@ -7,8 +7,8 @@
 #include <cmath>
 
 #include "base/bind.h"
+#include "base/check.h"
 #include "base/location.h"
-#include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "third_party/libaddressinput/chromium/addressinput_util.h"
diff --git a/chromium/third_party/libaddressinput/chromium/chrome_metadata_source.cc b/chromium/third_party/libaddressinput/chromium/chrome_metadata_source.cc
index e4633c9ec6f..1e63e01ae9e 100644
--- a/chromium/third_party/libaddressinput/chromium/chrome_metadata_source.cc
+++ b/chromium/third_party/libaddressinput/chromium/chrome_metadata_source.cc
@@ -8,7 +8,7 @@
 #include <utility>
 
 #include "base/bind.h"
-#include "base/logging.h"
+#include "base/check.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "net/base/io_buffer.h"
diff --git a/chromium/third_party/libaddressinput/chromium/input_suggester.cc b/chromium/third_party/libaddressinput/chromium/input_suggester.cc
index 5a42e9fe88b..c1201be2790 100644
--- a/chromium/third_party/libaddressinput/chromium/input_suggester.cc
+++ b/chromium/third_party/libaddressinput/chromium/input_suggester.cc
@@ -8,6 +8,7 @@
 #include <set>
 #include <utility>
 
+#include "base/check_op.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "third_party/libaddressinput/chromium/trie.h"
diff --git a/chromium/third_party/libaddressinput/chromium/json.cc b/chromium/third_party/libaddressinput/chromium/json.cc
index feaa70ac81d..c1510898177 100644
--- a/chromium/third_party/libaddressinput/chromium/json.cc
+++ b/chromium/third_party/libaddressinput/chromium/json.cc
@@ -7,8 +7,8 @@
 #include <map>
 #include <memory>
 
+#include "base/check.h"
 #include "base/json/json_reader.h"
-#include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/values.h"
diff --git a/chromium/third_party/libaddressinput/chromium/string_compare.cc b/chromium/third_party/libaddressinput/chromium/string_compare.cc
index c3704b2bc7a..2a78446aad4 100644
--- a/chromium/third_party/libaddressinput/chromium/string_compare.cc
+++ b/chromium/third_party/libaddressinput/chromium/string_compare.cc
@@ -6,8 +6,8 @@
 
 #include <memory>
 
+#include "base/check.h"
 #include "base/lazy_instance.h"
-#include "base/logging.h"
 #include "base/macros.h"
 #include "third_party/icu/source/i18n/unicode/coll.h"
 
diff --git a/chromium/third_party/libaddressinput/chromium/trie.cc b/chromium/third_party/libaddressinput/chromium/trie.cc
index ccaf46e887b..24733a07263 100644
--- a/chromium/third_party/libaddressinput/chromium/trie.cc
+++ b/chromium/third_party/libaddressinput/chromium/trie.cc
@@ -9,7 +9,7 @@
 #include <queue>
 #include <string>
 
-#include "base/logging.h"
+#include "base/check.h"
 
 // Separating template definitions and declarations requires defining all
 // possible template parameters to avoid linking errors.