diff options
Diffstat (limited to 'chromium/sandbox')
56 files changed, 87 insertions, 52 deletions
diff --git a/chromium/sandbox/linux/bpf_dsl/bpf_dsl.cc b/chromium/sandbox/linux/bpf_dsl/bpf_dsl.cc index fed6368db67..51aa6ccf8c5 100644 --- a/chromium/sandbox/linux/bpf_dsl/bpf_dsl.cc +++ b/chromium/sandbox/linux/bpf_dsl/bpf_dsl.cc @@ -8,8 +8,9 @@ #include <stdint.h> #include <limits> +#include <ostream> -#include "base/logging.h" +#include "base/check.h" #include "base/macros.h" #include "sandbox/linux/bpf_dsl/bpf_dsl_impl.h" #include "sandbox/linux/bpf_dsl/errorcode.h" diff --git a/chromium/sandbox/linux/bpf_dsl/bpf_dsl_unittest.cc b/chromium/sandbox/linux/bpf_dsl/bpf_dsl_unittest.cc index 801deee3e79..cae77db0435 100644 --- a/chromium/sandbox/linux/bpf_dsl/bpf_dsl_unittest.cc +++ b/chromium/sandbox/linux/bpf_dsl/bpf_dsl_unittest.cc @@ -17,6 +17,7 @@ #include <utility> #include "base/files/scoped_file.h" +#include "base/logging.h" #include "base/macros.h" #include "build/build_config.h" #include "sandbox/linux/bpf_dsl/bpf_dsl_impl.h" diff --git a/chromium/sandbox/linux/bpf_dsl/codegen.cc b/chromium/sandbox/linux/bpf_dsl/codegen.cc index d88bd531a2f..9971104af8d 100644 --- a/chromium/sandbox/linux/bpf_dsl/codegen.cc +++ b/chromium/sandbox/linux/bpf_dsl/codegen.cc @@ -8,9 +8,10 @@ #include <stdint.h> #include <limits> +#include <ostream> #include <utility> -#include "base/logging.h" +#include "base/check_op.h" #include "sandbox/linux/system_headers/linux_filter.h" // This CodeGen implementation strives for simplicity while still diff --git a/chromium/sandbox/linux/bpf_dsl/policy_compiler.cc b/chromium/sandbox/linux/bpf_dsl/policy_compiler.cc index 347304889ea..a894e2ad397 100644 --- a/chromium/sandbox/linux/bpf_dsl/policy_compiler.cc +++ b/chromium/sandbox/linux/bpf_dsl/policy_compiler.cc @@ -11,7 +11,7 @@ #include <limits> -#include "base/logging.h" +#include "base/check_op.h" #include "base/stl_util.h" #include "sandbox/linux/bpf_dsl/bpf_dsl.h" #include "sandbox/linux/bpf_dsl/bpf_dsl_impl.h" diff --git a/chromium/sandbox/linux/bpf_dsl/syscall_set.cc b/chromium/sandbox/linux/bpf_dsl/syscall_set.cc index 55b2d5a49ac..e21c63feddb 100644 --- a/chromium/sandbox/linux/bpf_dsl/syscall_set.cc +++ b/chromium/sandbox/linux/bpf_dsl/syscall_set.cc @@ -6,7 +6,7 @@ #include <stdint.h> -#include "base/logging.h" +#include "base/check.h" #include "base/macros.h" #include "build/build_config.h" #include "sandbox/linux/bpf_dsl/linux_syscall_ranges.h" diff --git a/chromium/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc b/chromium/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc index d30e15560a4..28604a82797 100644 --- a/chromium/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc +++ b/chromium/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc @@ -25,7 +25,7 @@ #include <linux/futex.h> #include "base/bind.h" -#include "base/logging.h" +#include "base/check.h" #include "base/macros.h" #include "base/posix/eintr_wrapper.h" #include "base/synchronization/waitable_event.h" diff --git a/chromium/sandbox/linux/integration_tests/namespace_unix_domain_socket_unittest.cc b/chromium/sandbox/linux/integration_tests/namespace_unix_domain_socket_unittest.cc index c41fcbb78e4..7959e8799ef 100644 --- a/chromium/sandbox/linux/integration_tests/namespace_unix_domain_socket_unittest.cc +++ b/chromium/sandbox/linux/integration_tests/namespace_unix_domain_socket_unittest.cc @@ -14,8 +14,9 @@ #include <utility> #include <vector> +#include "base/check_op.h" #include "base/files/scoped_file.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/posix/eintr_wrapper.h" #include "base/posix/unix_domain_socket.h" #include "base/process/process.h" diff --git a/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc index 712f9699a94..a6d2c0dfb57 100644 --- a/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc +++ b/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc @@ -11,8 +11,8 @@ #include <sys/types.h> #include <unistd.h> +#include "base/check_op.h" #include "base/clang_profiling_buildflags.h" -#include "base/logging.h" #include "build/build_config.h" #include "sandbox/linux/bpf_dsl/bpf_dsl.h" #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h" diff --git a/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc b/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc index 7514f9a4a0a..b968c04aa34 100644 --- a/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc +++ b/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc @@ -8,11 +8,12 @@ #include <stddef.h> #include <stdint.h> +#include <string.h> #include <sys/syscall.h> #include <unistd.h> +#include "base/check.h" #include "base/debug/crash_logging.h" -#include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/stl_util.h" #include "build/build_config.h" diff --git a/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc index ff5a1c093c7..f51915edc36 100644 --- a/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc +++ b/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc @@ -19,8 +19,8 @@ #include <time.h> #include <unistd.h> -#include "base/logging.h" #include "base/macros.h" +#include "base/notreached.h" #include "base/synchronization/synchronization_buildflags.h" #include "build/build_config.h" #include "sandbox/linux/bpf_dsl/bpf_dsl.h" diff --git a/chromium/sandbox/linux/seccomp-bpf/sandbox_bpf.cc b/chromium/sandbox/linux/seccomp-bpf/sandbox_bpf.cc index 72a79670d32..639cd15e07f 100644 --- a/chromium/sandbox/linux/seccomp-bpf/sandbox_bpf.cc +++ b/chromium/sandbox/linux/seccomp-bpf/sandbox_bpf.cc @@ -6,14 +6,16 @@ #include <errno.h> #include <stdint.h> +#include <string.h> #include <sys/prctl.h> #include <sys/types.h> #include <unistd.h> +#include "base/check_op.h" #include "base/compiler_specific.h" #include "base/files/scoped_file.h" -#include "base/logging.h" #include "base/macros.h" +#include "base/notreached.h" #include "base/posix/eintr_wrapper.h" #include "sandbox/linux/bpf_dsl/bpf_dsl.h" #include "sandbox/linux/bpf_dsl/codegen.h" diff --git a/chromium/sandbox/linux/seccomp-bpf/sandbox_bpf_test_runner.cc b/chromium/sandbox/linux/seccomp-bpf/sandbox_bpf_test_runner.cc index 36f3744b76e..6de80b95654 100644 --- a/chromium/sandbox/linux/seccomp-bpf/sandbox_bpf_test_runner.cc +++ b/chromium/sandbox/linux/seccomp-bpf/sandbox_bpf_test_runner.cc @@ -8,7 +8,7 @@ #include <memory> -#include "base/logging.h" +#include "base/check.h" #include "sandbox/linux/bpf_dsl/policy.h" #include "sandbox/linux/seccomp-bpf/die.h" #include "sandbox/linux/seccomp-bpf/sandbox_bpf.h" diff --git a/chromium/sandbox/linux/seccomp-bpf/syscall.cc b/chromium/sandbox/linux/seccomp-bpf/syscall.cc index 34edabd2b82..e47e98bf5b7 100644 --- a/chromium/sandbox/linux/seccomp-bpf/syscall.cc +++ b/chromium/sandbox/linux/seccomp-bpf/syscall.cc @@ -7,7 +7,9 @@ #include <errno.h> #include <stdint.h> -#include "base/logging.h" +#include <ostream> + +#include "base/check_op.h" #include "build/build_config.h" #include "sandbox/linux/bpf_dsl/seccomp_macros.h" diff --git a/chromium/sandbox/linux/services/credentials_unittest.cc b/chromium/sandbox/linux/services/credentials_unittest.cc index ab6039479a3..01dafb9f42f 100644 --- a/chromium/sandbox/linux/services/credentials_unittest.cc +++ b/chromium/sandbox/linux/services/credentials_unittest.cc @@ -18,10 +18,10 @@ #include <memory> #include <vector> +#include "base/check_op.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" -#include "base/logging.h" #include "sandbox/linux/services/proc_util.h" #include "sandbox/linux/services/syscall_wrappers.h" #include "sandbox/linux/system_headers/capability.h" diff --git a/chromium/sandbox/linux/services/libc_interceptor.cc b/chromium/sandbox/linux/services/libc_interceptor.cc index 2f0df72c71c..609605c2bcb 100644 --- a/chromium/sandbox/linux/services/libc_interceptor.cc +++ b/chromium/sandbox/linux/services/libc_interceptor.cc @@ -22,6 +22,7 @@ #include "base/compiler_specific.h" #include "base/lazy_instance.h" +#include "base/logging.h" #include "base/pickle.h" #include "base/posix/eintr_wrapper.h" #include "base/posix/global_descriptors.h" diff --git a/chromium/sandbox/linux/services/namespace_sandbox.cc b/chromium/sandbox/linux/services/namespace_sandbox.cc index 2a1814ba3e6..d5d0f68e274 100644 --- a/chromium/sandbox/linux/services/namespace_sandbox.cc +++ b/chromium/sandbox/linux/services/namespace_sandbox.cc @@ -15,10 +15,10 @@ #include <utility> #include <vector> +#include "base/check_op.h" #include "base/command_line.h" #include "base/environment.h" #include "base/files/scoped_file.h" -#include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/process/launch.h" #include "base/process/process.h" diff --git a/chromium/sandbox/linux/services/namespace_sandbox_unittest.cc b/chromium/sandbox/linux/services/namespace_sandbox_unittest.cc index 8f6a23143bb..a00aa7a22a8 100644 --- a/chromium/sandbox/linux/services/namespace_sandbox_unittest.cc +++ b/chromium/sandbox/linux/services/namespace_sandbox_unittest.cc @@ -12,10 +12,10 @@ #include <string> #include <utility> +#include "base/check_op.h" #include "base/command_line.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" -#include "base/logging.h" #include "base/process/launch.h" #include "base/process/process.h" #include "base/test/multiprocess_test.h" diff --git a/chromium/sandbox/linux/services/namespace_utils.cc b/chromium/sandbox/linux/services/namespace_utils.cc index 376b179f4f6..14045ae1e4c 100644 --- a/chromium/sandbox/linux/services/namespace_utils.cc +++ b/chromium/sandbox/linux/services/namespace_utils.cc @@ -13,10 +13,11 @@ #include <string> +#include "base/check.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/posix/eintr_wrapper.h" #include "base/process/launch.h" #include "base/strings/safe_sprintf.h" diff --git a/chromium/sandbox/linux/services/namespace_utils_unittest.cc b/chromium/sandbox/linux/services/namespace_utils_unittest.cc index 41ed7e89a6e..5218a1c5cef 100644 --- a/chromium/sandbox/linux/services/namespace_utils_unittest.cc +++ b/chromium/sandbox/linux/services/namespace_utils_unittest.cc @@ -9,7 +9,7 @@ #include <sys/types.h> #include <sys/wait.h> -#include "base/logging.h" +#include "base/check.h" #include "base/posix/eintr_wrapper.h" #include "base/process/launch.h" #include "sandbox/linux/services/credentials.h" diff --git a/chromium/sandbox/linux/services/proc_util.cc b/chromium/sandbox/linux/services/proc_util.cc index 06b9002e2eb..74f589121e7 100644 --- a/chromium/sandbox/linux/services/proc_util.cc +++ b/chromium/sandbox/linux/services/proc_util.cc @@ -13,7 +13,7 @@ #include <memory> -#include "base/logging.h" +#include "base/check_op.h" #include "base/posix/eintr_wrapper.h" #include "base/strings/string_number_conversions.h" diff --git a/chromium/sandbox/linux/services/resource_limits_unittests.cc b/chromium/sandbox/linux/services/resource_limits_unittests.cc index c885870ab60..b79404dbc49 100644 --- a/chromium/sandbox/linux/services/resource_limits_unittests.cc +++ b/chromium/sandbox/linux/services/resource_limits_unittests.cc @@ -9,7 +9,7 @@ #include <sys/time.h> #include <unistd.h> -#include "base/logging.h" +#include "base/check_op.h" #include "sandbox/linux/tests/test_utils.h" #include "sandbox/linux/tests/unit_tests.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chromium/sandbox/linux/services/scoped_process.cc b/chromium/sandbox/linux/services/scoped_process.cc index 6ad405b6a2f..db0c6d40fdb 100644 --- a/chromium/sandbox/linux/services/scoped_process.cc +++ b/chromium/sandbox/linux/services/scoped_process.cc @@ -13,7 +13,8 @@ #include <unistd.h> #include "base/callback.h" -#include "base/logging.h" +#include "base/check_op.h" +#include "base/notreached.h" #include "base/posix/eintr_wrapper.h" #include "build/build_config.h" #include "sandbox/linux/services/syscall_wrappers.h" diff --git a/chromium/sandbox/linux/services/scoped_process_unittest.cc b/chromium/sandbox/linux/services/scoped_process_unittest.cc index e019d6d33b1..2498bd3682f 100644 --- a/chromium/sandbox/linux/services/scoped_process_unittest.cc +++ b/chromium/sandbox/linux/services/scoped_process_unittest.cc @@ -14,9 +14,9 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" +#include "base/check.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" -#include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/threading/platform_thread.h" #include "base/time/time.h" diff --git a/chromium/sandbox/linux/services/syscall_wrappers_unittest.cc b/chromium/sandbox/linux/services/syscall_wrappers_unittest.cc index b28e6381bff..32820f60a8c 100644 --- a/chromium/sandbox/linux/services/syscall_wrappers_unittest.cc +++ b/chromium/sandbox/linux/services/syscall_wrappers_unittest.cc @@ -11,7 +11,6 @@ #include <unistd.h> #include <cstring> -#include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "build/build_config.h" #include "sandbox/linux/system_headers/linux_signal.h" diff --git a/chromium/sandbox/linux/services/thread_helpers_unittests.cc b/chromium/sandbox/linux/services/thread_helpers_unittests.cc index 5e574599fcb..f36b0c55b21 100644 --- a/chromium/sandbox/linux/services/thread_helpers_unittests.cc +++ b/chromium/sandbox/linux/services/thread_helpers_unittests.cc @@ -10,7 +10,7 @@ #include <sys/types.h> #include <unistd.h> -#include "base/logging.h" +#include "base/check_op.h" #include "base/macros.h" #include "base/posix/eintr_wrapper.h" #include "base/process/process_metrics.h" diff --git a/chromium/sandbox/linux/services/yama.cc b/chromium/sandbox/linux/services/yama.cc index 6831cd9c554..e67671249fe 100644 --- a/chromium/sandbox/linux/services/yama.cc +++ b/chromium/sandbox/linux/services/yama.cc @@ -12,9 +12,10 @@ #include <sys/types.h> #include <unistd.h> +#include "base/check.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/posix/eintr_wrapper.h" #if !defined(PR_SET_PTRACER_ANY) diff --git a/chromium/sandbox/linux/suid/client/setuid_sandbox_host_unittest.cc b/chromium/sandbox/linux/suid/client/setuid_sandbox_host_unittest.cc index efbd9311ca6..b391820f8cd 100644 --- a/chromium/sandbox/linux/suid/client/setuid_sandbox_host_unittest.cc +++ b/chromium/sandbox/linux/suid/client/setuid_sandbox_host_unittest.cc @@ -8,7 +8,6 @@ #include <string> #include "base/environment.h" -#include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "sandbox/linux/suid/common/sandbox.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chromium/sandbox/linux/syscall_broker/broker_channel.cc b/chromium/sandbox/linux/syscall_broker/broker_channel.cc index fa0f7615fca..288437ddbd3 100644 --- a/chromium/sandbox/linux/syscall_broker/broker_channel.cc +++ b/chromium/sandbox/linux/syscall_broker/broker_channel.cc @@ -7,7 +7,7 @@ #include <sys/socket.h> #include <sys/types.h> -#include "base/logging.h" +#include "base/check.h" namespace sandbox { diff --git a/chromium/sandbox/linux/syscall_broker/broker_client.cc b/chromium/sandbox/linux/syscall_broker/broker_client.cc index 79640d09744..fb897eb6ff8 100644 --- a/chromium/sandbox/linux/syscall_broker/broker_client.cc +++ b/chromium/sandbox/linux/syscall_broker/broker_client.cc @@ -8,12 +8,13 @@ #include <fcntl.h> #include <stddef.h> #include <stdint.h> +#include <string.h> #include <sys/socket.h> #include <sys/stat.h> #include <utility> -#include "base/logging.h" +#include "base/check.h" #include "base/posix/unix_domain_socket.h" #include "build/build_config.h" #include "sandbox/linux/syscall_broker/broker_channel.h" diff --git a/chromium/sandbox/linux/syscall_broker/broker_file_permission.cc b/chromium/sandbox/linux/syscall_broker/broker_file_permission.cc index e1babb8f5ac..1e9fb4de739 100644 --- a/chromium/sandbox/linux/syscall_broker/broker_file_permission.cc +++ b/chromium/sandbox/linux/syscall_broker/broker_file_permission.cc @@ -9,9 +9,10 @@ #include <string.h> #include <unistd.h> +#include <ostream> #include <string> -#include "base/logging.h" +#include "base/check.h" #include "sandbox/linux/syscall_broker/broker_command.h" namespace sandbox { diff --git a/chromium/sandbox/linux/syscall_broker/broker_file_permission_unittest.cc b/chromium/sandbox/linux/syscall_broker/broker_file_permission_unittest.cc index 7cd41b6f03e..6dfd8a0b225 100644 --- a/chromium/sandbox/linux/syscall_broker/broker_file_permission_unittest.cc +++ b/chromium/sandbox/linux/syscall_broker/broker_file_permission_unittest.cc @@ -10,8 +10,9 @@ #include <sys/types.h> #include <unistd.h> -#include "base/logging.h" +#include "base/check.h" #include "base/macros.h" +#include "base/notreached.h" #include "sandbox/linux/tests/test_utils.h" #include "sandbox/linux/tests/unit_tests.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chromium/sandbox/linux/syscall_broker/broker_simple_message.cc b/chromium/sandbox/linux/syscall_broker/broker_simple_message.cc index 970cac3768d..6b447a4ad03 100644 --- a/chromium/sandbox/linux/syscall_broker/broker_simple_message.cc +++ b/chromium/sandbox/linux/syscall_broker/broker_simple_message.cc @@ -5,11 +5,13 @@ #include "sandbox/linux/syscall_broker/broker_simple_message.h" #include <errno.h> +#include <string.h> #include <sys/socket.h> #include <unistd.h> +#include "base/check_op.h" #include "base/files/scoped_file.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/numerics/safe_math.h" #include "base/posix/eintr_wrapper.h" #include "base/posix/unix_domain_socket.h" diff --git a/chromium/sandbox/mac/seatbelt_extension.cc b/chromium/sandbox/mac/seatbelt_extension.cc index 9073364142e..84c7370a3bb 100644 --- a/chromium/sandbox/mac/seatbelt_extension.cc +++ b/chromium/sandbox/mac/seatbelt_extension.cc @@ -4,8 +4,11 @@ #include "sandbox/mac/seatbelt_extension.h" -#include "base/logging.h" +#include <ostream> + +#include "base/check.h" #include "base/memory/ptr_util.h" +#include "base/notreached.h" #include "sandbox/mac/seatbelt_extension_token.h" // libsandbox private API. diff --git a/chromium/sandbox/win/sandbox_poc/sandbox.cc b/chromium/sandbox/win/sandbox_poc/sandbox.cc index aa6cf12e25a..8316ac72030 100644 --- a/chromium/sandbox/win/sandbox_poc/sandbox.cc +++ b/chromium/sandbox/win/sandbox_poc/sandbox.cc @@ -10,7 +10,7 @@ #include <string> -#include "base/logging.h" +#include "base/check.h" #include "sandbox/win/sandbox_poc/main_ui_window.h" #include "sandbox/win/src/sandbox.h" #include "sandbox/win/src/sandbox_factory.h" diff --git a/chromium/sandbox/win/src/acl.cc b/chromium/sandbox/win/src/acl.cc index bd0b1818332..d77fe62ba71 100644 --- a/chromium/sandbox/win/src/acl.cc +++ b/chromium/sandbox/win/src/acl.cc @@ -7,8 +7,9 @@ #include <aclapi.h> #include <sddl.h> -#include "base/logging.h" +#include "base/check.h" #include "base/memory/free_deleter.h" +#include "base/notreached.h" namespace sandbox { diff --git a/chromium/sandbox/win/src/address_sanitizer_test.cc b/chromium/sandbox/win/src/address_sanitizer_test.cc index 380307843cd..69c88296f8d 100644 --- a/chromium/sandbox/win/src/address_sanitizer_test.cc +++ b/chromium/sandbox/win/src/address_sanitizer_test.cc @@ -10,6 +10,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/logging.h" #include "base/path_service.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" diff --git a/chromium/sandbox/win/src/broker_services.cc b/chromium/sandbox/win/src/broker_services.cc index f524145e901..478e327eba3 100644 --- a/chromium/sandbox/win/src/broker_services.cc +++ b/chromium/sandbox/win/src/broker_services.cc @@ -10,9 +10,10 @@ #include <utility> -#include "base/logging.h" +#include "base/check.h" #include "base/macros.h" #include "base/memory/ptr_util.h" +#include "base/notreached.h" #include "base/threading/platform_thread.h" #include "base/win/scoped_handle.h" #include "base/win/scoped_process_information.h" diff --git a/chromium/sandbox/win/src/crosscall_server.cc b/chromium/sandbox/win/src/crosscall_server.cc index f32a1583d3e..1106ade9eb6 100644 --- a/chromium/sandbox/win/src/crosscall_server.cc +++ b/chromium/sandbox/win/src/crosscall_server.cc @@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/logging.h" +#include "base/check.h" #include "base/strings/utf_string_conversions.h" #include "sandbox/win/src/crosscall_client.h" #include "sandbox/win/src/crosscall_params.h" diff --git a/chromium/sandbox/win/src/filesystem_policy.cc b/chromium/sandbox/win/src/filesystem_policy.cc index 5de82b85354..f8cd1647584 100644 --- a/chromium/sandbox/win/src/filesystem_policy.cc +++ b/chromium/sandbox/win/src/filesystem_policy.cc @@ -8,7 +8,7 @@ #include <string> -#include "base/logging.h" +#include "base/notreached.h" #include "base/stl_util.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" diff --git a/chromium/sandbox/win/src/handle_closer.cc b/chromium/sandbox/win/src/handle_closer.cc index 6751151dcbc..20181f74fbc 100644 --- a/chromium/sandbox/win/src/handle_closer.cc +++ b/chromium/sandbox/win/src/handle_closer.cc @@ -8,7 +8,7 @@ #include <memory> -#include "base/logging.h" +#include "base/check_op.h" #include "base/memory/free_deleter.h" #include "base/win/windows_version.h" #include "sandbox/win/src/interceptors.h" diff --git a/chromium/sandbox/win/src/handle_closer_agent.cc b/chromium/sandbox/win/src/handle_closer_agent.cc index 55fe2d4689b..045b17ac397 100644 --- a/chromium/sandbox/win/src/handle_closer_agent.cc +++ b/chromium/sandbox/win/src/handle_closer_agent.cc @@ -7,7 +7,7 @@ #include <limits.h> #include <stddef.h> -#include "base/logging.h" +#include "base/check.h" #include "base/win/static_constants.h" #include "sandbox/win/src/nt_internals.h" #include "sandbox/win/src/win_utils.h" diff --git a/chromium/sandbox/win/src/heap_helper.cc b/chromium/sandbox/win/src/heap_helper.cc index b0f4498feaa..c3b054b5faa 100644 --- a/chromium/sandbox/win/src/heap_helper.cc +++ b/chromium/sandbox/win/src/heap_helper.cc @@ -6,6 +6,7 @@ #include <windows.h> +#include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/win/windows_version.h" diff --git a/chromium/sandbox/win/src/interception.cc b/chromium/sandbox/win/src/interception.cc index 966a2fab535..a42bf60e0f6 100644 --- a/chromium/sandbox/win/src/interception.cc +++ b/chromium/sandbox/win/src/interception.cc @@ -13,7 +13,8 @@ #include <set> #include <string> -#include "base/logging.h" +#include "base/check_op.h" +#include "base/notreached.h" #include "base/scoped_native_library.h" #include "base/win/pe_image.h" #include "base/win/windows_version.h" diff --git a/chromium/sandbox/win/src/policy_broker.cc b/chromium/sandbox/win/src/policy_broker.cc index 406057acbbf..cd7810e956c 100644 --- a/chromium/sandbox/win/src/policy_broker.cc +++ b/chromium/sandbox/win/src/policy_broker.cc @@ -8,7 +8,7 @@ #include <map> -#include "base/logging.h" +#include "base/check.h" #include "base/win/pe_image.h" #include "base/win/windows_version.h" #include "sandbox/win/src/interception.h" diff --git a/chromium/sandbox/win/src/process_mitigations.cc b/chromium/sandbox/win/src/process_mitigations.cc index e4c6838f96f..5e4e7fd604f 100644 --- a/chromium/sandbox/win/src/process_mitigations.cc +++ b/chromium/sandbox/win/src/process_mitigations.cc @@ -10,7 +10,9 @@ #include <algorithm> +#include "base/check_op.h" #include "base/files/file_path.h" +#include "base/notreached.h" #include "base/scoped_native_library.h" #include "base/win/windows_version.h" #include "build/build_config.h" diff --git a/chromium/sandbox/win/src/process_mitigations_unittest.cc b/chromium/sandbox/win/src/process_mitigations_unittest.cc index abfb669bdbe..d632cff572a 100644 --- a/chromium/sandbox/win/src/process_mitigations_unittest.cc +++ b/chromium/sandbox/win/src/process_mitigations_unittest.cc @@ -765,7 +765,9 @@ TEST(ProcessMitigationsTest, CheckWin10MsSignedPolicySuccessDelayed) { // This test validates that setting the MITIGATION_FORCE_MS_SIGNED_BINS // mitigation enables the setting on a process when non-delayed. -TEST(ProcessMitigationsTest, CheckWin10MsSignedPolicySuccess) { + +// Disabled due to crbug.com/1081080 +TEST(ProcessMitigationsTest, DISABLED_CheckWin10MsSignedPolicySuccess) { if (base::win::GetVersion() < base::win::Version::WIN10_TH2) return; @@ -846,7 +848,10 @@ TEST(ProcessMitigationsTest, CheckWin10MsSigned_Failure) { // This test validates that setting the MITIGATION_FORCE_MS_SIGNED_BINS // mitigation allows the loading of an unsigned DLL if intercept in place. -TEST(ProcessMitigationsTest, MAYBE_CheckWin10MsSignedWithIntercept_Success) { + +// Disabled due to crbug.com/1081080. This test was previously disabled on ASAN +// builds, so if re-enabling remember to test that behaviour. +TEST(ProcessMitigationsTest, DISABLED_CheckWin10MsSignedWithIntercept_Success) { if (base::win::GetVersion() < base::win::Version::WIN10_TH2) return; diff --git a/chromium/sandbox/win/src/process_thread_dispatcher.cc b/chromium/sandbox/win/src/process_thread_dispatcher.cc index 7f0b0a6542b..0711b9bb52a 100644 --- a/chromium/sandbox/win/src/process_thread_dispatcher.cc +++ b/chromium/sandbox/win/src/process_thread_dispatcher.cc @@ -7,7 +7,7 @@ #include <stddef.h> #include <stdint.h> -#include "base/logging.h" +#include "base/notreached.h" #include "sandbox/win/src/crosscall_client.h" #include "sandbox/win/src/interception.h" #include "sandbox/win/src/interceptors.h" diff --git a/chromium/sandbox/win/src/registry_policy.cc b/chromium/sandbox/win/src/registry_policy.cc index 1379501fb3a..665aa51e9ec 100644 --- a/chromium/sandbox/win/src/registry_policy.cc +++ b/chromium/sandbox/win/src/registry_policy.cc @@ -8,7 +8,8 @@ #include <string> -#include "base/logging.h" +#include "base/check.h" +#include "base/notreached.h" #include "sandbox/win/src/ipc_tags.h" #include "sandbox/win/src/policy_engine_opcodes.h" #include "sandbox/win/src/policy_params.h" diff --git a/chromium/sandbox/win/src/restricted_token_utils.cc b/chromium/sandbox/win/src/restricted_token_utils.cc index cfe397141ae..fec5c3e0c1b 100644 --- a/chromium/sandbox/win/src/restricted_token_utils.cc +++ b/chromium/sandbox/win/src/restricted_token_utils.cc @@ -10,7 +10,8 @@ #include <memory> #include <vector> -#include "base/logging.h" +#include "base/check.h" +#include "base/notreached.h" #include "base/strings/stringprintf.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" diff --git a/chromium/sandbox/win/src/sandbox_policy_diagnostic.cc b/chromium/sandbox/win/src/sandbox_policy_diagnostic.cc index 2c2c392b535..d0c6c67e3da 100644 --- a/chromium/sandbox/win/src/sandbox_policy_diagnostic.cc +++ b/chromium/sandbox/win/src/sandbox_policy_diagnostic.cc @@ -12,8 +12,8 @@ #include <utility> #include <vector> +#include "base/check.h" #include "base/json/json_string_value_serializer.h" -#include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/strings/stringprintf.h" #include "base/values.h" diff --git a/chromium/sandbox/win/src/sandbox_utils.cc b/chromium/sandbox/win/src/sandbox_utils.cc index f34daa7d3e2..b6ea5ebbe82 100644 --- a/chromium/sandbox/win/src/sandbox_utils.cc +++ b/chromium/sandbox/win/src/sandbox_utils.cc @@ -6,7 +6,7 @@ #include <windows.h> -#include "base/logging.h" +#include "base/check.h" #include "sandbox/win/src/internal_types.h" namespace sandbox { diff --git a/chromium/sandbox/win/src/sharedmem_ipc_client.cc b/chromium/sandbox/win/src/sharedmem_ipc_client.cc index 3ddea76350b..3128bec0964 100644 --- a/chromium/sandbox/win/src/sharedmem_ipc_client.cc +++ b/chromium/sandbox/win/src/sharedmem_ipc_client.cc @@ -7,7 +7,7 @@ #include <stddef.h> #include <string.h> -#include "base/logging.h" +#include "base/check_op.h" #include "sandbox/win/src/crosscall_client.h" #include "sandbox/win/src/crosscall_params.h" #include "sandbox/win/src/sandbox.h" diff --git a/chromium/sandbox/win/src/sharedmem_ipc_server.cc b/chromium/sandbox/win/src/sharedmem_ipc_server.cc index 74e5c171e02..99c3ee4e98a 100644 --- a/chromium/sandbox/win/src/sharedmem_ipc_server.cc +++ b/chromium/sandbox/win/src/sharedmem_ipc_server.cc @@ -8,8 +8,9 @@ #include <stdint.h> #include "base/callback.h" -#include "base/logging.h" +#include "base/check.h" #include "base/memory/ptr_util.h" +#include "base/notreached.h" #include "sandbox/win/src/crosscall_params.h" #include "sandbox/win/src/crosscall_server.h" #include "sandbox/win/src/ipc_args.h" diff --git a/chromium/sandbox/win/src/sid.cc b/chromium/sandbox/win/src/sid.cc index a97ca340ed3..efcb2583dfc 100644 --- a/chromium/sandbox/win/src/sid.cc +++ b/chromium/sandbox/win/src/sid.cc @@ -9,7 +9,7 @@ #include <sddl.h> #include <stdlib.h> -#include "base/logging.h" +#include "base/check.h" #include "base/rand_util.h" #include "base/win/windows_version.h" #include "sandbox/win/src/win_utils.h" diff --git a/chromium/sandbox/win/src/top_level_dispatcher.cc b/chromium/sandbox/win/src/top_level_dispatcher.cc index 8fd610a5af3..e34afa30e29 100644 --- a/chromium/sandbox/win/src/top_level_dispatcher.cc +++ b/chromium/sandbox/win/src/top_level_dispatcher.cc @@ -7,7 +7,8 @@ #include <stdint.h> #include <string.h> -#include "base/logging.h" +#include "base/check.h" +#include "base/notreached.h" #include "sandbox/win/src/crosscall_server.h" #include "sandbox/win/src/filesystem_dispatcher.h" #include "sandbox/win/src/interception.h" diff --git a/chromium/sandbox/win/src/window.cc b/chromium/sandbox/win/src/window.cc index 27645a90068..9e0c256e857 100644 --- a/chromium/sandbox/win/src/window.cc +++ b/chromium/sandbox/win/src/window.cc @@ -8,7 +8,7 @@ #include <memory> -#include "base/logging.h" +#include "base/notreached.h" #include "base/win/win_util.h" #include "sandbox/win/src/acl.h" #include "sandbox/win/src/sid.h" |