From e4f96501fc5b3e6de0d1ccd262372afcda1f5b4f Mon Sep 17 00:00:00 2001 From: tommi Date: Tue, 20 Oct 2015 23:00:48 -0700 Subject: [PATCH] Remove system_wrappers/interface/trace_event.h BUG= Review URL: https://codereview.webrtc.org/1417773002 Cr-Commit-Position: refs/heads/master@{#10346} --- talk/media/webrtc/webrtcvideoengine2.cc | 2 +- webrtc/base/event_tracer_unittest.cc | 2 +- webrtc/call/call.cc | 2 +- webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc | 4 ++-- webrtc/modules/rtp_rtcp/source/rtcp_sender.cc | 4 ++-- .../modules/rtp_rtcp/source/rtp_receiver_audio.cc | 2 +- .../modules/rtp_rtcp/source/rtp_receiver_video.cc | 2 +- webrtc/modules/rtp_rtcp/source/rtp_sender.cc | 2 +- webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc | 2 +- webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc | 2 +- webrtc/modules/video_capture/video_capture_impl.cc | 2 +- webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc | 2 +- webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc | 2 +- .../video_coding/main/source/jitter_buffer.cc | 2 +- webrtc/modules/video_coding/main/source/receiver.cc | 2 +- .../video_coding/main/source/video_receiver.cc | 2 +- webrtc/system_wrappers/BUILD.gn | 1 - webrtc/system_wrappers/interface/trace_event.h | 13 ------------- webrtc/system_wrappers/system_wrappers.gyp | 1 - webrtc/video/video_capture_input.cc | 2 +- webrtc/video/video_send_stream.cc | 2 +- webrtc/video_engine/vie_encoder.cc | 2 +- webrtc/video_engine/vie_sync_module.cc | 2 +- 23 files changed, 22 insertions(+), 37 deletions(-) delete mode 100644 webrtc/system_wrappers/interface/trace_event.h diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc index 3813519b96..d0cb04eee5 100644 --- a/talk/media/webrtc/webrtcvideoengine2.cc +++ b/talk/media/webrtc/webrtcvideoengine2.cc @@ -43,11 +43,11 @@ #include "webrtc/base/logging.h" #include "webrtc/base/stringutils.h" #include "webrtc/base/timeutils.h" +#include "webrtc/base/trace_event.h" #include "webrtc/call.h" #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" #include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h" #include "webrtc/system_wrappers/interface/field_trial.h" -#include "webrtc/system_wrappers/interface/trace_event.h" #include "webrtc/video_decoder.h" #include "webrtc/video_encoder.h" diff --git a/webrtc/base/event_tracer_unittest.cc b/webrtc/base/event_tracer_unittest.cc index 25ee2543a6..897f99efa1 100644 --- a/webrtc/base/event_tracer_unittest.cc +++ b/webrtc/base/event_tracer_unittest.cc @@ -11,8 +11,8 @@ #include "webrtc/base/event_tracer.h" #include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/base/trace_event.h" #include "webrtc/system_wrappers/interface/static_instance.h" -#include "webrtc/system_wrappers/interface/trace_event.h" namespace { diff --git a/webrtc/call/call.cc b/webrtc/call/call.cc index 9a036c9ede..4b592583cd 100644 --- a/webrtc/call/call.cc +++ b/webrtc/call/call.cc @@ -19,6 +19,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/thread_annotations.h" #include "webrtc/base/thread_checker.h" +#include "webrtc/base/trace_event.h" #include "webrtc/call.h" #include "webrtc/call/rtc_event_log.h" #include "webrtc/common.h" @@ -31,7 +32,6 @@ #include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" #include "webrtc/system_wrappers/interface/trace.h" -#include "webrtc/system_wrappers/interface/trace_event.h" #include "webrtc/video/video_receive_stream.h" #include "webrtc/video/video_send_stream.h" #include "webrtc/voice_engine/include/voe_codec.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc index abd822a4b9..395dad1ffc 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc @@ -16,12 +16,12 @@ #include #include "webrtc/base/checks.h" -#include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" +#include "webrtc/base/trace_event.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/trace_event.h" namespace webrtc { using namespace RTCPUtility; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc index e437a15a46..3573cb91c0 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc @@ -18,13 +18,13 @@ #include // max #include "webrtc/base/checks.h" +#include "webrtc/base/trace_event.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/trace_event.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc index d7bf405940..47a436309a 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc @@ -14,9 +14,9 @@ #include // pow() #include // memcpy() +#include "webrtc/base/trace_event.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/trace_event.h" namespace webrtc { RTPReceiverStrategy* RTPReceiverStrategy::CreateAudioStrategy( diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc index a8db0d293f..cc6e033b1b 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc @@ -14,6 +14,7 @@ #include #include "webrtc/base/checks.h" +#include "webrtc/base/trace_event.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_cvo.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_payload_registry.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format.h" @@ -21,7 +22,6 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/trace_event.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc index 1a56c632b3..8dc8ca6e41 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc @@ -14,6 +14,7 @@ #include #include "webrtc/base/checks.h" +#include "webrtc/base/trace_event.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_cvo.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h" @@ -21,7 +22,6 @@ #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/tick_util.h" -#include "webrtc/system_wrappers/interface/trace_event.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc index 30842bb773..1fc9a89ce1 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc @@ -13,9 +13,9 @@ #include //assert #include //memcpy +#include "webrtc/base/trace_event.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/system_wrappers/interface/trace_event.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc index 0c7f41a17d..cf398aac8f 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc @@ -16,6 +16,7 @@ #include #include "webrtc/base/checks.h" +#include "webrtc/base/trace_event.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/producer_fec.h" @@ -24,7 +25,6 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/trace_event.h" namespace webrtc { enum { REDForFECHeaderLength = 1 }; diff --git a/webrtc/modules/video_capture/video_capture_impl.cc b/webrtc/modules/video_capture/video_capture_impl.cc index 41dde065d3..bdd15b1343 100644 --- a/webrtc/modules/video_capture/video_capture_impl.cc +++ b/webrtc/modules/video_capture/video_capture_impl.cc @@ -12,6 +12,7 @@ #include +#include "webrtc/base/trace_event.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/video_capture/video_capture_config.h" @@ -20,7 +21,6 @@ #include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/ref_count.h" #include "webrtc/system_wrappers/interface/tick_util.h" -#include "webrtc/system_wrappers/interface/trace_event.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc index 6ac840eb6c..0c5256ee01 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc @@ -20,6 +20,7 @@ #include "libyuv/convert.h" // NOLINT #include "webrtc/base/checks.h" +#include "webrtc/base/trace_event.h" #include "webrtc/common.h" #include "webrtc/common_types.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" @@ -29,7 +30,6 @@ #include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h" #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" #include "webrtc/system_wrappers/interface/tick_util.h" -#include "webrtc/system_wrappers/interface/trace_event.h" namespace webrtc { namespace { diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc b/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc index 1a2137139b..836a131648 100644 --- a/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc +++ b/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc @@ -23,12 +23,12 @@ #include "webrtc/base/bind.h" #include "webrtc/base/checks.h" +#include "webrtc/base/trace_event.h" #include "webrtc/common.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/tick_util.h" -#include "webrtc/system_wrappers/interface/trace_event.h" namespace { diff --git a/webrtc/modules/video_coding/main/source/jitter_buffer.cc b/webrtc/modules/video_coding/main/source/jitter_buffer.cc index 92ffbc9120..b91cd2ed8a 100644 --- a/webrtc/modules/video_coding/main/source/jitter_buffer.cc +++ b/webrtc/modules/video_coding/main/source/jitter_buffer.cc @@ -14,6 +14,7 @@ #include #include +#include "webrtc/base/trace_event.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_coding/main/source/frame_buffer.h" #include "webrtc/modules/video_coding/main/source/inter_frame_delay.h" @@ -26,7 +27,6 @@ #include "webrtc/system_wrappers/interface/event_wrapper.h" #include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/metrics.h" -#include "webrtc/system_wrappers/interface/trace_event.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/receiver.cc b/webrtc/modules/video_coding/main/source/receiver.cc index e26bd86735..6a98cb150a 100644 --- a/webrtc/modules/video_coding/main/source/receiver.cc +++ b/webrtc/modules/video_coding/main/source/receiver.cc @@ -14,12 +14,12 @@ #include +#include "webrtc/base/trace_event.h" #include "webrtc/modules/video_coding/main/source/encoded_frame.h" #include "webrtc/modules/video_coding/main/source/internal_defines.h" #include "webrtc/modules/video_coding/main/source/media_opt_util.h" #include "webrtc/system_wrappers/interface/clock.h" #include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/trace_event.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/video_receiver.cc b/webrtc/modules/video_coding/main/source/video_receiver.cc index 7371f9d337..76d2c9f2db 100644 --- a/webrtc/modules/video_coding/main/source/video_receiver.cc +++ b/webrtc/modules/video_coding/main/source/video_receiver.cc @@ -9,6 +9,7 @@ */ #include "webrtc/base/checks.h" +#include "webrtc/base/trace_event.h" #include "webrtc/common_types.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" @@ -18,7 +19,6 @@ #include "webrtc/modules/video_coding/main/source/video_coding_impl.h" #include "webrtc/system_wrappers/interface/clock.h" #include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/trace_event.h" // #define DEBUG_DECODER_BIT_STREAM diff --git a/webrtc/system_wrappers/BUILD.gn b/webrtc/system_wrappers/BUILD.gn index 0657e20426..c01afe6d3b 100644 --- a/webrtc/system_wrappers/BUILD.gn +++ b/webrtc/system_wrappers/BUILD.gn @@ -42,7 +42,6 @@ static_library("system_wrappers") { "interface/tick_util.h", "interface/timestamp_extrapolator.h", "interface/trace.h", - "interface/trace_event.h", "interface/utf_util_win.h", "source/aligned_malloc.cc", "source/atomic32_mac.cc", diff --git a/webrtc/system_wrappers/interface/trace_event.h b/webrtc/system_wrappers/interface/trace_event.h deleted file mode 100644 index e82afbabf5..0000000000 --- a/webrtc/system_wrappers/interface/trace_event.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file under third_party_mods/chromium or at: -// http://src.chromium.org/svn/trunk/src/LICENSE - -#ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_TRACE_EVENT_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_TRACE_EVENT_H_ - -// This file has moved. -// TODO(tommi): Delete after removing dependencies and updating Chromium. -#include "webrtc/base/trace_event.h" - -#endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_TRACE_EVENT_H_ diff --git a/webrtc/system_wrappers/system_wrappers.gyp b/webrtc/system_wrappers/system_wrappers.gyp index 02e930575c..95b1d76ab8 100644 --- a/webrtc/system_wrappers/system_wrappers.gyp +++ b/webrtc/system_wrappers/system_wrappers.gyp @@ -49,7 +49,6 @@ 'interface/tick_util.h', 'interface/timestamp_extrapolator.h', 'interface/trace.h', - 'interface/trace_event.h', 'interface/utf_util_win.h', 'source/aligned_malloc.cc', 'source/atomic32_mac.cc', diff --git a/webrtc/video/video_capture_input.cc b/webrtc/video/video_capture_input.cc index 3e815a21c9..f98447f63c 100644 --- a/webrtc/video/video_capture_input.cc +++ b/webrtc/video/video_capture_input.cc @@ -11,6 +11,7 @@ #include "webrtc/video/video_capture_input.h" #include "webrtc/base/checks.h" +#include "webrtc/base/trace_event.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/utility/interface/process_thread.h" #include "webrtc/modules/video_capture/include/video_capture_factory.h" @@ -21,7 +22,6 @@ #include "webrtc/system_wrappers/interface/event_wrapper.h" #include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/tick_util.h" -#include "webrtc/system_wrappers/interface/trace_event.h" #include "webrtc/video/send_statistics_proxy.h" #include "webrtc/video_engine/overuse_frame_detector.h" #include "webrtc/video_engine/vie_encoder.h" diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc index 3adb2f774c..8e4ccbc733 100644 --- a/webrtc/video/video_send_stream.cc +++ b/webrtc/video/video_send_stream.cc @@ -16,10 +16,10 @@ #include #include "webrtc/base/checks.h" +#include "webrtc/base/trace_event.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/pacing/include/packet_router.h" #include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/trace_event.h" #include "webrtc/video/video_capture_input.h" #include "webrtc/video_engine/call_stats.h" #include "webrtc/video_engine/payload_router.h" diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc index 340a78ef33..761df33b55 100644 --- a/webrtc/video_engine/vie_encoder.cc +++ b/webrtc/video_engine/vie_encoder.cc @@ -15,6 +15,7 @@ #include #include "webrtc/base/checks.h" +#include "webrtc/base/trace_event.h" #include "webrtc/common_video/interface/video_image.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/frame_callback.h" @@ -30,7 +31,6 @@ #include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/metrics.h" #include "webrtc/system_wrappers/interface/tick_util.h" -#include "webrtc/system_wrappers/interface/trace_event.h" #include "webrtc/video/send_statistics_proxy.h" #include "webrtc/video_engine/payload_router.h" #include "webrtc/video_engine/vie_defines.h" diff --git a/webrtc/video_engine/vie_sync_module.cc b/webrtc/video_engine/vie_sync_module.cc index 9c0aab37d5..7c87b67382 100644 --- a/webrtc/video_engine/vie_sync_module.cc +++ b/webrtc/video_engine/vie_sync_module.cc @@ -10,12 +10,12 @@ #include "webrtc/video_engine/vie_sync_module.h" +#include "webrtc/base/trace_event.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_receiver.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/trace_event.h" #include "webrtc/video_engine/stream_synchronization.h" #include "webrtc/voice_engine/include/voe_video_sync.h"