webrtc/modules/rtp_rtcp/source/rtp_sender.cc - Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/rtp_rtcp/source/rtp_sender.cc

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)

Patch Set: Created 3 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: webrtc/modules/rtp_rtcp/source/rtp_sender.cc

diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc

index 7fbd9aeb41bad28a44dd2735dd8b384dce39a483..759bc9c980a8e85204e20f860df583ededf194f3 100644

--- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc

+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc

@@ -13,6 +13,13 @@

#include <algorithm>

#include <utility>

+#include "webrtc/base/arraysize.h"

+#include "webrtc/base/checks.h"

+#include "webrtc/base/logging.h"

+#include "webrtc/base/rate_limiter.h"

+#include "webrtc/base/safe_minmax.h"

+#include "webrtc/base/timeutils.h"

+#include "webrtc/base/trace_event.h"

#include "webrtc/logging/rtc_event_log/rtc_event_log.h"

#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"

#include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h"

@@ -23,13 +30,6 @@

#include "webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h"

#include "webrtc/modules/rtp_rtcp/source/rtp_sender_video.h"

#include "webrtc/modules/rtp_rtcp/source/time_util.h"

-#include "webrtc/rtc_base/arraysize.h"

-#include "webrtc/rtc_base/checks.h"

-#include "webrtc/rtc_base/logging.h"

-#include "webrtc/rtc_base/rate_limiter.h"

-#include "webrtc/rtc_base/safe_minmax.h"

-#include "webrtc/rtc_base/timeutils.h"

-#include "webrtc/rtc_base/trace_event.h"

#include "webrtc/system_wrappers/include/field_trial.h"

namespace webrtc {