Remove unneeded trace_event.h includes in headers.

Header files that do not use TRACE macros or base::trace_event code do
not need this include. In some cases, the base::trace_event classes can
be forward declared, so the include is also not necessary. Remove the
trace_event.h includes and fix the build by adding missing includes.

Bug: 242216
Change-Id: Iead36b8d2b22aed8eb7bfdcd7c33c4d9971ac440
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2881471
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Owners-Override: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#881309}

android_webview/browser/gfx/begin_frame_source_webview.h

@@ -6,9 +6,11 @@
 #define ANDROID_WEBVIEW_BROWSER_GFX_BEGIN_FRAME_SOURCE_WEBVIEW_H_
 
 #include <memory>
+
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
+#include "base/no_destructor.h"
 #include "components/power_scheduler/power_mode_voter.h"
 #include "components/viz/common/frame_sinks/begin_frame_source.h"
 #include "components/viz/service/frame_sinks/external_begin_frame_source_android.h"

android_webview/browser/tracing/aw_tracing_controller.cc

@@ -9,8 +9,8 @@
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
+#include "base/trace_event/trace_config.h"
 #include "content/public/browser/browser_task_traits.h"
-
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/tracing_controller.h"
 

cc/layers/recording_source.cc

@@ -9,6 +9,7 @@
 #include <algorithm>
 
 #include "base/numerics/safe_math.h"
+#include "base/trace_event/trace_event.h"
 #include "cc/base/region.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/paint/display_item_list.h"

cc/paint/display_item_list.h

@@ -13,7 +13,6 @@
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
-#include "base/trace_event/trace_event.h"
 #include "cc/base/rtree.h"
 #include "cc/paint/discardable_image_map.h"
 #include "cc/paint/image_id.h"

cc/paint/skia_paint_canvas.cc

@@ -5,6 +5,7 @@
 #include "cc/paint/skia_paint_canvas.h"
 
 #include "base/bind.h"
+#include "base/trace_event/trace_event.h"
 #include "cc/paint/display_item_list.h"
 #include "cc/paint/paint_recorder.h"
 #include "cc/paint/scoped_raster_flags.h"

cc/scheduler/begin_frame_tracker.cc

@@ -4,6 +4,7 @@
 
 #include "cc/scheduler/begin_frame_tracker.h"
 
+#include "base/trace_event/trace_event.h"
 #include "third_party/perfetto/protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.pbzero.h"
 
 namespace cc {

cc/scheduler/begin_frame_tracker.h

@@ -8,8 +8,6 @@
 #include <set>
 #include <string>
 
-#include "base/trace_event/trace_event.h"
-#include "base/trace_event/traced_value.h"
 #include "cc/cc_export.h"
 #include "components/viz/common/frame_sinks/begin_frame_args.h"
 

chrome/browser/android/explore_sites/explore_sites_store.cc

@@ -15,6 +15,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "base/trace_event/trace_event.h"
 #include "chrome/browser/android/explore_sites/explore_sites_schema.h"
 #include "components/offline_pages/core/offline_clock.h"
 #include "sql/database.h"

chrome/browser/android/explore_sites/explore_sites_store.h

@@ -13,7 +13,6 @@
 #include "base/sequenced_task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "base/trace_event/trace_event.h"
 #include "components/offline_pages/task/sql_store_base.h"
 
 namespace sql {

chrome/browser/ash/login/ui/login_display_host_webui.h

@@ -18,7 +18,6 @@
 #include "base/observer_list.h"
 #include "base/optional.h"
 #include "base/timer/elapsed_timer.h"
-#include "base/trace_event/trace_event.h"
 #include "chrome/browser/ash/login/existing_user_controller.h"
 #include "chrome/browser/ash/login/oobe_configuration.h"
 #include "chrome/browser/ash/login/ui/login_display.h"

chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc

@@ -11,6 +11,7 @@
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/feature_list.h"
+#include "base/trace_event/trace_event.h"
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
 #include "chrome/browser/ui/ash/keyboard/chrome_keyboard_bounds_observer.h"

chrome/browser/ui/views/frame/browser_view_layout.cc

@@ -9,6 +9,7 @@
 #include "base/observer_list.h"
 #include "base/stl_util.h"
 #include "base/trace_event/common/trace_event_common.h"
+#include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"

chrome/browser/ui/views/frame/glass_browser_frame_view.cc

@@ -11,6 +11,7 @@
 #include <utility>
 
 #include "base/trace_event/common/trace_event_common.h"
+#include "base/trace_event/trace_event.h"
 #include "base/win/windows_version.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/app/chrome_dll_resource.h"

chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc

@@ -24,6 +24,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
 #include "base/task/thread_pool.h"
+#include "base/trace_event/trace_event.h"
 #include "base/values.h"
 #include "chrome/browser/ash/arc/tracing/arc_graphics_jank_detector.h"
 #include "chrome/browser/ash/arc/tracing/arc_system_model.h"

chrome/test/base/tracing.h

@@ -7,9 +7,15 @@
 
 #include <string>
 
+#include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
-#include "base/trace_event/trace_config.h"
+
+namespace base {
+namespace trace_event {
+class TraceConfig;
+}
+}  // namespace base
 
 namespace tracing {
 
@@ -39,7 +45,7 @@ bool BeginTracing(const std::string& category_patterns) WARN_UNUSED_RESULT;
 bool BeginTracingWithTraceConfig(
     const base::trace_event::TraceConfig& trace_config) WARN_UNUSED_RESULT;
 
-typedef base::OnceCallback<void()> StartTracingDoneCallback;
+using StartTracingDoneCallback = base::OnceClosure;
 bool BeginTracingWithTraceConfig(
     const base::trace_event::TraceConfig& trace_config,
     StartTracingDoneCallback start_tracing_done_callback) WARN_UNUSED_RESULT;

components/exo/keyboard.cc

@@ -13,6 +13,7 @@
 #include "base/bind.h"
 #include "base/containers/contains.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "base/trace_event/trace_event.h"
 #include "components/exo/input_trace.h"
 #include "components/exo/keyboard_delegate.h"
 #include "components/exo/keyboard_device_configuration_delegate.h"

components/exo/pointer.cc

@@ -10,6 +10,7 @@
 #include "base/feature_list.h"
 #include "base/optional.h"
 #include "base/threading/sequenced_task_runner_handle.h"
+#include "base/trace_event/trace_event.h"
 #include "build/chromeos_buildflags.h"
 #include "components/exo/input_trace.h"
 #include "components/exo/pointer_constraint_delegate.h"

components/exo/shell_surface.cc

@@ -14,6 +14,7 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/trace_event/trace_event.h"
 #include "chromeos/ui/base/window_state_type.h"
 #include "components/exo/shell_surface_util.h"
 #include "ui/aura/client/aura_constants.h"

components/exo/touch.cc

@@ -4,6 +4,7 @@
 
 #include "components/exo/touch.h"
 
+#include "base/trace_event/trace_event.h"
 #include "components/exo/input_trace.h"
 #include "components/exo/seat.h"
 #include "components/exo/shell_surface_util.h"

components/feedback/content/content_tracing_manager.cc

@@ -10,6 +10,7 @@
 #include "base/memory/ref_counted_memory.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "base/trace_event/trace_config.h"
 #include "components/feedback/feedback_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/tracing_controller.h"

components/offline_pages/core/model/get_pages_task.cc

@@ -13,6 +13,7 @@
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "components/offline_pages/core/offline_page_client_policy.h"
 #include "components/offline_pages/core/offline_page_item_utils.h"
 #include "components/offline_pages/core/offline_store_utils.h"

components/offline_pages/core/offline_page_metadata_store.cc

@@ -14,6 +14,7 @@
 #include "base/sequenced_task_runner.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/trace_event/trace_event.h"
 #include "components/offline_pages/core/client_namespace_constants.h"
 #include "components/offline_pages/core/offline_page_item.h"
 #include "components/offline_pages/core/offline_store_types.h"

components/offline_pages/core/offline_page_metadata_store.h

@@ -13,7 +13,6 @@
 #include "base/memory/weak_ptr.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "base/trace_event/trace_event.h"
 #include "components/offline_pages/core/offline_page_item.h"
 #include "components/offline_pages/core/offline_store_types.h"
 #include "components/offline_pages/task/sql_store_base.h"

components/offline_pages/core/prefetch/store/prefetch_store.cc

@@ -15,6 +15,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "base/trace_event/trace_event.h"
 #include "components/offline_pages/core/offline_store_types.h"
 #include "components/offline_pages/core/prefetch/store/prefetch_store_schema.h"
 #include "sql/database.h"

components/offline_pages/core/prefetch/store/prefetch_store.h

@@ -13,7 +13,6 @@
 #include "base/sequenced_task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "base/trace_event/trace_event.h"
 #include "components/offline_pages/task/sql_store_base.h"
 
 namespace sql {

components/offline_pages/task/sql_store_base.h

@@ -16,7 +16,6 @@
 #include "base/memory/weak_ptr.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "base/trace_event/trace_event.h"
 #include "sql/database.h"
 
 namespace offline_pages {

components/power_scheduler/power_mode_arbiter.cc

@@ -15,6 +15,7 @@
 #include "base/task/thread_pool.h"
 #include "base/task_runner.h"
 #include "base/time/time.h"
+#include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_log.h"
 #include "components/power_scheduler/power_mode.h"
 #include "components/power_scheduler/power_mode_voter.h"

components/power_scheduler/traced_power_mode.h

@@ -7,7 +7,6 @@
 
 #include <atomic>
 
-#include "base/trace_event/trace_event.h"
 #include "components/power_scheduler/power_mode.h"
 
 namespace power_scheduler {

components/viz/common/frame_sinks/begin_frame_source.h

@@ -14,7 +14,6 @@
 #include "base/check.h"
 #include "base/containers/flat_set.h"
 #include "base/macros.h"
-#include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "components/viz/common/frame_sinks/begin_frame_args.h"
 #include "components/viz/common/frame_sinks/delay_based_time_source.h"

components/viz/service/surfaces/surface_manager.cc

@@ -15,6 +15,7 @@
 #include "base/logging.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/time/default_tick_clock.h"
+#include "base/trace_event/trace_event.h"
 #include "components/viz/common/surfaces/parent_local_surface_id_allocator.h"
 #include "components/viz/common/surfaces/surface_info.h"
 #include "components/viz/service/surfaces/surface.h"

components/viz/service/surfaces/surface_manager.h

@@ -21,7 +21,6 @@
 #include "base/optional.h"
 #include "base/threading/thread_checker.h"
 #include "base/timer/timer.h"
-#include "base/trace_event/trace_event.h"
 #include "components/viz/common/surfaces/frame_sink_id.h"
 #include "components/viz/common/surfaces/surface_id.h"
 #include "components/viz/service/surfaces/surface_observer.h"

content/browser/devtools/protocol/tracing_handler.h

@@ -17,7 +17,6 @@
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "base/trace_event/trace_event.h"
 #include "content/browser/devtools/protocol/devtools_domain_handler.h"
 #include "content/browser/devtools/protocol/tracing.h"
 #include "content/common/content_export.h"
@@ -26,6 +25,9 @@
 #include "third_party/perfetto/include/perfetto/tracing/tracing.h"
 
 namespace base {
+namespace trace_event {
+class TraceConfig;
+}
 class RepeatingTimer;
 }
 

content/browser/tracing/background_tracing_agent_client_impl.h

@@ -8,7 +8,6 @@
 #include <string>
 
 #include "base/macros.h"
-#include "base/trace_event/trace_event.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/tracing/public/mojom/background_tracing_agent.mojom.h"
 

content/child/blink_platform_impl.h

@@ -11,7 +11,6 @@
 #include "base/compiler_specific.h"
 #include "base/single_thread_task_runner.h"
 #include "base/timer/timer.h"
-#include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "components/webcrypto/webcrypto_impl.h"
 #include "content/common/content_export.h"

content/public/browser/tracing_controller.h

@@ -14,10 +14,16 @@
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/task/task_traits.h"
-#include "base/trace_event/trace_event.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/tracing_delegate.h"
 
+namespace base {
+namespace trace_event {
+class TraceConfig;
+}
+class FilePath;
+}  // namespace base
+
 namespace content {
 
 class TracingController;

gpu/command_buffer/service/service_discardable_manager.h

@@ -9,6 +9,7 @@
 
 #include "base/containers/mru_cache.h"
 #include "base/memory/memory_pressure_listener.h"
+#include "base/trace_event/memory_dump_provider.h"
 #include "gpu/command_buffer/common/discardable_handle.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/gpu_gles2_export.h"

third_party/blink/renderer/platform/graphics/begin_frame_provider.cc

@@ -9,6 +9,7 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
+#include "base/trace_event/trace_event.h"
 #include "components/power_scheduler/power_mode.h"
 #include "components/power_scheduler/power_mode_arbiter.h"
 #include "components/power_scheduler/power_mode_voter.h"

third_party/blink/renderer/platform/graphics/canvas_resource_dispatcher.cc

@@ -8,6 +8,7 @@
 
 #include "base/debug/stack_trace.h"
 #include "base/single_thread_task_runner.h"
+#include "base/trace_event/trace_event.h"
 #include "components/power_scheduler/power_mode.h"
 #include "components/power_scheduler/power_mode_arbiter.h"
 #include "components/power_scheduler/power_mode_voter.h"

third_party/blink/renderer/platform/scheduler/common/single_thread_idle_task_runner.h

@@ -5,6 +5,9 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_COMMON_SINGLE_THREAD_IDLE_TASK_RUNNER_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_COMMON_SINGLE_THREAD_IDLE_TASK_RUNNER_H_
 
+#include <map>
+#include <utility>
+
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/macros.h"
@@ -12,7 +15,6 @@
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/time/time.h"
-#include "base/trace_event/trace_event.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
 
 namespace base {

third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl.h

@@ -17,7 +17,6 @@
 #include "base/optional.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task/sequence_manager/task_queue.h"
-#include "base/trace_event/trace_event.h"
 #include "components/power_scheduler/power_mode_voter.h"
 #include "net/base/request_priority.h"
 #include "services/metrics/public/cpp/ukm_source_id.h"

third_party/blink/renderer/platform/scheduler/main_thread/render_widget_signals.h

@@ -7,8 +7,6 @@
 
 #include <memory>
 
-#include "base/trace_event/trace_event.h"
-#include "base/trace_event/traced_value.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
 #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
 #include "third_party/perfetto/include/perfetto/tracing/traced_value_forward.h"

third_party/blink/renderer/platform/scheduler/main_thread/user_model.cc

@@ -3,6 +3,8 @@
 // found in the LICENSE file.
 
 #include "third_party/blink/renderer/platform/scheduler/main_thread/user_model.h"
+
+#include "base/trace_event/trace_event.h"
 #include "third_party/perfetto/include/perfetto/tracing/traced_value.h"
 
 namespace blink {

third_party/blink/renderer/platform/scheduler/main_thread/user_model.h

@@ -6,8 +6,6 @@
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_MAIN_THREAD_USER_MODEL_H_
 
 #include "base/macros.h"
-#include "base/trace_event/trace_event.h"
-#include "base/trace_event/traced_value.h"
 #include "third_party/blink/public/common/input/web_input_event.h"
 #include "third_party/blink/public/platform/scheduler/web_thread_scheduler.h"
 #include "third_party/blink/renderer/platform/platform_export.h"