diff options
52 files changed, 53 insertions, 53 deletions
diff --git a/content/browser/android/composited_touch_handle_drawable.cc b/content/browser/android/composited_touch_handle_drawable.cc index 769f48c..f480f55 100644 --- a/content/browser/android/composited_touch_handle_drawable.cc +++ b/content/browser/android/composited_touch_handle_drawable.cc @@ -4,9 +4,9 @@ #include "content/browser/android/composited_touch_handle_drawable.h" -#include "base/debug/trace_event.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/trace_event/trace_event.h" #include "cc/layers/ui_resource_layer.h" #include "jni/HandleViewResources_jni.h" #include "ui/gfx/android/java_bitmap.h" diff --git a/content/browser/android/tracing_controller_android.cc b/content/browser/android/tracing_controller_android.cc index 4c40bb7..bd11672 100644 --- a/content/browser/android/tracing_controller_android.cc +++ b/content/browser/android/tracing_controller_android.cc @@ -6,9 +6,9 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/debug/trace_event.h" #include "base/json/json_writer.h" #include "base/logging.h" +#include "base/trace_event/trace_event.h" #include "content/public/browser/tracing_controller.h" #include "jni/TracingControllerAndroid_jni.h" diff --git a/content/browser/browser_main.cc b/content/browser/browser_main.cc index 640ccee..7bf79a3 100644 --- a/content/browser/browser_main.cc +++ b/content/browser/browser_main.cc @@ -4,7 +4,7 @@ #include "content/browser/browser_main.h" -#include "base/debug/trace_event.h" +#include "base/trace_event/trace_event.h" #include "content/common/content_constants_internal.h" #include "content/public/browser/browser_main_runner.h" diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 05cd9e9..6b4d5d2 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/debug/trace_event.h" #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "base/metrics/field_trial.h" @@ -21,6 +20,7 @@ #include "base/thread_task_runner_handle.h" #include "base/threading/thread_restrictions.h" #include "base/timer/hi_res_timer_manager.h" +#include "base/trace_event/trace_event.h" #include "content/browser/browser_thread_impl.h" #include "content/browser/device_sensors/device_inertial_sensor_service.h" #include "content/browser/download/save_file_manager.h" diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc index d5ed975..b12ccd6 100644 --- a/content/browser/browser_main_runner.cc +++ b/content/browser/browser_main_runner.cc @@ -7,10 +7,10 @@ #include "base/base_switches.h" #include "base/command_line.h" #include "base/debug/leak_annotations.h" -#include "base/debug/trace_event.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/metrics/statistics_recorder.h" +#include "base/trace_event/trace_event.h" #include "content/browser/browser_main_loop.h" #include "content/browser/browser_shutdown_profile_dumper.h" #include "content/browser/notification_service_impl.h" diff --git a/content/browser/browser_shutdown_profile_dumper.cc b/content/browser/browser_shutdown_profile_dumper.cc index 0197093..30bddd0 100644 --- a/content/browser/browser_shutdown_profile_dumper.cc +++ b/content/browser/browser_shutdown_profile_dumper.cc @@ -6,14 +6,14 @@ #include "base/base_switches.h" #include "base/command_line.h" -#include "base/debug/trace_event.h" -#include "base/debug/trace_event_impl.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/logging.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" +#include "base/trace_event/trace_event.h" +#include "base/trace_event/trace_event_impl.h" #include "content/public/common/content_switches.h" namespace content { diff --git a/content/browser/compositor/onscreen_display_client.cc b/content/browser/compositor/onscreen_display_client.cc index d5806fdf..c077293 100644 --- a/content/browser/compositor/onscreen_display_client.cc +++ b/content/browser/compositor/onscreen_display_client.cc @@ -4,7 +4,7 @@ #include "content/browser/compositor/onscreen_display_client.h" -#include "base/debug/trace_event.h" +#include "base/trace_event/trace_event.h" #include "cc/output/output_surface.h" #include "cc/surfaces/surface_factory.h" #include "cc/surfaces/surface_manager.h" diff --git a/content/browser/devtools/protocol/tracing_handler.cc b/content/browser/devtools/protocol/tracing_handler.cc index 74446ca..6cb81a3 100644 --- a/content/browser/devtools/protocol/tracing_handler.cc +++ b/content/browser/devtools/protocol/tracing_handler.cc @@ -7,11 +7,11 @@ #include <cmath> #include "base/bind.h" -#include "base/debug/trace_event_impl.h" #include "base/strings/string_split.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" #include "base/timer/timer.h" +#include "base/trace_event/trace_event_impl.h" namespace content { namespace devtools { diff --git a/content/browser/devtools/protocol/tracing_handler.h b/content/browser/devtools/protocol/tracing_handler.h index 9a7efb3..7b41ce6 100644 --- a/content/browser/devtools/protocol/tracing_handler.h +++ b/content/browser/devtools/protocol/tracing_handler.h @@ -8,8 +8,8 @@ #include <set> #include <string> -#include "base/debug/trace_event.h" #include "base/memory/weak_ptr.h" +#include "base/trace_event/trace_event.h" #include "content/browser/devtools/protocol/devtools_protocol_handler.h" #include "content/public/browser/tracing_controller.h" diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc index 3168892..979b26c 100644 --- a/content/browser/frame_host/navigation_controller_impl.cc +++ b/content/browser/frame_host/navigation_controller_impl.cc @@ -6,13 +6,13 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/debug/trace_event.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/strings/string_number_conversions.h" // Temporary #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" +#include "base/trace_event/trace_event.h" #include "cc/base/switches.h" #include "content/browser/browser_url_handler_impl.h" #include "content/browser/dom_storage/dom_storage_context_wrapper.h" diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc index d7e1556..d70e8bb 100644 --- a/content/browser/frame_host/render_frame_host_manager.cc +++ b/content/browser/frame_host/render_frame_host_manager.cc @@ -7,9 +7,9 @@ #include <utility> #include "base/command_line.h" -#include "base/debug/trace_event.h" #include "base/logging.h" #include "base/stl_util.h" +#include "base/trace_event/trace_event.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/browser/devtools/render_view_devtools_agent_host.h" #include "content/browser/frame_host/cross_site_transferring_request.h" diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_android.cc b/content/browser/gamepad/gamepad_platform_data_fetcher_android.cc index a8673fa..8668dbc 100644 --- a/content/browser/gamepad/gamepad_platform_data_fetcher_android.cc +++ b/content/browser/gamepad/gamepad_platform_data_fetcher_android.cc @@ -7,10 +7,10 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/debug/trace_event.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "base/trace_event/trace_event.h" #include "jni/GamepadList_jni.h" diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc b/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc index d922636..26f2913 100644 --- a/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc +++ b/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc @@ -11,13 +11,13 @@ #include <sys/types.h> #include <unistd.h> -#include "base/debug/trace_event.h" #include "base/message_loop/message_loop.h" #include "base/posix/eintr_wrapper.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "base/trace_event/trace_event.h" #include "content/browser/udev_linux.h" #include "device/udev_linux/scoped_udev.h" diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_win.cc b/content/browser/gamepad/gamepad_platform_data_fetcher_win.cc index ef444dc..fb6c126 100644 --- a/content/browser/gamepad/gamepad_platform_data_fetcher_win.cc +++ b/content/browser/gamepad/gamepad_platform_data_fetcher_win.cc @@ -4,8 +4,8 @@ #include "content/browser/gamepad/gamepad_platform_data_fetcher_win.h" -#include "base/debug/trace_event.h" #include "base/strings/stringprintf.h" +#include "base/trace_event/trace_event.h" #include "base/win/windows_version.h" #include "content/common/gamepad_hardware_buffer.h" #include "content/common/gamepad_messages.h" diff --git a/content/browser/gamepad/raw_input_data_fetcher_win.cc b/content/browser/gamepad/raw_input_data_fetcher_win.cc index 0574821..e5340bf 100644 --- a/content/browser/gamepad/raw_input_data_fetcher_win.cc +++ b/content/browser/gamepad/raw_input_data_fetcher_win.cc @@ -4,7 +4,7 @@ #include "content/browser/gamepad/raw_input_data_fetcher_win.h" -#include "base/debug/trace_event.h" +#include "base/trace_event/trace_event.h" #include "content/common/gamepad_hardware_buffer.h" #include "content/common/gamepad_messages.h" diff --git a/content/browser/gpu/browser_gpu_channel_host_factory.cc b/content/browser/gpu/browser_gpu_channel_host_factory.cc index 851e9e5..034f05f 100644 --- a/content/browser/gpu/browser_gpu_channel_host_factory.cc +++ b/content/browser/gpu/browser_gpu_channel_host_factory.cc @@ -7,9 +7,9 @@ #include <set> #include "base/bind.h" -#include "base/debug/trace_event.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread_restrictions.h" +#include "base/trace_event/trace_event.h" #include "base/tracked_objects.h" #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h" #include "content/browser/gpu/gpu_data_manager_impl.h" diff --git a/content/browser/gpu/browser_gpu_memory_buffer_manager.cc b/content/browser/gpu/browser_gpu_memory_buffer_manager.cc index 2cfb9c8..57c65fb 100644 --- a/content/browser/gpu/browser_gpu_memory_buffer_manager.cc +++ b/content/browser/gpu/browser_gpu_memory_buffer_manager.cc @@ -6,10 +6,10 @@ #include "base/atomic_sequence_num.h" #include "base/bind.h" -#include "base/debug/trace_event.h" #include "base/lazy_instance.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread_restrictions.h" +#include "base/trace_event/trace_event.h" #include "content/common/gpu/client/gpu_memory_buffer_factory_host.h" #include "content/common/gpu/client/gpu_memory_buffer_impl.h" #include "content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h" diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc index 1b484ce..76bfd57 100644 --- a/content/browser/gpu/gpu_data_manager_impl_private.cc +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc @@ -7,13 +7,13 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/debug/trace_event.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/metrics/sparse_histogram.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/sys_info.h" +#include "base/trace_event/trace_event.h" #include "base/version.h" #include "cc/base/switches.h" #include "content/browser/gpu/gpu_process_host.h" diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc index a234562..8255b9f 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -10,12 +10,12 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/command_line.h" -#include "base/debug/trace_event.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram.h" #include "base/sha1.h" #include "base/threading/thread.h" +#include "base/trace_event/trace_event.h" #include "content/browser/browser_child_process_host_impl.h" #include "content/browser/gpu/compositor_util.h" #include "content/browser/gpu/gpu_data_manager_impl.h" diff --git a/content/browser/gpu/gpu_process_host_ui_shim.cc b/content/browser/gpu/gpu_process_host_ui_shim.cc index 5faeca2..abc5398 100644 --- a/content/browser/gpu/gpu_process_host_ui_shim.cc +++ b/content/browser/gpu/gpu_process_host_ui_shim.cc @@ -8,10 +8,10 @@ #include "base/bind.h" #include "base/callback_helpers.h" -#include "base/debug/trace_event.h" #include "base/id_map.h" #include "base/lazy_instance.h" #include "base/strings/string_number_conversions.h" +#include "base/trace_event/trace_event.h" #include "content/browser/compositor/gpu_process_transport_factory.h" #include "content/browser/gpu/compositor_util.h" #include "content/browser/gpu/gpu_data_manager_impl.h" diff --git a/content/browser/indexed_db/indexed_db_tracing.h b/content/browser/indexed_db/indexed_db_tracing.h index b7a5a41..489f157 100644 --- a/content/browser/indexed_db/indexed_db_tracing.h +++ b/content/browser/indexed_db/indexed_db_tracing.h @@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_TRACING_H_ #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_TRACING_H_ -#include "base/debug/trace_event.h" +#include "base/trace_event/trace_event.h" #define IDB_TRACE(a) TRACE_EVENT0("IndexedDB", (a)); #define IDB_TRACE1(a, arg1_name, arg1_val) \ TRACE_EVENT1("IndexedDB", (a), (arg1_name), (arg1_val)); diff --git a/content/browser/media/capture/content_video_capture_device_core.cc b/content/browser/media/capture/content_video_capture_device_core.cc index 643caf9..3680c85 100644 --- a/content/browser/media/capture/content_video_capture_device_core.cc +++ b/content/browser/media/capture/content_video_capture_device_core.cc @@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/callback_forward.h" #include "base/callback_helpers.h" -#include "base/debug/trace_event.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" @@ -21,6 +20,7 @@ #include "base/threading/thread.h" #include "base/threading/thread_checker.h" #include "base/time/time.h" +#include "base/trace_event/trace_event.h" #include "content/public/browser/browser_thread.h" #include "media/base/bind_to_current_loop.h" #include "media/base/video_frame.h" diff --git a/content/browser/media/capture/video_capture_oracle.cc b/content/browser/media/capture/video_capture_oracle.cc index d7b2233..c42b456 100644 --- a/content/browser/media/capture/video_capture_oracle.cc +++ b/content/browser/media/capture/video_capture_oracle.cc @@ -6,9 +6,9 @@ #include <algorithm> -#include "base/debug/trace_event.h" #include "base/format_macros.h" #include "base/strings/stringprintf.h" +#include "base/trace_event/trace_event.h" namespace content { diff --git a/content/browser/media/midi_host.cc b/content/browser/media/midi_host.cc index 2fc0147..37e5411 100644 --- a/content/browser/media/midi_host.cc +++ b/content/browser/media/midi_host.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/debug/trace_event.h" #include "base/process/process.h" +#include "base/trace_event/trace_event.h" #include "content/browser/browser_main_loop.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/browser/media/media_internals.h" diff --git a/content/browser/media/webrtc_getusermedia_browsertest.cc b/content/browser/media/webrtc_getusermedia_browsertest.cc index d0baf4f..c2c934e 100644 --- a/content/browser/media/webrtc_getusermedia_browsertest.cc +++ b/content/browser/media/webrtc_getusermedia_browsertest.cc @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/debug/trace_event_impl.h" #include "base/json/json_reader.h" #include "base/strings/stringprintf.h" #include "base/test/trace_event_analyzer.h" +#include "base/trace_event/trace_event_impl.h" #include "base/values.h" #include "content/browser/media/webrtc_internals.h" #include "content/browser/web_contents/web_contents_impl.h" diff --git a/content/browser/renderer_host/compositor_resize_lock_aura.cc b/content/browser/renderer_host/compositor_resize_lock_aura.cc index 9d5b7d8..2d36b2f 100644 --- a/content/browser/renderer_host/compositor_resize_lock_aura.cc +++ b/content/browser/renderer_host/compositor_resize_lock_aura.cc @@ -4,7 +4,7 @@ #include "content/browser/renderer_host/compositor_resize_lock_aura.h" -#include "base/debug/trace_event.h" +#include "base/trace_event/trace_event.h" #include "content/public/browser/browser_thread.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tree_host.h" diff --git a/content/browser/renderer_host/display_link_mac.cc b/content/browser/renderer_host/display_link_mac.cc index b4592a9..fbbcf37 100644 --- a/content/browser/renderer_host/display_link_mac.cc +++ b/content/browser/renderer_host/display_link_mac.cc @@ -4,8 +4,8 @@ #include "content/browser/renderer_host/display_link_mac.h" -#include "base/debug/trace_event.h" #include "base/logging.h" +#include "base/trace_event/trace_event.h" namespace base { diff --git a/content/browser/renderer_host/input/gesture_event_queue.cc b/content/browser/renderer_host/input/gesture_event_queue.cc index a831344..a13fde1 100644 --- a/content/browser/renderer_host/input/gesture_event_queue.cc +++ b/content/browser/renderer_host/input/gesture_event_queue.cc @@ -4,7 +4,7 @@ #include "content/browser/renderer_host/input/gesture_event_queue.h" -#include "base/debug/trace_event.h" +#include "base/trace_event/trace_event.h" #include "content/browser/renderer_host/input/touchpad_tap_suppression_controller.h" #include "content/browser/renderer_host/input/touchscreen_tap_suppression_controller.h" diff --git a/content/browser/renderer_host/input/synthetic_gesture_controller.cc b/content/browser/renderer_host/input/synthetic_gesture_controller.cc index 6e5e20f..536426b 100644 --- a/content/browser/renderer_host/input/synthetic_gesture_controller.cc +++ b/content/browser/renderer_host/input/synthetic_gesture_controller.cc @@ -4,7 +4,7 @@ #include "content/browser/renderer_host/input/synthetic_gesture_controller.h" -#include "base/debug/trace_event.h" +#include "base/trace_event/trace_event.h" #include "content/browser/renderer_host/input/synthetic_gesture_target.h" #include "content/common/input/synthetic_smooth_scroll_gesture_params.h" #include "content/common/input_messages.h" diff --git a/content/browser/renderer_host/input/tap_suppression_controller.cc b/content/browser/renderer_host/input/tap_suppression_controller.cc index c6b17e6..78b3a07 100644 --- a/content/browser/renderer_host/input/tap_suppression_controller.cc +++ b/content/browser/renderer_host/input/tap_suppression_controller.cc @@ -4,8 +4,8 @@ #include "content/browser/renderer_host/input/tap_suppression_controller.h" -#include "base/debug/trace_event.h" #include "base/logging.h" +#include "base/trace_event/trace_event.h" #include "content/browser/renderer_host/input/tap_suppression_controller_client.h" namespace content { diff --git a/content/browser/renderer_host/input/timeout_monitor.cc b/content/browser/renderer_host/input/timeout_monitor.cc index 930c7af..f46464a 100644 --- a/content/browser/renderer_host/input/timeout_monitor.cc +++ b/content/browser/renderer_host/input/timeout_monitor.cc @@ -4,7 +4,7 @@ #include "content/browser/renderer_host/input/timeout_monitor.h" -#include "base/debug/trace_event.h" +#include "base/trace_event/trace_event.h" using base::TimeDelta; using base::TimeTicks; diff --git a/content/browser/renderer_host/input/touch_event_queue.cc b/content/browser/renderer_host/input/touch_event_queue.cc index c22cbc5..75c8144 100644 --- a/content/browser/renderer_host/input/touch_event_queue.cc +++ b/content/browser/renderer_host/input/touch_event_queue.cc @@ -5,8 +5,8 @@ #include "content/browser/renderer_host/input/touch_event_queue.h" #include "base/auto_reset.h" -#include "base/debug/trace_event.h" #include "base/stl_util.h" +#include "base/trace_event/trace_event.h" #include "content/browser/renderer_host/input/timeout_monitor.h" #include "content/common/input/web_touch_event_traits.h" #include "ui/gfx/geometry/point_f.h" diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc index 5673805..f35ea575 100644 --- a/content/browser/renderer_host/media/video_capture_controller.cc +++ b/content/browser/renderer_host/media/video_capture_controller.cc @@ -8,11 +8,11 @@ #include <set> #include "base/bind.h" -#include "base/debug/trace_event.h" #include "base/metrics/histogram.h" #include "base/metrics/sparse_histogram.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" +#include "base/trace_event/trace_event.h" #include "content/browser/renderer_host/media/media_stream_manager.h" #include "content/browser/renderer_host/media/video_capture_manager.h" #include "content/common/gpu/client/gl_helper.h" diff --git a/content/browser/renderer_host/p2p/socket_host_udp.cc b/content/browser/renderer_host/p2p/socket_host_udp.cc index 7c56a7f..fd09f7d 100644 --- a/content/browser/renderer_host/p2p/socket_host_udp.cc +++ b/content/browser/renderer_host/p2p/socket_host_udp.cc @@ -5,11 +5,11 @@ #include "content/browser/renderer_host/p2p/socket_host_udp.h" #include "base/bind.h" -#include "base/debug/trace_event.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" +#include "base/trace_event/trace_event.h" #include "content/browser/renderer_host/p2p/socket_host_throttler.h" #include "content/common/p2p_messages.h" #include "content/public/browser/content_browser_client.h" diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 4a0e262..46d81c3 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -16,7 +16,6 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/command_line.h" -#include "base/debug/trace_event.h" #include "base/files/file.h" #include "base/lazy_instance.h" #include "base/logging.h" @@ -31,6 +30,7 @@ #include "base/sys_info.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" +#include "base/trace_event/trace_event.h" #include "base/tracked_objects.h" #include "cc/base/switches.h" #include "content/browser/appcache/appcache_dispatcher_host.h" diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc index 94eb29a..88e923b6 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -11,7 +11,6 @@ #include "base/callback.h" #include "base/command_line.h" -#include "base/debug/trace_event.h" #include "base/i18n/rtl.h" #include "base/json/json_reader.h" #include "base/message_loop/message_loop.h" @@ -22,6 +21,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/sys_info.h" #include "base/time/time.h" +#include "base/trace_event/trace_event.h" #include "base/values.h" #include "cc/base/switches.h" #include "content/browser/child_process_security_policy_impl.h" diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 4b90f73..47bc6f4 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/containers/hash_tables.h" -#include "base/debug/trace_event.h" #include "base/i18n/rtl.h" #include "base/lazy_instance.h" #include "base/message_loop/message_loop.h" @@ -21,6 +20,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" +#include "base/trace_event/trace_event.h" #include "cc/base/switches.h" #include "cc/output/compositor_frame.h" #include "cc/output/compositor_frame_ack.h" diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index 27cb755..2752bbd 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -9,10 +9,10 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/command_line.h" -#include "base/debug/trace_event.h" #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_number_conversions.h" +#include "base/trace_event/trace_event.h" #include "cc/layers/layer.h" #include "cc/output/copy_output_request.h" #include "cc/output/copy_output_result.h" diff --git a/content/browser/service_worker/embedded_worker_instance.cc b/content/browser/service_worker/embedded_worker_instance.cc index 5f72a41..09e8096 100644 --- a/content/browser/service_worker/embedded_worker_instance.cc +++ b/content/browser/service_worker/embedded_worker_instance.cc @@ -8,8 +8,8 @@ #include <utility> #include "base/bind_helpers.h" -#include "base/debug/trace_event.h" #include "base/threading/non_thread_safe.h" +#include "base/trace_event/trace_event.h" #include "content/browser/devtools/service_worker_devtools_manager.h" #include "content/browser/service_worker/embedded_worker_registry.h" #include "content/browser/service_worker/service_worker_context_core.h" diff --git a/content/browser/service_worker/service_worker_cache_listener.cc b/content/browser/service_worker/service_worker_cache_listener.cc index 15eed95..eff77b5 100644 --- a/content/browser/service_worker/service_worker_cache_listener.cc +++ b/content/browser/service_worker/service_worker_cache_listener.cc @@ -5,8 +5,8 @@ #include "content/browser/service_worker/service_worker_cache_listener.h" #include "base/bind.h" -#include "base/debug/trace_event.h" #include "base/strings/utf_string_conversions.h" +#include "base/trace_event/trace_event.h" #include "content/browser/service_worker/service_worker_cache.h" #include "content/browser/service_worker/service_worker_cache_storage_manager.h" #include "content/browser/service_worker/service_worker_context_core.h" diff --git a/content/browser/service_worker/service_worker_controllee_request_handler.cc b/content/browser/service_worker/service_worker_controllee_request_handler.cc index db83628..b56dd3f 100644 --- a/content/browser/service_worker/service_worker_controllee_request_handler.cc +++ b/content/browser/service_worker/service_worker_controllee_request_handler.cc @@ -4,7 +4,7 @@ #include "content/browser/service_worker/service_worker_controllee_request_handler.h" -#include "base/debug/trace_event.h" +#include "base/trace_event/trace_event.h" #include "content/browser/service_worker/service_worker_context_core.h" #include "content/browser/service_worker/service_worker_metrics.h" #include "content/browser/service_worker/service_worker_provider_host.h" diff --git a/content/browser/service_worker/service_worker_dispatcher_host.cc b/content/browser/service_worker/service_worker_dispatcher_host.cc index 4236b0c..9986999 100644 --- a/content/browser/service_worker/service_worker_dispatcher_host.cc +++ b/content/browser/service_worker/service_worker_dispatcher_host.cc @@ -4,9 +4,9 @@ #include "content/browser/service_worker/service_worker_dispatcher_host.h" -#include "base/debug/trace_event.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" +#include "base/trace_event/trace_event.h" #include "content/browser/message_port_message_filter.h" #include "content/browser/message_port_service.h" #include "content/browser/service_worker/embedded_worker_registry.h" diff --git a/content/browser/service_worker/service_worker_fetch_dispatcher.cc b/content/browser/service_worker/service_worker_fetch_dispatcher.cc index 7ed3051..14e0cee 100644 --- a/content/browser/service_worker/service_worker_fetch_dispatcher.cc +++ b/content/browser/service_worker/service_worker_fetch_dispatcher.cc @@ -5,7 +5,7 @@ #include "content/browser/service_worker/service_worker_fetch_dispatcher.h" #include "base/bind.h" -#include "base/debug/trace_event.h" +#include "base/trace_event/trace_event.h" #include "content/browser/service_worker/service_worker_version.h" namespace content { diff --git a/content/browser/service_worker/service_worker_read_from_cache_job.cc b/content/browser/service_worker/service_worker_read_from_cache_job.cc index 2c23de6..84b7988 100644 --- a/content/browser/service_worker/service_worker_read_from_cache_job.cc +++ b/content/browser/service_worker/service_worker_read_from_cache_job.cc @@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "base/debug/trace_event.h" #include "base/profiler/scoped_tracker.h" +#include "base/trace_event/trace_event.h" #include "content/browser/service_worker/service_worker_context_core.h" #include "content/browser/service_worker/service_worker_disk_cache.h" #include "content/browser/service_worker/service_worker_metrics.h" diff --git a/content/browser/service_worker/service_worker_storage.cc b/content/browser/service_worker/service_worker_storage.cc index 7c998c6..85b4e03 100644 --- a/content/browser/service_worker/service_worker_storage.cc +++ b/content/browser/service_worker/service_worker_storage.cc @@ -5,12 +5,12 @@ #include "content/browser/service_worker/service_worker_storage.h" #include "base/bind_helpers.h" -#include "base/debug/trace_event.h" #include "base/files/file_util.h" #include "base/message_loop/message_loop.h" #include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" #include "base/task_runner_util.h" +#include "base/trace_event/trace_event.h" #include "content/browser/service_worker/service_worker_context_core.h" #include "content/browser/service_worker/service_worker_disk_cache.h" #include "content/browser/service_worker/service_worker_info.h" diff --git a/content/browser/service_worker/service_worker_write_to_cache_job.cc b/content/browser/service_worker/service_worker_write_to_cache_job.cc index f47a9ad..a6a8cfb 100644 --- a/content/browser/service_worker/service_worker_write_to_cache_job.cc +++ b/content/browser/service_worker/service_worker_write_to_cache_job.cc @@ -4,10 +4,10 @@ #include "content/browser/service_worker/service_worker_write_to_cache_job.h" -#include "base/debug/trace_event.h" #include "base/profiler/scoped_tracker.h" #include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h" +#include "base/trace_event/trace_event.h" #include "content/browser/service_worker/service_worker_context_core.h" #include "content/browser/service_worker/service_worker_disk_cache.h" #include "content/browser/service_worker/service_worker_metrics.h" diff --git a/content/browser/tracing/etw_system_event_consumer_win.cc b/content/browser/tracing/etw_system_event_consumer_win.cc index fc3522f..881c451 100644 --- a/content/browser/tracing/etw_system_event_consumer_win.cc +++ b/content/browser/tracing/etw_system_event_consumer_win.cc @@ -5,12 +5,12 @@ #include "content/browser/tracing/etw_system_event_consumer_win.h" #include "base/base64.h" -#include "base/debug/trace_event_impl.h" #include "base/json/json_string_value_serializer.h" #include "base/lazy_instance.h" #include "base/memory/singleton.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" +#include "base/trace_event/trace_event_impl.h" #include "content/public/browser/browser_thread.h" namespace content { diff --git a/content/browser/tracing/trace_message_filter.h b/content/browser/tracing/trace_message_filter.h index aba8796..6c03599 100644 --- a/content/browser/tracing/trace_message_filter.h +++ b/content/browser/tracing/trace_message_filter.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/debug/trace_event.h" +#include "base/trace_event/trace_event.h" #include "content/public/browser/browser_message_filter.h" namespace content { diff --git a/content/browser/tracing/tracing_controller_impl.cc b/content/browser/tracing/tracing_controller_impl.cc index 22de3f2..6717ee9 100644 --- a/content/browser/tracing/tracing_controller_impl.cc +++ b/content/browser/tracing/tracing_controller_impl.cc @@ -4,11 +4,11 @@ #include "content/browser/tracing/tracing_controller_impl.h" #include "base/bind.h" -#include "base/debug/trace_event.h" #include "base/files/file_util.h" #include "base/json/string_escape.h" #include "base/macros.h" #include "base/strings/string_number_conversions.h" +#include "base/trace_event/trace_event.h" #include "content/browser/tracing/trace_message_filter.h" #include "content/browser/tracing/tracing_ui.h" #include "content/common/child_process_messages.h" diff --git a/content/browser/tracing/tracing_ui.cc b/content/browser/tracing/tracing_ui.cc index bb04de0..a219c3d 100644 --- a/content/browser/tracing/tracing_ui.cc +++ b/content/browser/tracing/tracing_ui.cc @@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/debug/trace_event.h" #include "base/format_macros.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" @@ -21,6 +20,7 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" +#include "base/trace_event/trace_event.h" #include "base/values.h" #include "content/browser/tracing/grit/tracing_resources.h" #include "content/browser/tracing/trace_uploader.h" diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index f8b723f..0b6d8eb 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -7,7 +7,6 @@ #include <utility> #include "base/command_line.h" -#include "base/debug/trace_event.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/metrics/histogram.h" @@ -18,6 +17,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" +#include "base/trace_event/trace_event.h" #include "content/browser/accessibility/accessibility_mode_helper.h" #include "content/browser/accessibility/browser_accessibility_state_impl.h" #include "content/browser/browser_plugin/browser_plugin_embedder.h" diff --git a/content/browser/webui/url_data_manager_backend.cc b/content/browser/webui/url_data_manager_backend.cc index 409e6bd..3bde564 100644 --- a/content/browser/webui/url_data_manager_backend.cc +++ b/content/browser/webui/url_data_manager_backend.cc @@ -11,7 +11,6 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/debug/alias.h" -#include "base/debug/trace_event.h" #include "base/lazy_instance.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" @@ -20,6 +19,7 @@ #include "base/profiler/scoped_tracker.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" +#include "base/trace_event/trace_event.h" #include "content/browser/appcache/view_appcache_internals_job.h" #include "content/browser/fileapi/chrome_blob_storage_context.h" #include "content/browser/histogram_internals_request_job.h" |