Swap from base/stl_util.h to cxx17_backports.h.

Chromium moved base::size() to base/cxx17_backports.h, so do the same in
mini_chromium and update the users in Crashpad.

Roll mini_chromium to 2f06f83f to make the new base header available.

Bug: chromium:1210983
Change-Id: Ie3dc4c189dcdfcac030b95fe285f94abb29a27bf
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/2917779
Commit-Queue: Lei Zhang <thestig@chromium.org>
Commit-Queue: Mark Mentovai <mark@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>

DEPS

@@ -42,7 +42,7 @@ deps = {
       '7bde79cc274d06451bf65ae82c012a5d3e476b5a',
   'crashpad/third_party/mini_chromium/mini_chromium':
       Var('chromium_git') + '/chromium/mini_chromium@' +
-      'c0c965a19b442c2ecc38d5c4a90e23ac8b69b804',
+      '2f06f83fd41a64be855548c72ae27f07b0373ba9',
   'crashpad/third_party/libfuzzer/src':
       Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' +
       'fda403cf93ecb8792cb1d061564d89a6553ca020',

client/crash_report_database_mac.mm

@@ -25,11 +25,11 @@
 #include <unistd.h>
 #include <uuid/uuid.h>
 
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/scoped_generic.h"
-#include "base/stl_util.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"

client/crashpad_client_ios.cc

@@ -18,10 +18,10 @@
 
 #include <ios>
 
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/mac/mach_logging.h"
 #include "base/mac/scoped_mach_port.h"
-#include "base/stl_util.h"
 #include "snapshot/ios/process_snapshot_ios.h"
 #include "util/ios/exception_processor.h"
 #include "util/ios/ios_system_data_collector.h"

client/simulate_crash_mac.cc

@@ -18,10 +18,10 @@
 #include <sys/types.h>
 
 #include "base/check_op.h"
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/mac/mach_logging.h"
 #include "base/mac/scoped_mach_port.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "util/mach/exc_client_variants.h"

client/simulate_crash_mac_test.cc

@@ -18,8 +18,8 @@
 #include <string.h>
 #include <sys/types.h>
 
+#include "base/cxx17_backports.h"
 #include "base/macros.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"

handler/mac/file_limit_annotation.cc

@@ -23,8 +23,8 @@
 
 #include <string>
 
+#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "client/crashpad_info.h"
 #include "client/simple_string_dictionary.h"

handler/win/crashy_test_program.cc

@@ -24,9 +24,9 @@
 #include <type_traits>
 #include <vector>
 
+#include "base/cxx17_backports.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "build/build_config.h"
 #include "client/crashpad_client.h"
 #include "client/crashpad_info.h"

handler/win/hanging_program.cc

@@ -15,10 +15,10 @@
 #include <stdio.h>
 #include <windows.h>
 
+#include "base/cxx17_backports.h"
 #include "base/debug/alias.h"
 #include "base/logging.h"
 #include "base/notreached.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "client/crashpad_client.h"

minidump/minidump_annotation_writer_test.cc

@@ -16,7 +16,7 @@
 
 #include <memory>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_extensions.h"
 #include "minidump/test/minidump_byte_array_writer_test_util.h"

minidump/minidump_byte_array_writer_test.cc

@@ -16,8 +16,8 @@
 
 #include <memory>
 
+#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "minidump/test/minidump_writable_test_util.h"

minidump/minidump_exception_writer_test.cc

@@ -17,7 +17,7 @@
 #include <string>
 #include <utility>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_context.h"
 #include "minidump/minidump_context_writer.h"

minidump/minidump_file_writer_test.cc

@@ -20,7 +20,7 @@
 #include <string>
 #include <utility>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_stream_writer.h"

minidump/minidump_memory_writer_test.cc

@@ -16,8 +16,8 @@
 
 #include <utility>
 
+#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_extensions.h"

minidump/minidump_misc_info_writer.cc

@@ -17,9 +17,9 @@
 #include <limits>
 
 #include "base/check_op.h"
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"

minidump/minidump_misc_info_writer_test.cc

@@ -20,8 +20,8 @@
 #include <utility>
 
 #include "base/compiler_specific.h"
+#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "gtest/gtest.h"

minidump/minidump_module_crashpad_info_writer_test.cc

@@ -19,7 +19,7 @@
 
 #include <utility>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_annotation_writer.h"
 #include "minidump/minidump_simple_string_dictionary_writer.h"

minidump/minidump_module_writer_test.cc

@@ -19,8 +19,8 @@
 
 #include <utility>
 
+#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "gtest/gtest.h"

minidump/minidump_rva_list_writer_test.cc

@@ -16,8 +16,8 @@
 
 #include <utility>
 
+#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "minidump/test/minidump_rva_list_test_util.h"

minidump/minidump_string_writer_test.cc

@@ -17,8 +17,8 @@
 #include <string>
 
 #include "base/compiler_specific.h"
+#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "gtest/gtest.h"

minidump/minidump_system_info_writer.cc

@@ -17,8 +17,8 @@
 #include <string.h>
 
 #include "base/check_op.h"
+#include "base/cxx17_backports.h"
 #include "base/notreached.h"
-#include "base/stl_util.h"
 #include "minidump/minidump_string_writer.h"
 #include "snapshot/system_snapshot.h"
 #include "util/file/file_writer.h"

minidump/minidump_thread_id_map_test.cc

@@ -18,8 +18,8 @@
 
 #include <vector>
 
+#include "base/cxx17_backports.h"
 #include "base/macros.h"
-#include "base/stl_util.h"
 #include "gtest/gtest.h"
 #include "snapshot/test/test_thread_snapshot.h"
 

minidump/minidump_thread_writer_test.cc

@@ -18,8 +18,8 @@
 #include <utility>
 
 #include "base/compiler_specific.h"
+#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_context_writer.h"

minidump/minidump_writable.cc

@@ -16,8 +16,8 @@
 
 #include <stdint.h>
 
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
 

minidump/test/minidump_context_test_util.cc

@@ -17,8 +17,8 @@
 #include <string.h>
 #include <sys/types.h>
 
+#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "snapshot/cpu_context.h"

snapshot/capture_memory.cc

@@ -19,8 +19,8 @@
 #include <limits>
 #include <memory>
 
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "snapshot/memory_snapshot.h"
 
 namespace crashpad {

snapshot/cpu_context.cc

@@ -17,8 +17,8 @@
 #include <stddef.h>
 #include <string.h>
 
+#include "base/cxx17_backports.h"
 #include "base/notreached.h"
-#include "base/stl_util.h"
 #include "util/misc/arraysize.h"
 #include "util/misc/implicit_cast.h"
 

snapshot/cpu_context_test.cc

@@ -18,7 +18,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "gtest/gtest.h"
 #include "test/hex_string.h"
 

snapshot/fuchsia/memory_map_region_snapshot_fuchsia.cc

@@ -15,7 +15,7 @@
 #include "snapshot/fuchsia/memory_map_region_snapshot_fuchsia.h"
 
 #include "base/check_op.h"
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 
 namespace crashpad {
 namespace internal {

snapshot/fuchsia/process_reader_fuchsia_test.cc

@@ -20,7 +20,7 @@
 #include <zircon/syscalls/port.h>
 #include <zircon/types.h>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "gtest/gtest.h"
 #include "test/multiprocess_exec.h"
 #include "test/test_paths.h"

snapshot/fuchsia/process_snapshot_fuchsia_test.cc

@@ -17,9 +17,9 @@
 #include <dbghelp.h>
 #include <zircon/syscalls.h>
 
+#include "base/cxx17_backports.h"
 #include "base/fuchsia/fuchsia_logging.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "snapshot/fuchsia/process_snapshot_fuchsia.h"

snapshot/ios/process_snapshot_ios.cc

@@ -17,9 +17,9 @@
 #include <mach-o/loader.h>
 #include <mach/mach.h>
 
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/mac/mach_logging.h"
-#include "base/stl_util.h"
 
 namespace {
 

snapshot/linux/exception_snapshot_linux_test.cc

@@ -22,8 +22,8 @@
 #include <unistd.h>
 
 #include "base/bit_cast.h"
+#include "base/cxx17_backports.h"
 #include "base/macros.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "snapshot/cpu_architecture.h"

snapshot/linux/process_reader_linux_test.cc

@@ -31,9 +31,9 @@
 #include <string>
 #include <utility>
 
+#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
 #include "base/memory/free_deleter.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"

snapshot/mac/mach_o_image_reader.cc

@@ -21,8 +21,8 @@
 #include <limits>
 #include <utility>
 
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "client/crashpad_info.h"
 #include "snapshot/mac/mach_o_image_segment_reader.h"

snapshot/mac/mach_o_image_segment_reader_test.cc

@@ -16,7 +16,7 @@
 
 #include <mach-o/loader.h>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 

snapshot/mac/process_reader_mac_test.cc

@@ -29,10 +29,10 @@
 #include <utility>
 
 #include "base/check_op.h"
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/mac/mach_logging.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"

snapshot/mac/process_types.cc

@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "snapshot/mac/process_types/internal.h"
 #include "util/process/process_memory_mac.h"
 

snapshot/mac/process_types/custom.cc

@@ -23,9 +23,9 @@
 #include <type_traits>
 
 #include "base/check_op.h"
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/numerics/safe_math.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "snapshot/mac/process_types/internal.h"
 #include "util/mac/mac_util.h"

snapshot/mac/process_types_test.cc

@@ -21,7 +21,7 @@
 #include <limits>
 #include <vector>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"

snapshot/minidump/minidump_context_converter.cc

@@ -16,8 +16,8 @@
 
 #include <string.h>
 
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "minidump/minidump_context.h"
 
 namespace crashpad {

snapshot/minidump/process_snapshot_minidump_test.cc

@@ -21,8 +21,8 @@
 #include <algorithm>
 #include <memory>
 
+#include "base/cxx17_backports.h"
 #include "base/numerics/safe_math.h"
-#include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_context.h"

snapshot/minidump/thread_snapshot_minidump.cc

@@ -17,7 +17,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "minidump/minidump_context.h"
 
 namespace crashpad {

snapshot/posix/timezone.cc

@@ -17,8 +17,8 @@
 #include <stddef.h>
 #include <time.h>
 
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "build/build_config.h"
 
 namespace crashpad {

snapshot/posix/timezone_test.cc

@@ -20,8 +20,8 @@
 
 #include <string>
 
+#include "base/cxx17_backports.h"
 #include "base/macros.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "test/errors.h"

snapshot/sanitized/process_snapshot_sanitized_test.cc

@@ -16,9 +16,9 @@
 
 #include <string.h>
 
+#include "base/cxx17_backports.h"
 #include "base/macros.h"
 #include "base/notreached.h"
-#include "base/stl_util.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "test/multiprocess_exec.h"

snapshot/sanitized/sanitization_information_test.cc

@@ -14,7 +14,7 @@
 
 #include "snapshot/sanitized/sanitization_information.h"
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "util/misc/from_pointer_cast.h"

snapshot/test/test_cpu_context.cc

@@ -17,7 +17,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 
 namespace crashpad {
 namespace test {

snapshot/win/cpu_context_win_test.cc

@@ -16,7 +16,7 @@
 
 #include <windows.h>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "snapshot/cpu_context.h"

snapshot/win/crashpad_snapshot_test_image_reader.cc

@@ -14,8 +14,8 @@
 
 #include <windows.h>
 
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "client/crashpad_info.h"
 #include "util/file/file_io.h"
 #include "util/synchronization/semaphore.h"

snapshot/win/pe_image_annotations_reader.cc

@@ -17,8 +17,8 @@
 #include <string.h>
 #include <sys/types.h>
 
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "client/annotation.h"
 #include "client/simple_string_dictionary.h"

snapshot/win/pe_image_reader.cc

@@ -20,8 +20,8 @@
 #include <algorithm>
 #include <memory>
 
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "client/crashpad_info.h"
 #include "snapshot/win/pe_image_resource_reader.h"

snapshot/win/process_reader_win_test.cc

@@ -17,7 +17,7 @@
 #include <windows.h>
 #include <string.h>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "gtest/gtest.h"
 #include "test/win/win_multiprocess.h"
 #include "util/misc/from_pointer_cast.h"

snapshot/win/process_snapshot_win.cc

@@ -20,9 +20,9 @@
 #include <algorithm>
 #include <utility>
 
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
-#include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "util/misc/from_pointer_cast.h"

test/hex_string_test.cc

@@ -14,7 +14,7 @@
 
 #include "test/hex_string.h"
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "gtest/gtest.h"
 
 namespace crashpad {

tools/crashpad_database_util.cc

@@ -27,9 +27,9 @@
 #include <vector>
 
 #include "base/check_op.h"
+#include "base/cxx17_backports.h"
 #include "base/files/file_path.h"
 #include "base/numerics/safe_conversions.h"
-#include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "client/crash_report_database.h"

util/file/delimited_file_reader.cc

@@ -20,8 +20,8 @@
 #include <limits>
 
 #include "base/check_op.h"
+#include "base/cxx17_backports.h"
 #include "base/numerics/safe_conversions.h"
-#include "base/stl_util.h"
 
 namespace crashpad {
 

util/file/delimited_file_reader_test.cc

@@ -16,8 +16,8 @@
 
 #include <vector>
 
+#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "util/file/string_file.h"

util/file/file_io_test.cc

@@ -20,9 +20,9 @@
 #include <type_traits>
 
 #include "base/atomicops.h"
+#include "base/cxx17_backports.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
-#include "base/stl_util.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "test/errors.h"

util/linux/proc_stat_reader.cc

@@ -18,9 +18,9 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "base/cxx17_backports.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "util/file/file_io.h"
 #include "util/misc/lexing.h"
 #include "util/misc/time.h"

util/linux/proc_task_reader.cc

@@ -16,9 +16,9 @@
 
 #include <stdio.h>
 
+#include "base/cxx17_backports.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "util/file/directory_reader.h"
 #include "util/misc/as_underlying_type.h"

util/linux/ptrace_client.cc

@@ -20,8 +20,8 @@
 
 #include <string>
 
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "util/file/file_io.h"
 #include "util/linux/ptrace_broker.h"

util/mac/checked_mach_address_range_test.cc

@@ -19,7 +19,7 @@
 
 #include <limits>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"

util/mac/launchd_test.mm

@@ -22,8 +22,8 @@
 #include <cmath>
 #include <limits>
 
+#include "base/cxx17_backports.h"
 #include "base/mac/scoped_launch_data.h"
-#include "base/stl_util.h"
 #include "gtest/gtest.h"
 #include "util/stdlib/objc.h"
 

util/mach/child_port_handshake.cc

@@ -27,13 +27,13 @@
 #include <utility>
 
 #include "base/check_op.h"
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/mac/mach_logging.h"
 #include "base/mac/scoped_mach_port.h"
 #include "base/notreached.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/rand_util.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "util/file/file_io.h"
 #include "util/mach/bootstrap.h"

util/mach/child_port_server.cc

@@ -14,7 +14,7 @@
 
 #include "util/mach/child_port_server.h"
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "util/mach/child_portServer.h"
 #include "util/mach/mach_message.h"
 

util/mach/composite_mach_message_server_test.cc

@@ -16,7 +16,7 @@
 
 #include <sys/types.h>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "test/gtest_death.h"

util/mach/exc_client_variants_test.cc

@@ -19,8 +19,8 @@
 #include <string.h>
 #include <sys/types.h>
 
+#include "base/cxx17_backports.h"
 #include "base/macros.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "test/mac/mach_errors.h"

util/mach/exc_server_variants.cc

@@ -20,7 +20,7 @@
 #include <algorithm>
 #include <vector>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "build/build_config.h"
 #include "util/mac/mac_util.h"
 #include "util/mach/composite_mach_message_server.h"

util/mach/exc_server_variants_test.cc

@@ -19,7 +19,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gmock/gmock.h"

util/mach/exception_behaviors_test.cc

@@ -16,7 +16,7 @@
 
 #include <sys/types.h>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "util/mach/mach_extensions.h"

util/mach/exception_types_test.cc

@@ -20,7 +20,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"

util/mach/mach_message_server_test.cc

@@ -21,9 +21,9 @@
 
 #include <set>
 
+#include "base/cxx17_backports.h"
 #include "base/mac/scoped_mach_port.h"
 #include "base/macros.h"
-#include "base/stl_util.h"
 #include "gtest/gtest.h"
 #include "test/mac/mach_errors.h"
 #include "test/mac/mach_multiprocess.h"

util/mach/notify_server.cc

@@ -14,7 +14,7 @@
 
 #include "util/mach/notify_server.h"
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "util/mach/mach_message.h"
 #include "util/mach/notifyServer.h"
 

util/mach/symbolic_constants_mach.cc

@@ -17,7 +17,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "base/strings/stringprintf.h"
 #include "util/mach/exception_behaviors.h"
 #include "util/mach/mach_extensions.h"

util/mach/symbolic_constants_mach_test.cc

@@ -18,7 +18,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"

util/misc/capture_context_test_util_win.cc

@@ -15,7 +15,7 @@
 #include "util/misc/capture_context_test_util.h"
 #include "util/win/context_wrappers.h"
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "gtest/gtest.h"
 
 namespace crashpad {

util/misc/clock_test.cc

@@ -18,8 +18,8 @@
 
 #include <algorithm>
 
+#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 

util/misc/paths_win.cc

@@ -16,8 +16,8 @@
 
 #include <windows.h>
 
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 
 namespace crashpad {
 

util/misc/random_string_test.cc

@@ -18,7 +18,7 @@
 
 #include <set>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "gtest/gtest.h"
 
 namespace crashpad {

util/misc/uuid_test.cc

@@ -19,9 +19,9 @@
 
 #include <string>
 
+#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
 #include "base/scoped_generic.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 

util/net/http_transport_socket.cc

@@ -20,12 +20,12 @@
 #include <string.h>
 #include <sys/socket.h>
 
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/scoped_generic.h"
-#include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "util/file/file_io.h"

util/net/http_transport_win.cc

@@ -22,10 +22,10 @@
 #include <wchar.h>
 #include <winhttp.h>
 
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/scoped_generic.h"
-#include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"

util/numeric/checked_address_range_test.cc

@@ -18,8 +18,8 @@
 
 #include <limits>
 
+#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"

util/numeric/checked_range_test.cc

@@ -19,8 +19,8 @@
 
 #include <limits>
 
+#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 

util/posix/close_multiple.cc

@@ -22,10 +22,10 @@
 
 #include <algorithm>
 
+#include "base/cxx17_backports.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
 #include "util/file/directory_reader.h"

util/posix/process_info_mac.cc

@@ -16,9 +16,9 @@
 
 #include <string.h>
 
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/mac/mach_logging.h"
-#include "base/stl_util.h"
 
 namespace crashpad {
 

util/posix/scoped_mmap_test.cc

@@ -18,9 +18,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "base/cxx17_backports.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/rand_util.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "test/gtest_death.h"

util/posix/signals.cc

@@ -19,8 +19,8 @@
 #include <vector>
 
 #include "base/check_op.h"
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 
 namespace crashpad {
 

util/posix/signals_test.cc

@@ -24,9 +24,9 @@
 #include <limits>
 
 #include "base/compiler_specific.h"
+#include "base/cxx17_backports.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"

util/posix/symbolic_constants_posix.cc

@@ -18,7 +18,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "util/misc/implicit_cast.h"

util/posix/symbolic_constants_posix_test.cc

@@ -17,7 +17,7 @@
 #include <signal.h>
 #include <sys/types.h>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"

util/process/process_memory_range_test.cc

@@ -16,7 +16,7 @@
 
 #include <limits>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "test/process_type.h"

util/stdlib/string_number_conversion_test.cc

@@ -20,7 +20,7 @@
 #include <limits>
 #include <type_traits>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "gtest/gtest.h"
 
 #define STRINGIFY(a) STR(a)

util/stdlib/strlcpy_test.cc

@@ -20,8 +20,8 @@
 #include <algorithm>
 #include <string>
 
+#include "base/cxx17_backports.h"
 #include "base/format_macros.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 

util/stdlib/thread_safe_vector_test.cc

@@ -14,7 +14,7 @@
 
 #include "util/stdlib/thread_safe_vector.h"
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "gtest/gtest.h"
 #include "util/thread/thread.h"
 

util/stream/base94_output_stream_test.cc

@@ -19,9 +19,9 @@
 #include <algorithm>
 #include <sstream>
 
+#include "base/cxx17_backports.h"
 #include "base/macros.h"
 #include "base/rand_util.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "util/stream/test_output_stream.h"

util/stream/zlib_output_stream.cc

@@ -14,9 +14,9 @@
 
 #include "util/stream/zlib_output_stream.h"
 
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
-#include "base/stl_util.h"
 #include "util/misc/zlib.h"
 
 namespace crashpad {

util/stream/zlib_output_stream_test.cc

@@ -18,8 +18,8 @@
 
 #include <algorithm>
 
+#include "base/cxx17_backports.h"
 #include "base/rand_util.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "util/stream/test_output_stream.h"

util/synchronization/semaphore_test.cc

@@ -16,7 +16,7 @@
 
 #include <sys/types.h>
 
-#include "base/stl_util.h"
+#include "base/cxx17_backports.h"
 #include "gtest/gtest.h"
 
 #if defined(OS_POSIX)

util/thread/thread_log_messages_test.cc

@@ -17,8 +17,8 @@
 #include <string.h>
 #include <sys/types.h>
 
+#include "base/cxx17_backports.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "util/thread/thread.h"