diff --git a/ppapi/host/ppapi_host.cc b/ppapi/host/ppapi_host.cc index 3f80e73535c8b4..6adf843b860aa7 100644 --- a/ppapi/host/ppapi_host.cc +++ b/ppapi/host/ppapi_host.cc @@ -8,7 +8,8 @@ #include -#include "base/logging.h" +#include "base/check.h" +#include "base/notreached.h" #include "ppapi/c/pp_errors.h" #include "ppapi/host/host_factory.h" #include "ppapi/host/host_message_context.h" diff --git a/ppapi/host/resource_host.cc b/ppapi/host/resource_host.cc index af161631aa9ac6..30e88572e5b2b7 100644 --- a/ppapi/host/resource_host.cc +++ b/ppapi/host/resource_host.cc @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/check.h" #include "ppapi/c/pp_errors.h" #include "ppapi/host/ppapi_host.h" #include "ppapi/host/resource_message_filter.h" diff --git a/ppapi/nacl_irt/plugin_startup.cc b/ppapi/nacl_irt/plugin_startup.cc index 599cca5277f348..054502ec47eeb4 100644 --- a/ppapi/nacl_irt/plugin_startup.cc +++ b/ppapi/nacl_irt/plugin_startup.cc @@ -5,9 +5,9 @@ #include "ppapi/nacl_irt/plugin_startup.h" #include "base/bind.h" +#include "base/check.h" #include "base/file_descriptor_posix.h" #include "base/location.h" -#include "base/logging.h" #include "base/message_loop/message_pump_type.h" #include "base/single_thread_task_runner.h" #include "base/synchronization/waitable_event.h" diff --git a/ppapi/proxy/audio_input_resource.cc b/ppapi/proxy/audio_input_resource.cc index 96d6cff99014ea..6f84d001fcdfdc 100644 --- a/ppapi/proxy/audio_input_resource.cc +++ b/ppapi/proxy/audio_input_resource.cc @@ -7,7 +7,7 @@ #include #include "base/bind.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/numerics/safe_conversions.h" #include "ipc/ipc_platform_file.h" #include "media/base/audio_bus.h" diff --git a/ppapi/proxy/audio_output_resource.cc b/ppapi/proxy/audio_output_resource.cc index bd11c7cfdf3045..188541360f7a6d 100644 --- a/ppapi/proxy/audio_output_resource.cc +++ b/ppapi/proxy/audio_output_resource.cc @@ -5,7 +5,7 @@ #include "ppapi/proxy/audio_output_resource.h" #include "base/bind.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/numerics/safe_conversions.h" #include "ipc/ipc_platform_file.h" #include "media/base/audio_bus.h" diff --git a/ppapi/proxy/camera_capabilities_resource.cc b/ppapi/proxy/camera_capabilities_resource.cc index 1236aa35a66cfa..57c0c28b567756 100644 --- a/ppapi/proxy/camera_capabilities_resource.cc +++ b/ppapi/proxy/camera_capabilities_resource.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "ppapi/proxy/camera_capabilities_resource.h" diff --git a/ppapi/proxy/device_enumeration_resource_helper.cc b/ppapi/proxy/device_enumeration_resource_helper.cc index 3ff87b6ce6ef20..0c84af1b029f67 100644 --- a/ppapi/proxy/device_enumeration_resource_helper.cc +++ b/ppapi/proxy/device_enumeration_resource_helper.cc @@ -9,7 +9,7 @@ #include #include "base/bind.h" -#include "base/logging.h" +#include "base/check.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_macros.h" #include "ppapi/c/pp_array_output.h" diff --git a/ppapi/proxy/dispatcher.cc b/ppapi/proxy/dispatcher.cc index 3c038a3906d836..c97401026a11d8 100644 --- a/ppapi/proxy/dispatcher.cc +++ b/ppapi/proxy/dispatcher.cc @@ -8,9 +8,10 @@ #include +#include "base/check.h" #include "base/compiler_specific.h" -#include "base/logging.h" #include "base/memory/singleton.h" +#include "base/notreached.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/var_serialization_rules.h" diff --git a/ppapi/proxy/host_dispatcher.cc b/ppapi/proxy/host_dispatcher.cc index a3e04a51ed5991..f2d86787f52567 100644 --- a/ppapi/proxy/host_dispatcher.cc +++ b/ppapi/proxy/host_dispatcher.cc @@ -7,7 +7,8 @@ #include #include "base/bind.h" -#include "base/logging.h" +#include "base/check.h" +#include "base/notreached.h" #include "base/trace_event/trace_event.h" #include "ppapi/c/ppb_var.h" #include "ppapi/c/private/ppb_proxy_private.h" diff --git a/ppapi/proxy/host_resolver_resource.cc b/ppapi/proxy/host_resolver_resource.cc index a2898566f7f952..5dad79e7e6a54e 100644 --- a/ppapi/proxy/host_resolver_resource.cc +++ b/ppapi/proxy/host_resolver_resource.cc @@ -4,7 +4,7 @@ #include "ppapi/proxy/host_resolver_resource.h" -#include "base/logging.h" +#include "base/notreached.h" #include "ppapi/c/private/ppb_host_resolver_private.h" #include "ppapi/proxy/net_address_resource.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/proxy/interface_proxy.cc b/ppapi/proxy/interface_proxy.cc index 2de4803394415c..935a33092e2bd9 100644 --- a/ppapi/proxy/interface_proxy.cc +++ b/ppapi/proxy/interface_proxy.cc @@ -4,7 +4,6 @@ #include "ppapi/proxy/interface_proxy.h" -#include "base/logging.h" #include "ppapi/proxy/dispatcher.h" namespace ppapi { diff --git a/ppapi/proxy/isolated_file_system_private_resource.cc b/ppapi/proxy/isolated_file_system_private_resource.cc index 756bdb7bd6c1a5..0e8da4a47fa734 100644 --- a/ppapi/proxy/isolated_file_system_private_resource.cc +++ b/ppapi/proxy/isolated_file_system_private_resource.cc @@ -5,7 +5,6 @@ #include "ppapi/proxy/isolated_file_system_private_resource.h" #include "base/bind.h" -#include "base/logging.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/pp_file_info.h" #include "ppapi/proxy/file_system_resource.h" diff --git a/ppapi/proxy/media_stream_track_resource_base.cc b/ppapi/proxy/media_stream_track_resource_base.cc index 411e19f3e3603e..c827660216b4d3 100644 --- a/ppapi/proxy/media_stream_track_resource_base.cc +++ b/ppapi/proxy/media_stream_track_resource_base.cc @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/check_op.h" #include "ppapi/proxy/ppapi_messages.h" namespace ppapi { diff --git a/ppapi/proxy/media_stream_video_track_resource.cc b/ppapi/proxy/media_stream_video_track_resource.cc index fe986616d16dbb..4bc36da4f67d59 100644 --- a/ppapi/proxy/media_stream_video_track_resource.cc +++ b/ppapi/proxy/media_stream_video_track_resource.cc @@ -5,7 +5,7 @@ #include "ppapi/proxy/media_stream_video_track_resource.h" #include "base/bind.h" -#include "base/logging.h" +#include "base/check_op.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/video_frame_resource.h" #include "ppapi/shared_impl/media_stream_buffer.h" diff --git a/ppapi/proxy/network_list_resource.cc b/ppapi/proxy/network_list_resource.cc index f4ec7ed4059f53..0cba5393c53da0 100644 --- a/ppapi/proxy/network_list_resource.cc +++ b/ppapi/proxy/network_list_resource.cc @@ -8,7 +8,6 @@ #include -#include "base/logging.h" #include "ppapi/c/pp_errors.h" #include "ppapi/shared_impl/array_writer.h" #include "ppapi/shared_impl/var.h" diff --git a/ppapi/proxy/plugin_dispatcher.cc b/ppapi/proxy/plugin_dispatcher.cc index cdac74034e7394..e92fec2eec54f6 100644 --- a/ppapi/proxy/plugin_dispatcher.cc +++ b/ppapi/proxy/plugin_dispatcher.cc @@ -7,9 +7,10 @@ #include #include +#include "base/check.h" #include "base/compiler_specific.h" -#include "base/logging.h" #include "base/metrics/histogram_macros.h" +#include "base/notreached.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" #include "ipc/ipc_message.h" diff --git a/ppapi/proxy/plugin_resource_tracker.cc b/ppapi/proxy/plugin_resource_tracker.cc index 7cf7caf6546c08..297625fec5a1b0 100644 --- a/ppapi/proxy/plugin_resource_tracker.cc +++ b/ppapi/proxy/plugin_resource_tracker.cc @@ -4,7 +4,7 @@ #include "ppapi/proxy/plugin_resource_tracker.h" -#include "base/logging.h" +#include "base/check.h" #include "base/memory/singleton.h" #include "ppapi/proxy/plugin_dispatcher.h" #include "ppapi/proxy/plugin_globals.h" diff --git a/ppapi/proxy/plugin_var_serialization_rules.cc b/ppapi/proxy/plugin_var_serialization_rules.cc index f772554b4ac552..3b32e943ffd16a 100644 --- a/ppapi/proxy/plugin_var_serialization_rules.cc +++ b/ppapi/proxy/plugin_var_serialization_rules.cc @@ -4,7 +4,6 @@ #include "ppapi/proxy/plugin_var_serialization_rules.h" -#include "base/logging.h" #include "ppapi/proxy/plugin_dispatcher.h" #include "ppapi/proxy/plugin_globals.h" #include "ppapi/proxy/plugin_resource_tracker.h" diff --git a/ppapi/proxy/ppb_buffer_proxy.cc b/ppapi/proxy/ppb_buffer_proxy.cc index d2fc43922ad835..1d91bd1a4f137d 100644 --- a/ppapi/proxy/ppb_buffer_proxy.cc +++ b/ppapi/proxy/ppb_buffer_proxy.cc @@ -6,12 +6,12 @@ #include -#include "base/logging.h" +#include "base/notreached.h" #include "build/build_config.h" +#include "ppapi/c/dev/ppb_buffer_dev.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/pp_resource.h" -#include "ppapi/c/dev/ppb_buffer_dev.h" #include "ppapi/proxy/host_dispatcher.h" #include "ppapi/proxy/plugin_dispatcher.h" #include "ppapi/proxy/ppapi_messages.h" diff --git a/ppapi/proxy/ppb_core_proxy.cc b/ppapi/proxy/ppb_core_proxy.cc index bd13402fb6a11b..4d5e88d2b77c91 100644 --- a/ppapi/proxy/ppb_core_proxy.cc +++ b/ppapi/proxy/ppb_core_proxy.cc @@ -8,7 +8,7 @@ #include // For malloc #include "base/bind.h" -#include "base/logging.h" +#include "base/check.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" diff --git a/ppapi/proxy/ppb_message_loop_proxy.cc b/ppapi/proxy/ppb_message_loop_proxy.cc index 6c792ddcf35050..db43f7689e4a05 100644 --- a/ppapi/proxy/ppb_message_loop_proxy.cc +++ b/ppapi/proxy/ppb_message_loop_proxy.cc @@ -10,8 +10,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/check.h" #include "base/compiler_specific.h" -#include "base/logging.h" #include "base/threading/thread_task_runner_handle.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_message_loop.h" diff --git a/ppapi/proxy/ppb_var_deprecated_proxy.cc b/ppapi/proxy/ppb_var_deprecated_proxy.cc index b5f98a0f0d8c1a..44f06e6aed6ee7 100644 --- a/ppapi/proxy/ppb_var_deprecated_proxy.cc +++ b/ppapi/proxy/ppb_var_deprecated_proxy.cc @@ -7,7 +7,7 @@ #include // For malloc #include "base/bind.h" -#include "base/logging.h" +#include "base/notreached.h" #include "ppapi/c/dev/ppb_var_deprecated.h" #include "ppapi/c/pp_var.h" #include "ppapi/c/ppb_core.h" diff --git a/ppapi/proxy/ppb_video_decoder_proxy.cc b/ppapi/proxy/ppb_video_decoder_proxy.cc index 1ec9605a86058b..7d1d003db169c1 100644 --- a/ppapi/proxy/ppb_video_decoder_proxy.cc +++ b/ppapi/proxy/ppb_video_decoder_proxy.cc @@ -4,7 +4,7 @@ #include "ppapi/proxy/ppb_video_decoder_proxy.h" -#include "base/logging.h" +#include "base/check.h" #include "base/macros.h" #include "base/numerics/safe_conversions.h" #include "gpu/command_buffer/client/gles2_implementation.h" diff --git a/ppapi/proxy/proxy_array_output.cc b/ppapi/proxy/proxy_array_output.cc index e550b1ceacf7ad..ba430d775c233e 100644 --- a/ppapi/proxy/proxy_array_output.cc +++ b/ppapi/proxy/proxy_array_output.cc @@ -4,7 +4,6 @@ #include "ppapi/proxy/proxy_array_output.h" -#include "base/logging.h" namespace ppapi { namespace proxy { diff --git a/ppapi/proxy/proxy_object_var.cc b/ppapi/proxy/proxy_object_var.cc index 507d20621147fb..3e3f63bf208536 100644 --- a/ppapi/proxy/proxy_object_var.cc +++ b/ppapi/proxy/proxy_object_var.cc @@ -4,7 +4,7 @@ #include "ppapi/proxy/proxy_object_var.h" -#include "base/logging.h" +#include "base/check.h" #include "ppapi/c/pp_var.h" using ppapi::proxy::PluginDispatcher; diff --git a/ppapi/proxy/raw_var_data_unittest.cc b/ppapi/proxy/raw_var_data_unittest.cc index d822b14512c8cd..19065b5aaae629 100644 --- a/ppapi/proxy/raw_var_data_unittest.cc +++ b/ppapi/proxy/raw_var_data_unittest.cc @@ -10,7 +10,6 @@ #include #include "base/bind.h" -#include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/test/task_environment.h" #include "base/values.h" diff --git a/ppapi/proxy/resource_message_params.cc b/ppapi/proxy/resource_message_params.cc index 82e0d35bc5f882..97ed1e3275de4b 100644 --- a/ppapi/proxy/resource_message_params.cc +++ b/ppapi/proxy/resource_message_params.cc @@ -4,7 +4,7 @@ #include "ppapi/proxy/resource_message_params.h" -#include "base/logging.h" +#include "base/check.h" #include "base/memory/read_only_shared_memory_region.h" #include "ppapi/c/pp_errors.h" #include "ppapi/proxy/ppapi_messages.h" diff --git a/ppapi/proxy/resource_reply_thread_registrar.cc b/ppapi/proxy/resource_reply_thread_registrar.cc index 4921b7bcc58e08..e2b85a8d9005a9 100644 --- a/ppapi/proxy/resource_reply_thread_registrar.cc +++ b/ppapi/proxy/resource_reply_thread_registrar.cc @@ -4,7 +4,7 @@ #include "ppapi/proxy/resource_reply_thread_registrar.h" -#include "base/logging.h" +#include "base/check.h" #include "base/single_thread_task_runner.h" #include "ipc/ipc_message.h" #include "ppapi/proxy/resource_message_params.h" diff --git a/ppapi/proxy/serialized_handle.cc b/ppapi/proxy/serialized_handle.cc index 0bb6c87be8aad4..b394aa42523f79 100644 --- a/ppapi/proxy/serialized_handle.cc +++ b/ppapi/proxy/serialized_handle.cc @@ -4,8 +4,9 @@ #include "ppapi/proxy/serialized_handle.h" +#include "base/check_op.h" #include "base/files/file.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/pickle.h" #include "build/build_config.h" #include "ipc/ipc_platform_file.h" diff --git a/ppapi/proxy/serialized_var.cc b/ppapi/proxy/serialized_var.cc index e6ba5ead78ced0..a28836ef91196b 100644 --- a/ppapi/proxy/serialized_var.cc +++ b/ppapi/proxy/serialized_var.cc @@ -5,7 +5,8 @@ #include "ppapi/proxy/serialized_var.h" #include "base/bind.h" -#include "base/logging.h" +#include "base/check.h" +#include "base/notreached.h" #include "ipc/ipc_message_utils.h" #include "ppapi/c/pp_instance.h" #include "ppapi/proxy/dispatcher.h" diff --git a/ppapi/proxy/tcp_socket_resource.cc b/ppapi/proxy/tcp_socket_resource.cc index 5466d0d23ab541..fb4ed0e795134a 100644 --- a/ppapi/proxy/tcp_socket_resource.cc +++ b/ppapi/proxy/tcp_socket_resource.cc @@ -4,7 +4,7 @@ #include "ppapi/proxy/tcp_socket_resource.h" -#include "base/logging.h" +#include "base/check_op.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/shared_impl/ppb_tcp_socket_shared.h" #include "ppapi/thunk/enter.h" diff --git a/ppapi/proxy/tcp_socket_resource_base.cc b/ppapi/proxy/tcp_socket_resource_base.cc index 7809f1d8dd5f33..2297a6e49bbebc 100644 --- a/ppapi/proxy/tcp_socket_resource_base.cc +++ b/ppapi/proxy/tcp_socket_resource_base.cc @@ -7,7 +7,8 @@ #include #include "base/bind.h" -#include "base/logging.h" +#include "base/check_op.h" +#include "base/notreached.h" #include "base/stl_util.h" #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_errors.h" diff --git a/ppapi/proxy/udp_socket_filter.cc b/ppapi/proxy/udp_socket_filter.cc index 3611c3250be9db..c5efbe3d079589 100644 --- a/ppapi/proxy/udp_socket_filter.cc +++ b/ppapi/proxy/udp_socket_filter.cc @@ -10,7 +10,8 @@ #include #include "base/bind.h" -#include "base/logging.h" +#include "base/check_op.h" +#include "base/notreached.h" #include "ppapi/c/pp_errors.h" #include "ppapi/proxy/error_conversion.h" #include "ppapi/proxy/plugin_globals.h" diff --git a/ppapi/proxy/udp_socket_private_resource.cc b/ppapi/proxy/udp_socket_private_resource.cc index ec6c2a4a4514b8..13e940d17c9fb2 100644 --- a/ppapi/proxy/udp_socket_private_resource.cc +++ b/ppapi/proxy/udp_socket_private_resource.cc @@ -4,7 +4,7 @@ #include "ppapi/proxy/udp_socket_private_resource.h" -#include "base/logging.h" +#include "base/notreached.h" #include "ppapi/c/ppb_udp_socket.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/proxy/udp_socket_resource_base.cc b/ppapi/proxy/udp_socket_resource_base.cc index ef96b6df5246bd..48f04c2764327e 100644 --- a/ppapi/proxy/udp_socket_resource_base.cc +++ b/ppapi/proxy/udp_socket_resource_base.cc @@ -7,7 +7,8 @@ #include #include "base/bind.h" -#include "base/logging.h" +#include "base/check.h" +#include "base/notreached.h" #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_errors.h" #include "ppapi/proxy/error_conversion.h" diff --git a/ppapi/shared_impl/array_var.cc b/ppapi/shared_impl/array_var.cc index 6207379f5da0e2..bd784bfca7c898 100644 --- a/ppapi/shared_impl/array_var.cc +++ b/ppapi/shared_impl/array_var.cc @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/check.h" #include "base/memory/ref_counted.h" #include "ppapi/shared_impl/ppapi_globals.h" #include "ppapi/shared_impl/var_tracker.h" diff --git a/ppapi/shared_impl/callback_tracker.cc b/ppapi/shared_impl/callback_tracker.cc index c90dd3c7575472..bf27e20bb033f1 100644 --- a/ppapi/shared_impl/callback_tracker.cc +++ b/ppapi/shared_impl/callback_tracker.cc @@ -7,8 +7,8 @@ #include #include "base/bind.h" +#include "base/check_op.h" #include "base/compiler_specific.h" -#include "base/logging.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/shared_impl/proxy_lock.h" #include "ppapi/shared_impl/tracked_callback.h" diff --git a/ppapi/shared_impl/file_growth.cc b/ppapi/shared_impl/file_growth.cc index 79f6b5cded246d..a60c97481e0076 100644 --- a/ppapi/shared_impl/file_growth.cc +++ b/ppapi/shared_impl/file_growth.cc @@ -4,7 +4,7 @@ #include "ppapi/shared_impl/file_growth.h" -#include "base/logging.h" +#include "base/check_op.h" namespace ppapi { diff --git a/ppapi/shared_impl/file_io_state_manager.cc b/ppapi/shared_impl/file_io_state_manager.cc index c705f84da3a31f..f1f8dec5a34666 100644 --- a/ppapi/shared_impl/file_io_state_manager.cc +++ b/ppapi/shared_impl/file_io_state_manager.cc @@ -4,7 +4,7 @@ #include "ppapi/shared_impl/file_io_state_manager.h" -#include "base/logging.h" +#include "base/check_op.h" #include "ppapi/c/pp_errors.h" namespace ppapi { diff --git a/ppapi/shared_impl/file_ref_create_info.cc b/ppapi/shared_impl/file_ref_create_info.cc index f4b78c1a163b87..95059c9864115d 100644 --- a/ppapi/shared_impl/file_ref_create_info.cc +++ b/ppapi/shared_impl/file_ref_create_info.cc @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/check.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "ppapi/c/pp_file_info.h" diff --git a/ppapi/shared_impl/file_system_util.cc b/ppapi/shared_impl/file_system_util.cc index a8a5263331916f..b2f46aef6638d1 100644 --- a/ppapi/shared_impl/file_system_util.cc +++ b/ppapi/shared_impl/file_system_util.cc @@ -4,7 +4,9 @@ #include "ppapi/shared_impl/file_system_util.h" -#include "base/logging.h" +#include + +#include "base/notreached.h" #include "ppapi/shared_impl/ppapi_constants.h" namespace ppapi { diff --git a/ppapi/shared_impl/file_type_conversion.cc b/ppapi/shared_impl/file_type_conversion.cc index 8d7eaf3ca4a2e8..4ca461854aee5e 100644 --- a/ppapi/shared_impl/file_type_conversion.cc +++ b/ppapi/shared_impl/file_type_conversion.cc @@ -4,7 +4,7 @@ #include "ppapi/shared_impl/file_type_conversion.h" -#include "base/logging.h" +#include "base/check_op.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_file_io.h" #include "ppapi/shared_impl/time_conversion.h" diff --git a/ppapi/shared_impl/media_stream_buffer_manager.cc b/ppapi/shared_impl/media_stream_buffer_manager.cc index 09ab0b356fadfd..07834d25002e11 100644 --- a/ppapi/shared_impl/media_stream_buffer_manager.cc +++ b/ppapi/shared_impl/media_stream_buffer_manager.cc @@ -8,7 +8,7 @@ #include -#include "base/logging.h" +#include "base/check_op.h" #include "ppapi/c/pp_errors.h" #include "ppapi/shared_impl/media_stream_buffer.h" diff --git a/ppapi/shared_impl/media_stream_video_track_shared.cc b/ppapi/shared_impl/media_stream_video_track_shared.cc index 0ca894af62c219..28e92850eeb6fb 100644 --- a/ppapi/shared_impl/media_stream_video_track_shared.cc +++ b/ppapi/shared_impl/media_stream_video_track_shared.cc @@ -4,7 +4,6 @@ #include "ppapi/shared_impl/media_stream_video_track_shared.h" -#include "base/logging.h" namespace { diff --git a/ppapi/shared_impl/ppapi_globals.cc b/ppapi/shared_impl/ppapi_globals.cc index 5a93ad61d63699..012303361ec5f6 100644 --- a/ppapi/shared_impl/ppapi_globals.cc +++ b/ppapi/shared_impl/ppapi_globals.cc @@ -4,8 +4,8 @@ #include "ppapi/shared_impl/ppapi_globals.h" +#include "base/check.h" #include "base/lazy_instance.h" // For testing purposes only. -#include "base/logging.h" #include "base/single_thread_task_runner.h" #include "base/threading/thread_local.h" // For testing purposes only. #include "base/threading/thread_task_runner_handle.h" diff --git a/ppapi/shared_impl/ppapi_permissions.cc b/ppapi/shared_impl/ppapi_permissions.cc index cf0e90c60a73a5..ec223030dde8c4 100644 --- a/ppapi/shared_impl/ppapi_permissions.cc +++ b/ppapi/shared_impl/ppapi_permissions.cc @@ -4,8 +4,8 @@ #include "ppapi/shared_impl/ppapi_permissions.h" +#include "base/check.h" #include "base/command_line.h" -#include "base/logging.h" #include "build/build_config.h" #include "ppapi/shared_impl/ppapi_switches.h" diff --git a/ppapi/shared_impl/ppb_image_data_shared.cc b/ppapi/shared_impl/ppb_image_data_shared.cc index 2dfbabdb96a084..0bfd7407493fe4 100644 --- a/ppapi/shared_impl/ppb_image_data_shared.cc +++ b/ppapi/shared_impl/ppb_image_data_shared.cc @@ -4,7 +4,7 @@ #include "ppapi/shared_impl/ppb_image_data_shared.h" -#include "base/logging.h" +#include "base/notreached.h" #include "build/build_config.h" #if !defined(OS_NACL) && !defined(NACL_WIN64) diff --git a/ppapi/shared_impl/ppb_opengles2_shared.cc b/ppapi/shared_impl/ppb_opengles2_shared.cc index 020b45c4e25a45..a1529470c936bc 100644 --- a/ppapi/shared_impl/ppb_opengles2_shared.cc +++ b/ppapi/shared_impl/ppb_opengles2_shared.cc @@ -10,7 +10,7 @@ #include "ppapi/shared_impl/ppb_opengles2_shared.h" -#include "base/logging.h" +#include "base/check.h" #include "gpu/command_buffer/client/gles2_implementation.h" #include "ppapi/shared_impl/ppb_graphics_3d_shared.h" #include "ppapi/thunk/enter.h" diff --git a/ppapi/shared_impl/ppb_tcp_socket_shared.cc b/ppapi/shared_impl/ppb_tcp_socket_shared.cc index d4588cd5165165..a1afc187aa562a 100644 --- a/ppapi/shared_impl/ppb_tcp_socket_shared.cc +++ b/ppapi/shared_impl/ppb_tcp_socket_shared.cc @@ -4,7 +4,8 @@ #include "ppapi/shared_impl/ppb_tcp_socket_shared.h" -#include "base/logging.h" +#include "base/check.h" +#include "base/notreached.h" namespace ppapi { diff --git a/ppapi/shared_impl/ppb_video_decoder_shared.cc b/ppapi/shared_impl/ppb_video_decoder_shared.cc index a8863b82752f18..16fcd87e330656 100644 --- a/ppapi/shared_impl/ppb_video_decoder_shared.cc +++ b/ppapi/shared_impl/ppb_video_decoder_shared.cc @@ -4,7 +4,7 @@ #include "ppapi/shared_impl/ppb_video_decoder_shared.h" -#include "base/logging.h" +#include "base/check.h" #include "gpu/command_buffer/client/gles2_implementation.h" #include "ppapi/c/pp_errors.h" #include "ppapi/shared_impl/ppb_graphics_3d_shared.h" diff --git a/ppapi/shared_impl/private/net_address_private_impl.cc b/ppapi/shared_impl/private/net_address_private_impl.cc index d86460764a30a3..8868ead002256a 100644 --- a/ppapi/shared_impl/private/net_address_private_impl.cc +++ b/ppapi/shared_impl/private/net_address_private_impl.cc @@ -9,7 +9,7 @@ #include -#include "base/logging.h" +#include "base/check.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "ppapi/c/pp_var.h" diff --git a/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.cc b/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.cc index 7f392d50f7185c..984a29ccf1ce49 100644 --- a/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.cc +++ b/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.cc @@ -6,7 +6,7 @@ #include -#include "base/logging.h" +#include "base/check.h" #include "ppapi/shared_impl/ppapi_globals.h" #include "ppapi/shared_impl/var.h" #include "ppapi/shared_impl/var_tracker.h" diff --git a/ppapi/shared_impl/proxy_lock_unittest.cc b/ppapi/shared_impl/proxy_lock_unittest.cc index 2eeef53ad86269..9abcf0fa6d7271 100644 --- a/ppapi/shared_impl/proxy_lock_unittest.cc +++ b/ppapi/shared_impl/proxy_lock_unittest.cc @@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/logging.h" #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/test/task_environment.h" diff --git a/ppapi/shared_impl/resource.cc b/ppapi/shared_impl/resource.cc index e7ed70820c1add..5f94e0e5bd4cfc 100644 --- a/ppapi/shared_impl/resource.cc +++ b/ppapi/shared_impl/resource.cc @@ -4,9 +4,10 @@ #include "ppapi/shared_impl/resource.h" -#include "base/logging.h" -#include "ppapi/shared_impl/resource_tracker.h" +#include "base/check.h" +#include "base/notreached.h" #include "ppapi/shared_impl/ppapi_globals.h" +#include "ppapi/shared_impl/resource_tracker.h" namespace ppapi { diff --git a/ppapi/shared_impl/thread_aware_callback.cc b/ppapi/shared_impl/thread_aware_callback.cc index 6019c7b23eee55..9b3b0cfbe825c7 100644 --- a/ppapi/shared_impl/thread_aware_callback.cc +++ b/ppapi/shared_impl/thread_aware_callback.cc @@ -5,7 +5,7 @@ #include "ppapi/shared_impl/thread_aware_callback.h" #include "base/callback.h" -#include "base/logging.h" +#include "base/check.h" #include "ppapi/shared_impl/ppapi_globals.h" #include "ppapi/shared_impl/ppb_message_loop_shared.h" diff --git a/ppapi/shared_impl/thread_aware_callback_unittest.cc b/ppapi/shared_impl/thread_aware_callback_unittest.cc index c38caeb321e8fd..48d1ae46172e8b 100644 --- a/ppapi/shared_impl/thread_aware_callback_unittest.cc +++ b/ppapi/shared_impl/thread_aware_callback_unittest.cc @@ -8,9 +8,9 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/check.h" #include "base/compiler_specific.h" #include "base/location.h" -#include "base/logging.h" #include "base/single_thread_task_runner.h" #include "ppapi/c/pp_errors.h" #include "ppapi/proxy/ppapi_proxy_test.h" diff --git a/ppapi/shared_impl/tracked_callback.cc b/ppapi/shared_impl/tracked_callback.cc index 2bc06428170233..ecae60824fd676 100644 --- a/ppapi/shared_impl/tracked_callback.cc +++ b/ppapi/shared_impl/tracked_callback.cc @@ -5,9 +5,10 @@ #include "ppapi/shared_impl/tracked_callback.h" #include "base/bind.h" +#include "base/check.h" #include "base/compiler_specific.h" #include "base/location.h" -#include "base/logging.h" +#include "base/notreached.h" #include "base/single_thread_task_runner.h" #include "base/synchronization/lock.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/ppapi/shared_impl/var.cc b/ppapi/shared_impl/var.cc index f3acb34dfb1001..dce091ef1b9bf6 100644 --- a/ppapi/shared_impl/var.cc +++ b/ppapi/shared_impl/var.cc @@ -8,7 +8,7 @@ #include -#include "base/logging.h" +#include "base/check.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" diff --git a/ppapi/shared_impl/vpn_provider_util.cc b/ppapi/shared_impl/vpn_provider_util.cc index 72a02c91967d3e..6833a17f9cfc85 100644 --- a/ppapi/shared_impl/vpn_provider_util.cc +++ b/ppapi/shared_impl/vpn_provider_util.cc @@ -4,7 +4,8 @@ #include "ppapi/shared_impl/vpn_provider_util.h" -#include "base/logging.h" +#include "base/check.h" +#include "base/notreached.h" namespace ppapi { diff --git a/ppapi/thunk/ppb_flash_thunk.cc b/ppapi/thunk/ppb_flash_thunk.cc index 0f23551e680804..9a504483d5be75 100644 --- a/ppapi/thunk/ppb_flash_thunk.cc +++ b/ppapi/thunk/ppb_flash_thunk.cc @@ -4,7 +4,7 @@ #include -#include "base/logging.h" +#include "base/notreached.h" #include "ppapi/c/pp_array_output.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_flash.h" diff --git a/ppapi/thunk/ppb_pdf_thunk.cc b/ppapi/thunk/ppb_pdf_thunk.cc index efb08e486c3125..227cc7d941803e 100644 --- a/ppapi/thunk/ppb_pdf_thunk.cc +++ b/ppapi/thunk/ppb_pdf_thunk.cc @@ -4,7 +4,6 @@ #include -#include "base/logging.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/private/ppb_pdf.h" #include "ppapi/thunk/enter.h"