From bede7bb29ee66a647cb188d761fe06d24084e878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= Date: Tue, 16 Nov 2021 12:58:15 -0800 Subject: [PATCH] Rename "base/macros.h" => "base/ignore_result.h" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This pulls in "base/ignore_result.h" from mini_chromium through DEPS and updates existing uses of "base/macros.h" to use "base/ignore_result.h". Bug: chromium:1010217 Change-Id: I283e2bcfb2775de420d7e767b3b4a639dbba9e20 Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3286105 Reviewed-by: Mark Mentovai Commit-Queue: Peter Boström --- DEPS | 2 +- client/crash_report_database_generic.cc | 2 +- client/crash_report_database_mac.mm | 2 +- client/crash_report_database_win.cc | 2 +- client/crashpad_client_mac.cc | 2 +- test/mac/mach_multiprocess.cc | 2 +- util/mach/child_port_handshake.h | 2 +- util/mach/mach_message_test.cc | 2 +- util/posix/close_stdio.cc | 2 +- util/stream/file_encoder.cc | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/DEPS b/DEPS index 8ecd52e3..c1edb80c 100644 --- a/DEPS +++ b/DEPS @@ -39,7 +39,7 @@ deps = { '7bde79cc274d06451bf65ae82c012a5d3e476b5a', 'crashpad/third_party/mini_chromium/mini_chromium': Var('chromium_git') + '/chromium/mini_chromium@' + - '461b416dbe5f40a060ee08764b4986a949da6e6e', + '0e22eed71eec97dacbe80822a14c5cd0b580d793', 'crashpad/third_party/libfuzzer/src': Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' + 'fda403cf93ecb8792cb1d061564d89a6553ca020', diff --git a/client/crash_report_database_generic.cc b/client/crash_report_database_generic.cc index 734a6c48..f5dfa891 100644 --- a/client/crash_report_database_generic.cc +++ b/client/crash_report_database_generic.cc @@ -20,8 +20,8 @@ #include +#include "base/ignore_result.h" #include "base/logging.h" -#include "base/macros.h" #include "build/build_config.h" #include "client/settings.h" #include "util/file/directory_reader.h" diff --git a/client/crash_report_database_mac.mm b/client/crash_report_database_mac.mm index ce0ab186..d1c0a3ed 100644 --- a/client/crash_report_database_mac.mm +++ b/client/crash_report_database_mac.mm @@ -26,9 +26,9 @@ #include #include "base/cxx17_backports.h" +#include "base/ignore_result.h" #include "base/logging.h" #include "base/mac/scoped_nsautorelease_pool.h" -#include "base/macros.h" #include "base/posix/eintr_wrapper.h" #include "base/scoped_generic.h" #include "base/strings/string_piece.h" diff --git a/client/crash_report_database_win.cc b/client/crash_report_database_win.cc index 33d729bb..65feaa4c 100644 --- a/client/crash_report_database_win.cc +++ b/client/crash_report_database_win.cc @@ -23,8 +23,8 @@ #include +#include "base/ignore_result.h" #include "base/logging.h" -#include "base/macros.h" #include "base/numerics/safe_math.h" #include "base/strings/utf_string_conversions.h" #include "client/settings.h" diff --git a/client/crashpad_client_mac.cc b/client/crashpad_client_mac.cc index f4256f0c..b4a365d0 100644 --- a/client/crashpad_client_mac.cc +++ b/client/crashpad_client_mac.cc @@ -23,9 +23,9 @@ #include #include +#include "base/ignore_result.h" #include "base/logging.h" #include "base/mac/mach_logging.h" -#include "base/macros.h" #include "base/strings/stringprintf.h" #include "util/mac/mac_util.h" #include "util/mach/bootstrap.h" diff --git a/test/mac/mach_multiprocess.cc b/test/mac/mach_multiprocess.cc index 35df0611..91a06e3a 100644 --- a/test/mac/mach_multiprocess.cc +++ b/test/mac/mach_multiprocess.cc @@ -21,8 +21,8 @@ #include #include "base/auto_reset.h" +#include "base/ignore_result.h" #include "base/mac/scoped_mach_port.h" -#include "base/macros.h" #include "gtest/gtest.h" #include "test/errors.h" #include "test/mac/mach_errors.h" diff --git a/util/mach/child_port_handshake.h b/util/mach/child_port_handshake.h index 0399f9b8..c61f734e 100644 --- a/util/mach/child_port_handshake.h +++ b/util/mach/child_port_handshake.h @@ -20,7 +20,7 @@ #include #include "base/files/scoped_file.h" -#include "base/macros.h" +#include "base/ignore_result.h" #include "util/mach/child_port_types.h" namespace crashpad { diff --git a/util/mach/mach_message_test.cc b/util/mach/mach_message_test.cc index 5af954e4..0bee04b3 100644 --- a/util/mach/mach_message_test.cc +++ b/util/mach/mach_message_test.cc @@ -16,8 +16,8 @@ #include +#include "base/ignore_result.h" #include "base/mac/scoped_mach_port.h" -#include "base/macros.h" #include "gtest/gtest.h" #include "test/mac/mach_errors.h" #include "util/mach/mach_extensions.h" diff --git a/util/posix/close_stdio.cc b/util/posix/close_stdio.cc index 812aad57..a8efc81c 100644 --- a/util/posix/close_stdio.cc +++ b/util/posix/close_stdio.cc @@ -20,7 +20,7 @@ #include "base/check.h" #include "base/files/scoped_file.h" -#include "base/macros.h" +#include "base/ignore_result.h" #include "base/posix/eintr_wrapper.h" namespace crashpad { diff --git a/util/stream/file_encoder.cc b/util/stream/file_encoder.cc index e375cef7..5cebbfcc 100644 --- a/util/stream/file_encoder.cc +++ b/util/stream/file_encoder.cc @@ -16,7 +16,7 @@ #include -#include "base/macros.h" +#include "base/ignore_result.h" #include "util/file/file_io.h" #include "util/file/file_reader.h" #include "util/file/scoped_remove_file.h"