Remove/replace unnecessary logging.h includes in .cc files (ppapi)

CHECK, CHECK_EQ etc., and NOTREACHED/NOTIMPLEMENTED have moved to the much smaller headers check.h, check_op.h, and notreached.h, respectively. This CL updates .cc files to use those headers instead when possible, with the purpose of saving compile time. (Split out from https://crrev.com/c/2164525 which also has notes on how the change was generated.) Bug: 1031540 Change-Id: I59620a4eb8a4c2096bcc75f546d03cd7f9455aa7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2165109 Commit-Queue: Bill Budge <bbudge@chromium.org> Auto-Submit: Hans Wennborg <hans@chromium.org> Reviewed-by: Bill Budge <bbudge@chromium.org> Cr-Commit-Position: refs/heads/master@{#762906}
Denger-Network · Apr 27, 2020 · 708fa82 · 708fa82
1 parent 16c6fbb
commit 708fa82
Show file tree

Hide file tree

Showing 61 changed files with 68 additions and 63 deletions.
diff --git a/ppapi/host/ppapi_host.cc b/ppapi/host/ppapi_host.cc
@@ -8,7 +8,8 @@
 
 #include <utility>
 
-#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
@@ -6,7 +6,7 @@
 
 #include <stddef.h>
 
-#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
@@ -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
@@ -7,7 +7,7 @@
 #include <string>
 
 #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
@@ -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
@@ -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
@@ -9,7 +9,7 @@
 #include <memory>
 
 #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
@@ -8,9 +8,10 @@
 
 #include <map>
 
+#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
@@ -7,7 +7,8 @@
 #include <stddef.h>
 
 #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
@@ -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
@@ -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
@@ -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
@@ -6,7 +6,7 @@
 
 #include <stddef.h>
 
-#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
@@ -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
@@ -8,7 +8,6 @@
 
 #include <algorithm>
 
-#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
@@ -7,9 +7,10 @@
 #include <map>
 #include <memory>
 
+#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
@@ -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
@@ -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
@@ -6,12 +6,12 @@
 
 #include <vector>
 
-#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
@@ -8,7 +8,7 @@
 #include <stdlib.h>  // 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
@@ -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
@@ -7,7 +7,7 @@
 #include <stdlib.h>  // 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
@@ -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
@@ -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
@@ -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
@@ -10,7 +10,6 @@
 #include <memory>
 
 #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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,8 @@
 #include <cstring>
 
 #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
@@ -10,7 +10,8 @@
 #include <utility>
 
 #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
@@ -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
@@ -7,7 +7,8 @@
 #include <cstring>
 
 #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
@@ -6,7 +6,7 @@
 
 #include <limits>
 
-#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
@@ -7,8 +7,8 @@
 #include <algorithm>
 
 #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
@@ -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
@@ -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
@@ -6,7 +6,7 @@
 
 #include <stddef.h>
 
-#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
@@ -4,7 +4,9 @@
 
 #include "ppapi/shared_impl/file_system_util.h"
 
-#include "base/logging.h"
+#include <ostream>
+
+#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
@@ -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"