(4) Rename files to snake_case: update BUILD.gn, include paths, header guards, and DEPS entries
Mechanically generated by running this command:
tools_webrtc/do-renames.sh update all-renames.txt && git cl format
Then manually updating:
tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc
Bug: webrtc:10159
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: I54824cd91dada8fc3ee3d098f971bc319d477833
Reviewed-on: https://webrtc-review.googlesource.com/c/115653
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26226}diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 7736b2f..9b634fb 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -31,41 +31,41 @@
sources = [
"channel.cc",
"channel.h",
- "channelinterface.h",
- "channelmanager.cc",
- "channelmanager.h",
- "dtlssrtptransport.cc",
- "dtlssrtptransport.h",
- "dtlstransport.cc",
- "dtlstransport.h",
- "externalhmac.cc",
- "externalhmac.h",
- "jseptransport.cc",
- "jseptransport.h",
- "jseptransportcontroller.cc",
- "jseptransportcontroller.h",
- "mediasession.cc",
- "mediasession.h",
- "rtcpmuxfilter.cc",
- "rtcpmuxfilter.h",
- "rtpmediautils.cc",
- "rtpmediautils.h",
- "rtptransport.cc",
- "rtptransport.h",
- "rtptransportinternal.h",
- "rtptransportinternaladapter.h",
- "sessiondescription.cc",
- "sessiondescription.h",
- "simulcastdescription.cc",
- "simulcastdescription.h",
- "srtpfilter.cc",
- "srtpfilter.h",
- "srtpsession.cc",
- "srtpsession.h",
- "srtptransport.cc",
- "srtptransport.h",
- "transportstats.cc",
- "transportstats.h",
+ "channel_interface.h",
+ "channel_manager.cc",
+ "channel_manager.h",
+ "dtls_srtp_transport.cc",
+ "dtls_srtp_transport.h",
+ "dtls_transport.cc",
+ "dtls_transport.h",
+ "external_hmac.cc",
+ "external_hmac.h",
+ "jsep_transport.cc",
+ "jsep_transport.h",
+ "jsep_transport_controller.cc",
+ "jsep_transport_controller.h",
+ "media_session.cc",
+ "media_session.h",
+ "rtcp_mux_filter.cc",
+ "rtcp_mux_filter.h",
+ "rtp_media_utils.cc",
+ "rtp_media_utils.h",
+ "rtp_transport.cc",
+ "rtp_transport.h",
+ "rtp_transport_internal.h",
+ "rtp_transport_internal_adapter.h",
+ "session_description.cc",
+ "session_description.h",
+ "simulcast_description.cc",
+ "simulcast_description.h",
+ "srtp_filter.cc",
+ "srtp_filter.h",
+ "srtp_session.cc",
+ "srtp_session.h",
+ "srtp_transport.cc",
+ "srtp_transport.h",
+ "transport_stats.cc",
+ "transport_stats.h",
"unique_id_generator.cc",
"unique_id_generator.h",
]
@@ -129,63 +129,63 @@
visibility = [ "*" ]
cflags = []
sources = [
- "audiotrack.cc",
- "audiotrack.h",
- "datachannel.cc",
- "datachannel.h",
- "dtmfsender.cc",
- "dtmfsender.h",
- "iceserverparsing.cc",
- "iceserverparsing.h",
- "jsepicecandidate.cc",
- "jsepsessiondescription.cc",
- "localaudiosource.cc",
- "localaudiosource.h",
- "mediastream.cc",
- "mediastream.h",
- "mediastreamobserver.cc",
- "mediastreamobserver.h",
- "mediastreamtrack.h",
- "peerconnection.cc",
- "peerconnection.h",
- "peerconnectionfactory.cc",
- "peerconnectionfactory.h",
- "peerconnectioninternal.h",
- "remoteaudiosource.cc",
- "remoteaudiosource.h",
- "rtcstatscollector.cc",
- "rtcstatscollector.h",
- "rtcstatstraversal.cc",
- "rtcstatstraversal.h",
- "rtpparametersconversion.cc",
- "rtpparametersconversion.h",
- "rtpreceiver.cc",
- "rtpreceiver.h",
- "rtpsender.cc",
- "rtpsender.h",
- "rtptransceiver.cc",
- "rtptransceiver.h",
- "sctputils.cc",
- "sctputils.h",
- "sdpserializer.cc",
- "sdpserializer.h",
- "sdputils.cc",
- "sdputils.h",
- "statscollector.cc",
- "statscollector.h",
- "streamcollection.h",
- "trackmediainfomap.cc",
- "trackmediainfomap.h",
- "videocapturertracksource.cc",
- "videocapturertracksource.h",
- "videotrack.cc",
- "videotrack.h",
- "videotracksource.cc",
- "videotracksource.h",
- "webrtcsdp.cc",
- "webrtcsdp.h",
- "webrtcsessiondescriptionfactory.cc",
- "webrtcsessiondescriptionfactory.h",
+ "audio_track.cc",
+ "audio_track.h",
+ "data_channel.cc",
+ "data_channel.h",
+ "dtmf_sender.cc",
+ "dtmf_sender.h",
+ "ice_server_parsing.cc",
+ "ice_server_parsing.h",
+ "jsep_ice_candidate.cc",
+ "jsep_session_description.cc",
+ "local_audio_source.cc",
+ "local_audio_source.h",
+ "media_stream.cc",
+ "media_stream.h",
+ "media_stream_observer.cc",
+ "media_stream_observer.h",
+ "media_stream_track.h",
+ "peer_connection.cc",
+ "peer_connection.h",
+ "peer_connection_factory.cc",
+ "peer_connection_factory.h",
+ "peer_connection_internal.h",
+ "remote_audio_source.cc",
+ "remote_audio_source.h",
+ "rtc_stats_collector.cc",
+ "rtc_stats_collector.h",
+ "rtc_stats_traversal.cc",
+ "rtc_stats_traversal.h",
+ "rtp_parameters_conversion.cc",
+ "rtp_parameters_conversion.h",
+ "rtp_receiver.cc",
+ "rtp_receiver.h",
+ "rtp_sender.cc",
+ "rtp_sender.h",
+ "rtp_transceiver.cc",
+ "rtp_transceiver.h",
+ "sctp_utils.cc",
+ "sctp_utils.h",
+ "sdp_serializer.cc",
+ "sdp_serializer.h",
+ "sdp_utils.cc",
+ "sdp_utils.h",
+ "stats_collector.cc",
+ "stats_collector.h",
+ "stream_collection.h",
+ "track_media_info_map.cc",
+ "track_media_info_map.h",
+ "video_capturer_track_source.cc",
+ "video_capturer_track_source.h",
+ "video_track.cc",
+ "video_track.h",
+ "video_track_source.cc",
+ "video_track_source.h",
+ "webrtc_sdp.cc",
+ "webrtc_sdp.h",
+ "webrtc_session_description_factory.cc",
+ "webrtc_session_description_factory.h",
]
if (!build_with_chromium && is_clang) {
@@ -246,21 +246,21 @@
testonly = true
sources = [
+ "channel_manager_unittest.cc",
"channel_unittest.cc",
- "channelmanager_unittest.cc",
- "dtlssrtptransport_unittest.cc",
+ "dtls_srtp_transport_unittest.cc",
"dtlstransport_unittest.cc",
- "jseptransport_unittest.cc",
- "jseptransportcontroller_unittest.cc",
- "mediasession_unittest.cc",
- "rtcpmuxfilter_unittest.cc",
- "rtptransport_unittest.cc",
- "rtptransporttestutil.h",
- "sessiondescription_unittest.cc",
- "srtpfilter_unittest.cc",
- "srtpsession_unittest.cc",
- "srtptestutil.h",
- "srtptransport_unittest.cc",
+ "jsep_transport_controller_unittest.cc",
+ "jsep_transport_unittest.cc",
+ "media_session_unittest.cc",
+ "rtcp_mux_filter_unittest.cc",
+ "rtp_transport_unittest.cc",
+ "session_description_unittest.cc",
+ "srtp_filter_unittest.cc",
+ "srtp_session_unittest.cc",
+ "srtp_transport_unittest.cc",
+ "test/rtp_transport_test_util.h",
+ "test/srtp_test_util.h",
"unique_id_generator_unittest.cc",
]
@@ -316,7 +316,7 @@
rtc_source_set("peerconnection_perf_tests") {
testonly = true
sources = [
- "peerconnection_rampup_tests.cc",
+ "peer_connection_rampup_tests.cc",
]
deps = [
":pc_test_utils",
@@ -357,8 +357,8 @@
rtc_source_set("peerconnection_wrapper") {
testonly = true
sources = [
- "peerconnectionwrapper.cc",
- "peerconnectionwrapper.h",
+ "peer_connection_wrapper.cc",
+ "peer_connection_wrapper.h",
]
deps = [
":pc_test_utils",
@@ -379,27 +379,27 @@
rtc_source_set("pc_test_utils") {
testonly = true
sources = [
- "test/fakeaudiocapturemodule.cc",
- "test/fakeaudiocapturemodule.h",
- "test/fakedatachannelprovider.h",
- "test/fakepeerconnectionbase.h",
- "test/fakepeerconnectionforstats.h",
- "test/fakeperiodicvideosource.h",
- "test/fakeperiodicvideotracksource.h",
- "test/fakertccertificategenerator.h",
- "test/fakesctptransport.h",
- "test/fakevideotrackrenderer.h",
- "test/fakevideotracksource.h",
- "test/framegeneratorcapturervideotracksource.h",
- "test/mock_channelinterface.h",
- "test/mock_datachannel.h",
- "test/mock_rtpreceiverinternal.h",
- "test/mock_rtpsenderinternal.h",
- "test/mockpeerconnectionobservers.h",
- "test/peerconnectiontestwrapper.cc",
- "test/peerconnectiontestwrapper.h",
- "test/rtcstatsobtainer.h",
- "test/testsdpstrings.h",
+ "test/fake_audio_capture_module.cc",
+ "test/fake_audio_capture_module.h",
+ "test/fake_data_channel_provider.h",
+ "test/fake_peer_connection_base.h",
+ "test/fake_peer_connection_for_stats.h",
+ "test/fake_periodic_video_source.h",
+ "test/fake_periodic_video_track_source.h",
+ "test/fake_rtc_certificate_generator.h",
+ "test/fake_sctp_transport.h",
+ "test/fake_video_track_renderer.h",
+ "test/fake_video_track_source.h",
+ "test/frame_generator_capturer_video_track_source.h",
+ "test/mock_channel_interface.h",
+ "test/mock_data_channel.h",
+ "test/mock_peer_connection_observers.h",
+ "test/mock_rtp_receiver_internal.h",
+ "test/mock_rtp_sender_internal.h",
+ "test/peer_connection_test_wrapper.cc",
+ "test/peer_connection_test_wrapper.h",
+ "test/rtc_stats_obtainer.h",
+ "test/test_sdp_strings.h",
]
deps = [
@@ -450,45 +450,45 @@
rtc_test("peerconnection_unittests") {
testonly = true
sources = [
- "datachannel_unittest.cc",
- "dtmfsender_unittest.cc",
- "iceserverparsing_unittest.cc",
- "jsepsessiondescription_unittest.cc",
- "localaudiosource_unittest.cc",
- "mediaconstraintsinterface_unittest.cc",
- "mediastream_unittest.cc",
- "peerconnection_bundle_unittest.cc",
- "peerconnection_crypto_unittest.cc",
- "peerconnection_datachannel_unittest.cc",
- "peerconnection_histogram_unittest.cc",
- "peerconnection_ice_unittest.cc",
- "peerconnection_integrationtest.cc",
- "peerconnection_jsep_unittest.cc",
- "peerconnection_media_unittest.cc",
- "peerconnection_rtp_unittest.cc",
- "peerconnection_signaling_unittest.cc",
- "peerconnectionendtoend_unittest.cc",
- "peerconnectionfactory_unittest.cc",
- "peerconnectioninterface_unittest.cc",
- "peerconnectionwrapper.cc",
- "peerconnectionwrapper.h",
+ "data_channel_unittest.cc",
+ "dtmf_sender_unittest.cc",
+ "ice_server_parsing_unittest.cc",
+ "jsep_session_description_unittest.cc",
+ "local_audio_source_unittest.cc",
+ "media_constraints_interface_unittest.cc",
+ "media_stream_unittest.cc",
+ "peer_connection_bundle_unittest.cc",
+ "peer_connection_crypto_unittest.cc",
+ "peer_connection_data_channel_unittest.cc",
+ "peer_connection_end_to_end_unittest.cc",
+ "peer_connection_factory_unittest.cc",
+ "peer_connection_histogram_unittest.cc",
+ "peer_connection_ice_unittest.cc",
+ "peer_connection_integrationtest.cc",
+ "peer_connection_interface_unittest.cc",
+ "peer_connection_jsep_unittest.cc",
+ "peer_connection_media_unittest.cc",
+ "peer_connection_rtp_unittest.cc",
+ "peer_connection_signaling_unittest.cc",
+ "peer_connection_wrapper.cc",
+ "peer_connection_wrapper.h",
"proxy_unittest.cc",
- "rtcstats_integrationtest.cc",
- "rtcstatscollector_unittest.cc",
- "rtcstatstraversal_unittest.cc",
- "rtpmediautils_unittest.cc",
- "rtpparametersconversion_unittest.cc",
- "rtpsenderreceiver_unittest.cc",
- "rtptransceiver_unittest.cc",
- "sctputils_unittest.cc",
- "sdpserializer_unittest.cc",
- "statscollector_unittest.cc",
- "test/fakeaudiocapturemodule_unittest.cc",
- "test/testsdpstrings.h",
- "trackmediainfomap_unittest.cc",
- "videocapturertracksource_unittest.cc",
- "videotrack_unittest.cc",
- "webrtcsdp_unittest.cc",
+ "rtc_stats_collector_unittest.cc",
+ "rtc_stats_integrationtest.cc",
+ "rtc_stats_traversal_unittest.cc",
+ "rtp_media_utils_unittest.cc",
+ "rtp_parameters_conversion_unittest.cc",
+ "rtp_sender_receiver_unittest.cc",
+ "rtp_transceiver_unittest.cc",
+ "sctp_utils_unittest.cc",
+ "sdp_serializer_unittest.cc",
+ "stats_collector_unittest.cc",
+ "test/fake_audio_capture_module_unittest.cc",
+ "test/test_sdp_strings.h",
+ "track_media_info_map_unittest.cc",
+ "video_capturer_track_source_unittest.cc",
+ "video_track_unittest.cc",
+ "webrtc_sdp_unittest.cc",
]
if (rtc_enable_sctp) {
@@ -593,8 +593,8 @@
check_includes = false
testonly = true
sources = [
- "test/androidtestinitializer.cc",
- "test/androidtestinitializer.h",
+ "test/android_test_initializer.cc",
+ "test/android_test_initializer.h",
]
deps = [
"../sdk/android:libjingle_peerconnection_jni",
diff --git a/pc/audio_track.cc b/pc/audio_track.cc
index 2a3e5e3..f3bc3ff 100644
--- a/pc/audio_track.cc
+++ b/pc/audio_track.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/audiotrack.h"
+#include "pc/audio_track.h"
#include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
namespace webrtc {
diff --git a/pc/audio_track.h b/pc/audio_track.h
index 17ac700..6df8693 100644
--- a/pc/audio_track.h
+++ b/pc/audio_track.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_AUDIOTRACK_H_
-#define PC_AUDIOTRACK_H_
+#ifndef PC_AUDIO_TRACK_H_
+#define PC_AUDIO_TRACK_H_
#include <string>
-#include "api/mediastreaminterface.h"
-#include "pc/mediastreamtrack.h"
-#include "rtc_base/constructormagic.h"
+#include "api/media_stream_interface.h"
+#include "pc/media_stream_track.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/thread_checker.h"
@@ -55,4 +55,4 @@
} // namespace webrtc
-#endif // PC_AUDIOTRACK_H_
+#endif // PC_AUDIO_TRACK_H_
diff --git a/pc/channel.cc b/pc/channel.cc
index 8a2fcb5..b7bab92 100644
--- a/pc/channel.cc
+++ b/pc/channel.cc
@@ -16,24 +16,24 @@
#include "absl/memory/memory.h"
#include "api/call/audio_sink.h"
-#include "media/base/mediaconstants.h"
-#include "media/base/rtputils.h"
+#include "media/base/media_constants.h"
+#include "media/base/rtp_utils.h"
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
#include "rtc_base/bind.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
#include "rtc_base/checks.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
#include "rtc_base/dscp.h"
#include "rtc_base/logging.h"
-#include "rtc_base/networkroute.h"
+#include "rtc_base/network_route.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/trace_event.h"
// Adding 'nogncheck' to disable the gn include headers check to support modular
// WebRTC build targets.
-#include "media/engine/webrtcvoiceengine.h" // nogncheck
-#include "p2p/base/packettransportinternal.h"
-#include "pc/channelmanager.h"
-#include "pc/rtpmediautils.h"
+#include "media/engine/webrtc_voice_engine.h" // nogncheck
+#include "p2p/base/packet_transport_internal.h"
+#include "pc/channel_manager.h"
+#include "pc/rtp_media_utils.h"
namespace cricket {
using rtc::Bind;
diff --git a/pc/channel.h b/pc/channel.h
index 6264bb3..6d6bd40 100644
--- a/pc/channel.h
+++ b/pc/channel.h
@@ -20,24 +20,24 @@
#include "api/call/audio_sink.h"
#include "api/jsep.h"
-#include "api/rtpreceiverinterface.h"
+#include "api/rtp_receiver_interface.h"
#include "api/video/video_sink_interface.h"
#include "api/video/video_source_interface.h"
#include "call/rtp_packet_sink_interface.h"
-#include "media/base/mediachannel.h"
-#include "media/base/mediaengine.h"
-#include "media/base/streamparams.h"
-#include "p2p/base/dtlstransportinternal.h"
-#include "p2p/base/packettransportinternal.h"
-#include "pc/channelinterface.h"
-#include "pc/dtlssrtptransport.h"
-#include "pc/mediasession.h"
-#include "pc/rtptransport.h"
-#include "pc/srtpfilter.h"
-#include "pc/srtptransport.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/criticalsection.h"
+#include "media/base/media_channel.h"
+#include "media/base/media_engine.h"
+#include "media/base/stream_params.h"
+#include "p2p/base/dtls_transport_internal.h"
+#include "p2p/base/packet_transport_internal.h"
+#include "pc/channel_interface.h"
+#include "pc/dtls_srtp_transport.h"
+#include "pc/media_session.h"
+#include "pc/rtp_transport.h"
+#include "pc/srtp_filter.h"
+#include "pc/srtp_transport.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/network.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
diff --git a/pc/channel_interface.h b/pc/channel_interface.h
index 8e4109a..b623254 100644
--- a/pc/channel_interface.h
+++ b/pc/channel_interface.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_CHANNELINTERFACE_H_
-#define PC_CHANNELINTERFACE_H_
+#ifndef PC_CHANNEL_INTERFACE_H_
+#define PC_CHANNEL_INTERFACE_H_
#include <string>
#include "api/jsep.h"
-#include "api/mediatypes.h"
-#include "media/base/mediachannel.h"
-#include "pc/rtptransportinternal.h"
+#include "api/media_types.h"
+#include "media/base/media_channel.h"
+#include "pc/rtp_transport_internal.h"
namespace cricket {
@@ -65,4 +65,4 @@
} // namespace cricket
-#endif // PC_CHANNELINTERFACE_H_
+#endif // PC_CHANNEL_INTERFACE_H_
diff --git a/pc/channel_manager.cc b/pc/channel_manager.cc
index d5cbd9c..c936caf 100644
--- a/pc/channel_manager.cc
+++ b/pc/channel_manager.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/channelmanager.h"
+#include "pc/channel_manager.h"
#include <algorithm>
#include <utility>
#include "absl/memory/memory.h"
#include "absl/strings/match.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
#include "rtc_base/checks.h"
#include "rtc_base/location.h"
#include "rtc_base/logging.h"
diff --git a/pc/channel_manager.h b/pc/channel_manager.h
index 8bd30d1..38d79ee 100644
--- a/pc/channel_manager.h
+++ b/pc/channel_manager.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_CHANNELMANAGER_H_
-#define PC_CHANNELMANAGER_H_
+#ifndef PC_CHANNEL_MANAGER_H_
+#define PC_CHANNEL_MANAGER_H_
#include <stdint.h>
#include <memory>
@@ -17,16 +17,16 @@
#include <vector>
#include "api/audio_options.h"
-#include "api/crypto/cryptooptions.h"
+#include "api/crypto/crypto_options.h"
#include "api/media_transport_interface.h"
#include "call/call.h"
#include "media/base/codec.h"
-#include "media/base/mediachannel.h"
-#include "media/base/mediaconfig.h"
-#include "media/base/mediaengine.h"
+#include "media/base/media_channel.h"
+#include "media/base/media_config.h"
+#include "media/base/media_engine.h"
#include "pc/channel.h"
-#include "pc/rtptransportinternal.h"
-#include "pc/sessiondescription.h"
+#include "pc/rtp_transport_internal.h"
+#include "pc/session_description.h"
#include "rtc_base/platform_file.h"
#include "rtc_base/thread.h"
@@ -172,4 +172,4 @@
} // namespace cricket
-#endif // PC_CHANNELMANAGER_H_
+#endif // PC_CHANNEL_MANAGER_H_
diff --git a/pc/channel_manager_unittest.cc b/pc/channel_manager_unittest.cc
index ed09b72..999e36e 100644
--- a/pc/channel_manager_unittest.cc
+++ b/pc/channel_manager_unittest.cc
@@ -11,17 +11,17 @@
#include <memory>
#include "absl/memory/memory.h"
-#include "api/rtcerror.h"
+#include "api/rtc_error.h"
#include "api/test/fake_media_transport.h"
-#include "media/base/fakemediaengine.h"
-#include "media/base/testutils.h"
-#include "media/engine/fakewebrtccall.h"
-#include "p2p/base/dtlstransportinternal.h"
-#include "p2p/base/fakedtlstransport.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/packettransportinternal.h"
-#include "pc/channelmanager.h"
-#include "pc/dtlssrtptransport.h"
+#include "media/base/fake_media_engine.h"
+#include "media/base/test_utils.h"
+#include "media/engine/fake_webrtc_call.h"
+#include "p2p/base/dtls_transport_internal.h"
+#include "p2p/base/fake_dtls_transport.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/packet_transport_internal.h"
+#include "pc/channel_manager.h"
+#include "pc/dtls_srtp_transport.h"
#include "rtc_base/checks.h"
#include "rtc_base/thread.h"
#include "test/gtest.h"
diff --git a/pc/channel_unittest.cc b/pc/channel_unittest.cc
index e675375..5e15dbd 100644
--- a/pc/channel_unittest.cc
+++ b/pc/channel_unittest.cc
@@ -15,26 +15,26 @@
#include "absl/memory/memory.h"
#include "api/array_view.h"
#include "api/audio_options.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
#include "media/base/codec.h"
-#include "media/base/fakemediaengine.h"
-#include "media/base/fakertp.h"
-#include "media/base/mediachannel.h"
-#include "p2p/base/candidatepairinterface.h"
-#include "p2p/base/fakedtlstransport.h"
-#include "p2p/base/fakepackettransport.h"
-#include "p2p/base/icetransportinternal.h"
-#include "p2p/base/p2pconstants.h"
+#include "media/base/fake_media_engine.h"
+#include "media/base/fake_rtp.h"
+#include "media/base/media_channel.h"
+#include "p2p/base/candidate_pair_interface.h"
+#include "p2p/base/fake_dtls_transport.h"
+#include "p2p/base/fake_packet_transport.h"
+#include "p2p/base/ice_transport_internal.h"
+#include "p2p/base/p2p_constants.h"
#include "pc/channel.h"
-#include "pc/dtlssrtptransport.h"
-#include "pc/jseptransport.h"
-#include "pc/rtptransport.h"
+#include "pc/dtls_srtp_transport.h"
+#include "pc/jsep_transport.h"
+#include "pc/rtp_transport.h"
#include "rtc_base/arraysize.h"
#include "rtc_base/buffer.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
#include "rtc_base/checks.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/ssl_identity.h"
#include "test/gtest.h"
using cricket::DtlsTransportInternal;
diff --git a/pc/data_channel.cc b/pc/data_channel.cc
index a632b8e..f854def 100644
--- a/pc/data_channel.cc
+++ b/pc/data_channel.cc
@@ -8,19 +8,19 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/datachannel.h"
+#include "pc/data_channel.h"
#include <memory>
#include <string>
#include <utility>
#include "absl/memory/memory.h"
-#include "media/sctp/sctptransportinternal.h"
-#include "pc/sctputils.h"
+#include "media/sctp/sctp_transport_internal.h"
+#include "pc/sctp_utils.h"
#include "rtc_base/checks.h"
#include "rtc_base/location.h"
#include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/thread.h"
namespace webrtc {
diff --git a/pc/data_channel.h b/pc/data_channel.h
index 55a52db..af8dd93 100644
--- a/pc/data_channel.h
+++ b/pc/data_channel.h
@@ -8,19 +8,19 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_DATACHANNEL_H_
-#define PC_DATACHANNEL_H_
+#ifndef PC_DATA_CHANNEL_H_
+#define PC_DATA_CHANNEL_H_
#include <deque>
#include <memory>
#include <set>
#include <string>
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
#include "api/proxy.h"
-#include "media/base/mediachannel.h"
+#include "media/base/media_channel.h"
#include "pc/channel.h"
-#include "rtc_base/asyncinvoker.h"
+#include "rtc_base/async_invoker.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
@@ -313,4 +313,4 @@
} // namespace webrtc
-#endif // PC_DATACHANNEL_H_
+#endif // PC_DATA_CHANNEL_H_
diff --git a/pc/data_channel_unittest.cc b/pc/data_channel_unittest.cc
index 4addfbb..4aa9dee 100644
--- a/pc/data_channel_unittest.cc
+++ b/pc/data_channel_unittest.cc
@@ -12,9 +12,9 @@
#include <memory>
#include <vector>
-#include "pc/datachannel.h"
-#include "pc/sctputils.h"
-#include "pc/test/fakedatachannelprovider.h"
+#include "pc/data_channel.h"
+#include "pc/sctp_utils.h"
+#include "pc/test/fake_data_channel_provider.h"
#include "rtc_base/gunit.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "test/gtest.h"
diff --git a/pc/dtls_srtp_transport.cc b/pc/dtls_srtp_transport.cc
index 48d3e49..fcf0727 100644
--- a/pc/dtls_srtp_transport.cc
+++ b/pc/dtls_srtp_transport.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/dtlssrtptransport.h"
+#include "pc/dtls_srtp_transport.h"
#include <string.h>
#include <string>
@@ -16,7 +16,7 @@
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ssl_stream_adapter.h"
namespace {
// Value specified in RFC 5764.
diff --git a/pc/dtls_srtp_transport.h b/pc/dtls_srtp_transport.h
index 995e537..c63a3ca 100644
--- a/pc/dtls_srtp_transport.h
+++ b/pc/dtls_srtp_transport.h
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_DTLSSRTPTRANSPORT_H_
-#define PC_DTLSSRTPTRANSPORT_H_
+#ifndef PC_DTLS_SRTP_TRANSPORT_H_
+#define PC_DTLS_SRTP_TRANSPORT_H_
#include <vector>
#include "absl/types/optional.h"
-#include "api/cryptoparams.h"
-#include "api/rtcerror.h"
-#include "p2p/base/dtlstransportinternal.h"
-#include "p2p/base/packettransportinternal.h"
-#include "pc/srtptransport.h"
+#include "api/crypto_params.h"
+#include "api/rtc_error.h"
+#include "p2p/base/dtls_transport_internal.h"
+#include "p2p/base/packet_transport_internal.h"
+#include "pc/srtp_transport.h"
#include "rtc_base/buffer.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
@@ -100,4 +100,4 @@
} // namespace webrtc
-#endif // PC_DTLSSRTPTRANSPORT_H_
+#endif // PC_DTLS_SRTP_TRANSPORT_H_
diff --git a/pc/dtls_srtp_transport_unittest.cc b/pc/dtls_srtp_transport_unittest.cc
index 50d0eaf..abf1b2d 100644
--- a/pc/dtls_srtp_transport_unittest.cc
+++ b/pc/dtls_srtp_transport_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/dtlssrtptransport.h"
+#include "pc/dtls_srtp_transport.h"
#include <string.h>
#include <cstdint>
@@ -17,18 +17,18 @@
#include "absl/memory/memory.h"
#include "call/rtp_demuxer.h"
-#include "media/base/fakertp.h"
-#include "p2p/base/dtlstransportinternal.h"
-#include "p2p/base/fakedtlstransport.h"
-#include "p2p/base/fakeicetransport.h"
-#include "p2p/base/p2pconstants.h"
-#include "pc/rtptransport.h"
-#include "pc/rtptransporttestutil.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/byteorder.h"
-#include "rtc_base/copyonwritebuffer.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/sslidentity.h"
+#include "media/base/fake_rtp.h"
+#include "p2p/base/dtls_transport_internal.h"
+#include "p2p/base/fake_dtls_transport.h"
+#include "p2p/base/fake_ice_transport.h"
+#include "p2p/base/p2p_constants.h"
+#include "pc/rtp_transport.h"
+#include "pc/test/rtp_transport_test_util.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/byte_order.h"
+#include "rtc_base/copy_on_write_buffer.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/ssl_identity.h"
#include "test/gtest.h"
using cricket::FakeDtlsTransport;
diff --git a/pc/dtls_transport.cc b/pc/dtls_transport.cc
index eb1bc04..4709107 100644
--- a/pc/dtls_transport.cc
+++ b/pc/dtls_transport.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/dtlstransport.h"
+#include "pc/dtls_transport.h"
#include <utility>
diff --git a/pc/dtls_transport.h b/pc/dtls_transport.h
index b3f1637..0fdcc0f 100644
--- a/pc/dtls_transport.h
+++ b/pc/dtls_transport.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_DTLSTRANSPORT_H_
-#define PC_DTLSTRANSPORT_H_
+#ifndef PC_DTLS_TRANSPORT_H_
+#define PC_DTLS_TRANSPORT_H_
#include <memory>
-#include "api/dtlstransportinterface.h"
-#include "p2p/base/dtlstransport.h"
-#include "rtc_base/asyncinvoker.h"
+#include "api/dtls_transport_interface.h"
+#include "p2p/base/dtls_transport.h"
+#include "rtc_base/async_invoker.h"
namespace webrtc {
@@ -54,4 +54,4 @@
};
} // namespace webrtc
-#endif // PC_DTLSTRANSPORT_H_
+#endif // PC_DTLS_TRANSPORT_H_
diff --git a/pc/dtlstransport_unittest.cc b/pc/dtlstransport_unittest.cc
index 05e3797..508e557 100644
--- a/pc/dtlstransport_unittest.cc
+++ b/pc/dtlstransport_unittest.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/dtlstransport.h"
+#include "pc/dtls_transport.h"
#include <utility>
#include <vector>
#include "absl/memory/memory.h"
-#include "p2p/base/fakedtlstransport.h"
+#include "p2p/base/fake_dtls_transport.h"
#include "rtc_base/gunit.h"
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/pc/dtmf_sender.cc b/pc/dtmf_sender.cc
index 6d39f5b..f4c3617 100644
--- a/pc/dtmf_sender.cc
+++ b/pc/dtmf_sender.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/dtmfsender.h"
+#include "pc/dtmf_sender.h"
#include <ctype.h>
#include <string.h>
@@ -16,7 +16,7 @@
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/thread.h"
namespace webrtc {
diff --git a/pc/dtmf_sender.h b/pc/dtmf_sender.h
index 59ab549..692c74b 100644
--- a/pc/dtmf_sender.h
+++ b/pc/dtmf_sender.h
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_DTMFSENDER_H_
-#define PC_DTMFSENDER_H_
+#ifndef PC_DTMF_SENDER_H_
+#define PC_DTMF_SENDER_H_
#include <string>
-#include "api/dtmfsenderinterface.h"
+#include "api/dtmf_sender_interface.h"
#include "api/proxy.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ref_count.h"
#include "rtc_base/thread.h"
// DtmfSender is the native implementation of the RTCDTMFSender defined by
@@ -107,4 +107,4 @@
} // namespace webrtc
-#endif // PC_DTMFSENDER_H_
+#endif // PC_DTMF_SENDER_H_
diff --git a/pc/dtmf_sender_unittest.cc b/pc/dtmf_sender_unittest.cc
index 8f9109d..b98b035 100644
--- a/pc/dtmf_sender_unittest.cc
+++ b/pc/dtmf_sender_unittest.cc
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/dtmfsender.h"
+#include "pc/dtmf_sender.h"
#include <stddef.h>
#include <memory>
#include <string>
#include <vector>
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/time_utils.h"
#include "test/gtest.h"
using webrtc::DtmfProviderInterface;
diff --git a/pc/external_hmac.cc b/pc/external_hmac.cc
index 41f13e5..99021f8 100644
--- a/pc/external_hmac.cc
+++ b/pc/external_hmac.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/externalhmac.h"
+#include "pc/external_hmac.h"
#include <stdlib.h> // For malloc/free.
#include <string.h>
diff --git a/pc/external_hmac.h b/pc/external_hmac.h
index eea7c12..3319bea 100644
--- a/pc/external_hmac.h
+++ b/pc/external_hmac.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_EXTERNALHMAC_H_
-#define PC_EXTERNALHMAC_H_
+#ifndef PC_EXTERNAL_HMAC_H_
+#define PC_EXTERNAL_HMAC_H_
// External libsrtp HMAC auth module which implements methods defined in
// auth_type_t.
@@ -69,4 +69,4 @@
srtp_err_status_t external_crypto_init();
-#endif // PC_EXTERNALHMAC_H_
+#endif // PC_EXTERNAL_HMAC_H_
diff --git a/pc/ice_server_parsing.cc b/pc/ice_server_parsing.cc
index 1bb5d87..533d597 100644
--- a/pc/ice_server_parsing.cc
+++ b/pc/ice_server_parsing.cc
@@ -8,19 +8,19 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/iceserverparsing.h"
+#include "pc/ice_server_parsing.h"
#include <stddef.h>
#include <cctype> // For std::isdigit.
#include <string>
-#include "p2p/base/portinterface.h"
+#include "p2p/base/port_interface.h"
#include "rtc_base/arraysize.h"
#include "rtc_base/checks.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
#include "rtc_base/logging.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/string_encode.h"
namespace webrtc {
diff --git a/pc/ice_server_parsing.h b/pc/ice_server_parsing.h
index f1c26c1..c73d803 100644
--- a/pc/ice_server_parsing.h
+++ b/pc/ice_server_parsing.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_ICESERVERPARSING_H_
-#define PC_ICESERVERPARSING_H_
+#ifndef PC_ICE_SERVER_PARSING_H_
+#define PC_ICE_SERVER_PARSING_H_
#include <vector>
-#include "api/peerconnectioninterface.h"
-#include "api/rtcerror.h"
+#include "api/peer_connection_interface.h"
+#include "api/rtc_error.h"
#include "p2p/base/port.h"
-#include "p2p/base/portallocator.h"
+#include "p2p/base/port_allocator.h"
namespace webrtc {
@@ -33,4 +33,4 @@
} // namespace webrtc
-#endif // PC_ICESERVERPARSING_H_
+#endif // PC_ICE_SERVER_PARSING_H_
diff --git a/pc/ice_server_parsing_unittest.cc b/pc/ice_server_parsing_unittest.cc
index 291afd1..0ec59ca 100644
--- a/pc/ice_server_parsing_unittest.cc
+++ b/pc/ice_server_parsing_unittest.cc
@@ -11,10 +11,10 @@
#include <string>
#include <vector>
-#include "p2p/base/portinterface.h"
-#include "pc/iceserverparsing.h"
-#include "rtc_base/ipaddress.h"
-#include "rtc_base/socketaddress.h"
+#include "p2p/base/port_interface.h"
+#include "pc/ice_server_parsing.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/socket_address.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/pc/jsep_ice_candidate.cc b/pc/jsep_ice_candidate.cc
index 4753ca2..c9dc9c1 100644
--- a/pc/jsep_ice_candidate.cc
+++ b/pc/jsep_ice_candidate.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/jsepicecandidate.h"
+#include "api/jsep_ice_candidate.h"
#include <memory>
#include "absl/memory/memory.h"
-#include "pc/webrtcsdp.h"
+#include "pc/webrtc_sdp.h"
namespace webrtc {
diff --git a/pc/jsep_session_description.cc b/pc/jsep_session_description.cc
index d00ca52..9499e9a 100644
--- a/pc/jsep_session_description.cc
+++ b/pc/jsep_session_description.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/jsepsessiondescription.h"
+#include "api/jsep_session_description.h"
#include <memory>
#include "absl/memory/memory.h"
#include "p2p/base/port.h"
-#include "pc/mediasession.h"
-#include "pc/webrtcsdp.h"
+#include "pc/media_session.h"
+#include "pc/webrtc_sdp.h"
#include "rtc_base/arraysize.h"
using cricket::SessionDescription;
diff --git a/pc/jsep_session_description_unittest.cc b/pc/jsep_session_description_unittest.cc
index 04577e2..2eb1db0 100644
--- a/pc/jsep_session_description_unittest.cc
+++ b/pc/jsep_session_description_unittest.cc
@@ -18,18 +18,18 @@
#include "absl/memory/memory.h"
#include "api/candidate.h"
#include "api/jsep.h"
-#include "api/jsepicecandidate.h"
-#include "api/jsepsessiondescription.h"
+#include "api/jsep_ice_candidate.h"
+#include "api/jsep_session_description.h"
#include "media/base/codec.h"
-#include "p2p/base/p2pconstants.h"
+#include "p2p/base/p2p_constants.h"
#include "p2p/base/port.h"
-#include "p2p/base/transportdescription.h"
-#include "p2p/base/transportinfo.h"
-#include "pc/sessiondescription.h"
-#include "pc/webrtcsdp.h"
+#include "p2p/base/transport_description.h"
+#include "p2p/base/transport_info.h"
+#include "pc/session_description.h"
+#include "pc/webrtc_sdp.h"
#include "rtc_base/helpers.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/string_encode.h"
#include "test/gtest.h"
using cricket::MediaProtocolType;
diff --git a/pc/jsep_transport.cc b/pc/jsep_transport.cc
index 3372f19..fd6bd0d 100644
--- a/pc/jsep_transport.cc
+++ b/pc/jsep_transport.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/jseptransport.h"
+#include "pc/jsep_transport.h"
#include <stddef.h>
#include <stdint.h>
@@ -19,10 +19,10 @@
#include "absl/memory/memory.h"
#include "api/array_view.h"
#include "api/candidate.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/p2ptransportchannel.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/p2p_transport_channel.h"
#include "rtc_base/checks.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
#include "rtc_base/logging.h"
#include "rtc_base/strings/string_builder.h"
diff --git a/pc/jsep_transport.h b/pc/jsep_transport.h
index dee5500..648fe29 100644
--- a/pc/jsep_transport.h
+++ b/pc/jsep_transport.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_JSEPTRANSPORT_H_
-#define PC_JSEPTRANSPORT_H_
+#ifndef PC_JSEP_TRANSPORT_H_
+#define PC_JSEP_TRANSPORT_H_
#include <map>
#include <memory>
@@ -20,21 +20,21 @@
#include "api/candidate.h"
#include "api/jsep.h"
#include "api/media_transport_interface.h"
-#include "p2p/base/dtlstransport.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/transportinfo.h"
-#include "pc/dtlssrtptransport.h"
-#include "pc/dtlstransport.h"
-#include "pc/rtcpmuxfilter.h"
-#include "pc/rtptransport.h"
-#include "pc/sessiondescription.h"
-#include "pc/srtpfilter.h"
-#include "pc/srtptransport.h"
-#include "pc/transportstats.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "p2p/base/dtls_transport.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/transport_info.h"
+#include "pc/dtls_srtp_transport.h"
+#include "pc/dtls_transport.h"
+#include "pc/rtcp_mux_filter.h"
+#include "pc/rtp_transport.h"
+#include "pc/session_description.h"
+#include "pc/srtp_filter.h"
+#include "pc/srtp_transport.h"
+#include "pc/transport_stats.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/ssl_stream_adapter.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
namespace cricket {
@@ -307,4 +307,4 @@
} // namespace cricket
-#endif // PC_JSEPTRANSPORT_H_
+#endif // PC_JSEP_TRANSPORT_H_
diff --git a/pc/jsep_transport_controller.cc b/pc/jsep_transport_controller.cc
index c1f18b9..5163e01 100644
--- a/pc/jsep_transport_controller.cc
+++ b/pc/jsep_transport_controller.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/jseptransportcontroller.h"
+#include "pc/jsep_transport_controller.h"
#include <algorithm>
#include <memory>
@@ -16,7 +16,7 @@
#include "absl/memory/memory.h"
#include "p2p/base/port.h"
-#include "pc/srtpfilter.h"
+#include "pc/srtp_filter.h"
#include "rtc_base/bind.h"
#include "rtc_base/checks.h"
#include "rtc_base/key_derivation.h"
diff --git a/pc/jsep_transport_controller.h b/pc/jsep_transport_controller.h
index 653c4c9..1f4a632 100644
--- a/pc/jsep_transport_controller.h
+++ b/pc/jsep_transport_controller.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_JSEPTRANSPORTCONTROLLER_H_
-#define PC_JSEPTRANSPORTCONTROLLER_H_
+#ifndef PC_JSEP_TRANSPORT_CONTROLLER_H_
+#define PC_JSEP_TRANSPORT_CONTROLLER_H_
#include <map>
#include <memory>
@@ -18,23 +18,23 @@
#include <vector>
#include "api/candidate.h"
-#include "api/crypto/cryptooptions.h"
+#include "api/crypto/crypto_options.h"
#include "api/media_transport_interface.h"
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
#include "logging/rtc_event_log/rtc_event_log.h"
-#include "media/sctp/sctptransportinternal.h"
-#include "p2p/base/dtlstransport.h"
-#include "p2p/base/p2ptransportchannel.h"
-#include "p2p/base/transportfactoryinterface.h"
+#include "media/sctp/sctp_transport_internal.h"
+#include "p2p/base/dtls_transport.h"
+#include "p2p/base/p2p_transport_channel.h"
+#include "p2p/base/transport_factory_interface.h"
#include "pc/channel.h"
-#include "pc/dtlssrtptransport.h"
-#include "pc/dtlstransport.h"
-#include "pc/jseptransport.h"
-#include "pc/rtptransport.h"
-#include "pc/srtptransport.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/refcountedobject.h"
+#include "pc/dtls_srtp_transport.h"
+#include "pc/dtls_transport.h"
+#include "pc/jsep_transport.h"
+#include "pc/rtp_transport.h"
+#include "pc/srtp_transport.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
namespace rtc {
@@ -373,4 +373,4 @@
} // namespace webrtc
-#endif // PC_JSEPTRANSPORTCONTROLLER_H_
+#endif // PC_JSEP_TRANSPORT_CONTROLLER_H_
diff --git a/pc/jsep_transport_controller_unittest.cc b/pc/jsep_transport_controller_unittest.cc
index c019013..d34c4a9 100644
--- a/pc/jsep_transport_controller_unittest.cc
+++ b/pc/jsep_transport_controller_unittest.cc
@@ -14,11 +14,11 @@
#include "absl/memory/memory.h"
#include "api/media_transport_interface.h"
#include "api/test/fake_media_transport.h"
-#include "p2p/base/fakedtlstransport.h"
-#include "p2p/base/fakeicetransport.h"
-#include "p2p/base/transportfactoryinterface.h"
-#include "p2p/base/transportinfo.h"
-#include "pc/jseptransportcontroller.h"
+#include "p2p/base/fake_dtls_transport.h"
+#include "p2p/base/fake_ice_transport.h"
+#include "p2p/base/transport_factory_interface.h"
+#include "p2p/base/transport_info.h"
+#include "pc/jsep_transport_controller.h"
#include "rtc_base/gunit.h"
#include "rtc_base/thread.h"
#include "test/gtest.h"
diff --git a/pc/jsep_transport_unittest.cc b/pc/jsep_transport_unittest.cc
index 4d68d37..efb2394 100644
--- a/pc/jsep_transport_unittest.cc
+++ b/pc/jsep_transport_unittest.cc
@@ -13,10 +13,10 @@
#include <utility>
#include "absl/memory/memory.h"
-#include "media/base/fakertp.h"
-#include "p2p/base/fakedtlstransport.h"
-#include "p2p/base/fakeicetransport.h"
-#include "pc/jseptransport.h"
+#include "media/base/fake_rtp.h"
+#include "p2p/base/fake_dtls_transport.h"
+#include "p2p/base/fake_ice_transport.h"
+#include "pc/jsep_transport.h"
#include "rtc_base/gunit.h"
namespace cricket {
diff --git a/pc/local_audio_source.cc b/pc/local_audio_source.cc
index 2e89a7a..22ab1c3 100644
--- a/pc/local_audio_source.cc
+++ b/pc/local_audio_source.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/localaudiosource.h"
+#include "pc/local_audio_source.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
using webrtc::MediaSourceInterface;
diff --git a/pc/local_audio_source.h b/pc/local_audio_source.h
index dfd72e0..0223fd4 100644
--- a/pc/local_audio_source.h
+++ b/pc/local_audio_source.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_LOCALAUDIOSOURCE_H_
-#define PC_LOCALAUDIOSOURCE_H_
+#ifndef PC_LOCAL_AUDIO_SOURCE_H_
+#define PC_LOCAL_AUDIO_SOURCE_H_
#include "api/audio_options.h"
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "api/notifier.h"
#include "rtc_base/scoped_ref_ptr.h"
@@ -47,4 +47,4 @@
} // namespace webrtc
-#endif // PC_LOCALAUDIOSOURCE_H_
+#endif // PC_LOCAL_AUDIO_SOURCE_H_
diff --git a/pc/local_audio_source_unittest.cc b/pc/local_audio_source_unittest.cc
index d28014a..76d3b36 100644
--- a/pc/local_audio_source_unittest.cc
+++ b/pc/local_audio_source_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/localaudiosource.h"
+#include "pc/local_audio_source.h"
#include "absl/types/optional.h"
#include "test/gtest.h"
diff --git a/pc/media_constraints_interface_unittest.cc b/pc/media_constraints_interface_unittest.cc
index 4f46e70..b62e092 100644
--- a/pc/media_constraints_interface_unittest.cc
+++ b/pc/media_constraints_interface_unittest.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/mediaconstraintsinterface.h"
+#include "api/media_constraints_interface.h"
#include "absl/types/optional.h"
-#include "api/test/fakeconstraints.h"
-#include "media/base/mediaconfig.h"
+#include "api/test/fake_constraints.h"
+#include "media/base/media_config.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/pc/media_session.cc b/pc/media_session.cc
index e650dd2..99e7e40 100644
--- a/pc/media_session.cc
+++ b/pc/media_session.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/mediasession.h"
+#include "pc/media_session.h"
#include <algorithm> // For std::find_if, std::sort.
#include <functional>
@@ -21,13 +21,13 @@
#include "absl/memory/memory.h"
#include "absl/strings/match.h"
#include "absl/types/optional.h"
-#include "api/cryptoparams.h"
+#include "api/crypto_params.h"
#include "media/base/h264_profile_level_id.h"
-#include "media/base/mediaconstants.h"
-#include "p2p/base/p2pconstants.h"
-#include "pc/channelmanager.h"
-#include "pc/rtpmediautils.h"
-#include "pc/srtpfilter.h"
+#include "media/base/media_constants.h"
+#include "p2p/base/p2p_constants.h"
+#include "pc/channel_manager.h"
+#include "pc/rtp_media_utils.h"
+#include "pc/srtp_filter.h"
#include "pc/unique_id_generator.h"
#include "rtc_base/checks.h"
#include "rtc_base/helpers.h"
diff --git a/pc/media_session.h b/pc/media_session.h
index f732cb2..2251b5b 100644
--- a/pc/media_session.h
+++ b/pc/media_session.h
@@ -10,8 +10,8 @@
// Types and classes used in media session descriptions.
-#ifndef PC_MEDIASESSION_H_
-#define PC_MEDIASESSION_H_
+#ifndef PC_MEDIA_SESSION_H_
+#define PC_MEDIA_SESSION_H_
#include <algorithm>
#include <map>
@@ -19,13 +19,13 @@
#include <string>
#include <vector>
-#include "api/mediatypes.h"
-#include "media/base/mediaconstants.h"
-#include "media/base/mediaengine.h" // For DataChannelType
-#include "p2p/base/icecredentialsiterator.h"
-#include "p2p/base/transportdescriptionfactory.h"
-#include "pc/jseptransport.h"
-#include "pc/sessiondescription.h"
+#include "api/media_types.h"
+#include "media/base/media_constants.h"
+#include "media/base/media_engine.h" // For DataChannelType
+#include "p2p/base/ice_credentials_iterator.h"
+#include "p2p/base/transport_description_factory.h"
+#include "pc/jsep_transport.h"
+#include "pc/session_description.h"
namespace cricket {
@@ -371,4 +371,4 @@
} // namespace cricket
-#endif // PC_MEDIASESSION_H_
+#endif // PC_MEDIA_SESSION_H_
diff --git a/pc/media_session_unittest.cc b/pc/media_session_unittest.cc
index c73c19e..b6be353 100644
--- a/pc/media_session_unittest.cc
+++ b/pc/media_session_unittest.cc
@@ -15,18 +15,18 @@
#include "absl/memory/memory.h"
#include "media/base/codec.h"
-#include "media/base/testutils.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/transportdescription.h"
-#include "p2p/base/transportinfo.h"
-#include "pc/mediasession.h"
-#include "pc/rtpmediautils.h"
-#include "pc/srtpfilter.h"
+#include "media/base/test_utils.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/transport_description.h"
+#include "p2p/base/transport_info.h"
+#include "pc/media_session.h"
+#include "pc/rtp_media_utils.h"
+#include "pc/srtp_filter.h"
#include "rtc_base/checks.h"
-#include "rtc_base/fakesslidentity.h"
+#include "rtc_base/fake_ssl_identity.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/ssl_adapter.h"
#include "rtc_base/strings/string_builder.h"
#include "test/gmock.h"
diff --git a/pc/media_stream.cc b/pc/media_stream.cc
index 2e857fa..e083b96 100644
--- a/pc/media_stream.cc
+++ b/pc/media_stream.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/mediastream.h"
+#include "pc/media_stream.h"
#include <stddef.h>
#include <vector>
#include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
namespace webrtc {
diff --git a/pc/media_stream.h b/pc/media_stream.h
index e170c6e..e513226 100644
--- a/pc/media_stream.h
+++ b/pc/media_stream.h
@@ -10,12 +10,12 @@
// This file contains the implementation of MediaStreamInterface interface.
-#ifndef PC_MEDIASTREAM_H_
-#define PC_MEDIASTREAM_H_
+#ifndef PC_MEDIA_STREAM_H_
+#define PC_MEDIA_STREAM_H_
#include <string>
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "api/notifier.h"
#include "rtc_base/scoped_ref_ptr.h"
@@ -55,4 +55,4 @@
} // namespace webrtc
-#endif // PC_MEDIASTREAM_H_
+#endif // PC_MEDIA_STREAM_H_
diff --git a/pc/media_stream_observer.cc b/pc/media_stream_observer.cc
index 1a611a3..e3ef3c7 100644
--- a/pc/media_stream_observer.cc
+++ b/pc/media_stream_observer.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/mediastreamobserver.h"
+#include "pc/media_stream_observer.h"
#include <algorithm>
#include <string>
diff --git a/pc/media_stream_observer.h b/pc/media_stream_observer.h
index 217c9b6..faa6772 100644
--- a/pc/media_stream_observer.h
+++ b/pc/media_stream_observer.h
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_MEDIASTREAMOBSERVER_H_
-#define PC_MEDIASTREAMOBSERVER_H_
+#ifndef PC_MEDIA_STREAM_OBSERVER_H_
+#define PC_MEDIA_STREAM_OBSERVER_H_
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
@@ -45,4 +45,4 @@
} // namespace webrtc
-#endif // PC_MEDIASTREAMOBSERVER_H_
+#endif // PC_MEDIA_STREAM_OBSERVER_H_
diff --git a/pc/media_stream_track.h b/pc/media_stream_track.h
index 33ffbe2..358d89a 100644
--- a/pc/media_stream_track.h
+++ b/pc/media_stream_track.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_MEDIASTREAMTRACK_H_
-#define PC_MEDIASTREAMTRACK_H_
+#ifndef PC_MEDIA_STREAM_TRACK_H_
+#define PC_MEDIA_STREAM_TRACK_H_
#include <string>
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "api/notifier.h"
namespace webrtc {
@@ -59,4 +59,4 @@
} // namespace webrtc
-#endif // PC_MEDIASTREAMTRACK_H_
+#endif // PC_MEDIA_STREAM_TRACK_H_
diff --git a/pc/media_stream_unittest.cc b/pc/media_stream_unittest.cc
index 69f6e8c..4b25e78 100644
--- a/pc/media_stream_unittest.cc
+++ b/pc/media_stream_unittest.cc
@@ -11,10 +11,10 @@
#include <stddef.h>
#include <string>
-#include "pc/audiotrack.h"
-#include "pc/mediastream.h"
-#include "pc/test/fakevideotracksource.h"
-#include "pc/videotrack.h"
+#include "pc/audio_track.h"
+#include "pc/media_stream.h"
+#include "pc/test/fake_video_track_source.h"
+#include "pc/video_track.h"
#include "rtc_base/thread.h"
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/pc/peer_connection.cc b/pc/peer_connection.cc
index 2cf14a1..2d68c81 100644
--- a/pc/peer_connection.cc
+++ b/pc/peer_connection.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/peerconnection.h"
+#include "pc/peer_connection.h"
#include <algorithm>
#include <limits>
@@ -19,37 +19,37 @@
#include "absl/memory/memory.h"
#include "absl/strings/match.h"
-#include "api/jsepicecandidate.h"
-#include "api/jsepsessiondescription.h"
-#include "api/mediastreamproxy.h"
-#include "api/mediastreamtrackproxy.h"
-#include "api/umametrics.h"
+#include "api/jsep_ice_candidate.h"
+#include "api/jsep_session_description.h"
+#include "api/media_stream_proxy.h"
+#include "api/media_stream_track_proxy.h"
+#include "api/uma_metrics.h"
#include "call/call.h"
-#include "logging/rtc_event_log/icelogger.h"
+#include "logging/rtc_event_log/ice_logger.h"
#include "logging/rtc_event_log/output/rtc_event_log_output_file.h"
#include "logging/rtc_event_log/rtc_event_log.h"
-#include "media/sctp/sctptransport.h"
-#include "pc/audiotrack.h"
+#include "media/sctp/sctp_transport.h"
+#include "pc/audio_track.h"
#include "pc/channel.h"
-#include "pc/channelmanager.h"
-#include "pc/dtmfsender.h"
-#include "pc/mediastream.h"
-#include "pc/mediastreamobserver.h"
-#include "pc/remoteaudiosource.h"
-#include "pc/rtpmediautils.h"
-#include "pc/rtpreceiver.h"
-#include "pc/rtpsender.h"
-#include "pc/sctputils.h"
-#include "pc/sdputils.h"
-#include "pc/streamcollection.h"
+#include "pc/channel_manager.h"
+#include "pc/dtmf_sender.h"
+#include "pc/media_stream.h"
+#include "pc/media_stream_observer.h"
+#include "pc/remote_audio_source.h"
+#include "pc/rtp_media_utils.h"
+#include "pc/rtp_receiver.h"
+#include "pc/rtp_sender.h"
+#include "pc/sctp_utils.h"
+#include "pc/sdp_utils.h"
+#include "pc/stream_collection.h"
#include "pc/unique_id_generator.h"
-#include "pc/videocapturertracksource.h"
-#include "pc/videotrack.h"
+#include "pc/video_capturer_track_source.h"
+#include "pc/video_track.h"
#include "rtc_base/bind.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/trace_event.h"
#include "system_wrappers/include/clock.h"
diff --git a/pc/peer_connection.h b/pc/peer_connection.h
index c663520..b11c867 100644
--- a/pc/peer_connection.h
+++ b/pc/peer_connection.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_PEERCONNECTION_H_
-#define PC_PEERCONNECTION_H_
+#ifndef PC_PEER_CONNECTION_H_
+#define PC_PEER_CONNECTION_H_
#include <map>
#include <memory>
@@ -18,18 +18,18 @@
#include <vector>
#include "api/media_transport_interface.h"
-#include "api/peerconnectioninterface.h"
-#include "api/turncustomizer.h"
-#include "pc/iceserverparsing.h"
-#include "pc/jseptransportcontroller.h"
-#include "pc/peerconnectionfactory.h"
-#include "pc/peerconnectioninternal.h"
-#include "pc/rtcstatscollector.h"
-#include "pc/rtptransceiver.h"
-#include "pc/statscollector.h"
-#include "pc/streamcollection.h"
+#include "api/peer_connection_interface.h"
+#include "api/turn_customizer.h"
+#include "pc/ice_server_parsing.h"
+#include "pc/jsep_transport_controller.h"
+#include "pc/peer_connection_factory.h"
+#include "pc/peer_connection_internal.h"
+#include "pc/rtc_stats_collector.h"
+#include "pc/rtp_transceiver.h"
+#include "pc/stats_collector.h"
+#include "pc/stream_collection.h"
#include "pc/unique_id_generator.h"
-#include "pc/webrtcsessiondescriptionfactory.h"
+#include "pc/webrtc_session_description_factory.h"
namespace webrtc {
@@ -1151,4 +1151,4 @@
} // namespace webrtc
-#endif // PC_PEERCONNECTION_H_
+#endif // PC_PEER_CONNECTION_H_
diff --git a/pc/peer_connection_bundle_unittest.cc b/pc/peer_connection_bundle_unittest.cc
index fca9914..8f44c39 100644
--- a/pc/peer_connection_bundle_unittest.cc
+++ b/pc/peer_connection_bundle_unittest.cc
@@ -11,24 +11,24 @@
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
#include "api/create_peerconnection_factory.h"
-#include "api/peerconnectionproxy.h"
+#include "api/peer_connection_proxy.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
-#include "p2p/base/fakeportallocator.h"
-#include "p2p/base/teststunserver.h"
-#include "p2p/client/basicportallocator.h"
-#include "pc/mediasession.h"
-#include "pc/peerconnection.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/sdputils.h"
+#include "p2p/base/fake_port_allocator.h"
+#include "p2p/base/test_stun_server.h"
+#include "p2p/client/basic_port_allocator.h"
+#include "pc/media_session.h"
+#include "pc/peer_connection.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/sdp_utils.h"
#ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
#endif
#include "absl/memory/memory.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "rtc_base/fakenetwork.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "rtc_base/fake_network.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
#include "test/gmock.h"
namespace webrtc {
diff --git a/pc/peer_connection_crypto_unittest.cc b/pc/peer_connection_crypto_unittest.cc
index 6f7e23b..b25aeda 100644
--- a/pc/peer_connection_crypto_unittest.cc
+++ b/pc/peer_connection_crypto_unittest.cc
@@ -13,18 +13,18 @@
#include "api/create_peerconnection_factory.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
-#include "p2p/base/fakeportallocator.h"
-#include "pc/mediasession.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/sdputils.h"
+#include "p2p/base/fake_port_allocator.h"
+#include "pc/media_session.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/sdp_utils.h"
#ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
#endif
#include "absl/memory/memory.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "pc/test/fakertccertificategenerator.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "pc/test/fake_rtc_certificate_generator.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
namespace webrtc {
diff --git a/pc/peer_connection_data_channel_unittest.cc b/pc/peer_connection_data_channel_unittest.cc
index 8cb295b..c120143 100644
--- a/pc/peer_connection_data_channel_unittest.cc
+++ b/pc/peer_connection_data_channel_unittest.cc
@@ -15,39 +15,39 @@
#include <vector>
#include "absl/types/optional.h"
-#include "api/call/callfactoryinterface.h"
+#include "api/call/call_factory_interface.h"
#include "api/jsep.h"
#include "api/media_transport_interface.h"
-#include "api/mediatypes.h"
-#include "api/peerconnectioninterface.h"
-#include "api/peerconnectionproxy.h"
+#include "api/media_types.h"
+#include "api/peer_connection_interface.h"
+#include "api/peer_connection_proxy.h"
#include "api/test/fake_media_transport.h"
#include "media/base/codec.h"
-#include "media/base/fakemediaengine.h"
-#include "media/base/mediaconstants.h"
-#include "media/base/mediaengine.h"
-#include "media/sctp/sctptransportinternal.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/portallocator.h"
-#include "pc/mediasession.h"
-#include "pc/peerconnection.h"
-#include "pc/peerconnectionfactory.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/sdputils.h"
-#include "pc/sessiondescription.h"
-#include "pc/test/mockpeerconnectionobservers.h"
+#include "media/base/fake_media_engine.h"
+#include "media/base/media_constants.h"
+#include "media/base/media_engine.h"
+#include "media/sctp/sctp_transport_internal.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/port_allocator.h"
+#include "pc/media_session.h"
+#include "pc/peer_connection.h"
+#include "pc/peer_connection_factory.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/sdp_utils.h"
+#include "pc/session_description.h"
+#include "pc/test/mock_peer_connection_observers.h"
#include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/rtccertificategenerator.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/rtc_certificate_generator.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/thread.h"
#include "test/gtest.h"
#ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
#endif
#include "absl/memory/memory.h"
-#include "pc/test/fakesctptransport.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "pc/test/fake_sctp_transport.h"
+#include "rtc_base/virtual_socket_server.h"
namespace webrtc {
diff --git a/pc/peer_connection_end_to_end_unittest.cc b/pc/peer_connection_end_to_end_unittest.cc
index 18f3563..dd56b26 100644
--- a/pc/peer_connection_end_to_end_unittest.cc
+++ b/pc/peer_connection_end_to_end_unittest.cc
@@ -23,11 +23,11 @@
#include "rtc_base/logging.h"
#ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
#endif
-#include "pc/test/peerconnectiontestwrapper.h"
+#include "pc/test/peer_connection_test_wrapper.h"
// Notice that mockpeerconnectionobservers.h must be included after the above!
-#include "pc/test/mockpeerconnectionobservers.h"
+#include "pc/test/mock_peer_connection_observers.h"
#include "test/mock_audio_decoder.h"
#include "test/mock_audio_decoder_factory.h"
#include "test/mock_audio_encoder_factory.h"
diff --git a/pc/peer_connection_factory.cc b/pc/peer_connection_factory.cc
index e1b3e6c..4c52b21 100644
--- a/pc/peer_connection_factory.cc
+++ b/pc/peer_connection_factory.cc
@@ -8,43 +8,43 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/peerconnectionfactory.h"
+#include "pc/peer_connection_factory.h"
#include <utility>
#include <vector>
#include "absl/memory/memory.h"
#include "api/fec_controller.h"
+#include "api/media_constraints_interface.h"
+#include "api/media_stream_proxy.h"
+#include "api/media_stream_track_proxy.h"
#include "api/media_transport_interface.h"
-#include "api/mediaconstraintsinterface.h"
-#include "api/mediastreamproxy.h"
-#include "api/mediastreamtrackproxy.h"
-#include "api/peerconnectionfactoryproxy.h"
-#include "api/peerconnectionproxy.h"
-#include "api/turncustomizer.h"
-#include "api/videosourceproxy.h"
+#include "api/peer_connection_factory_proxy.h"
+#include "api/peer_connection_proxy.h"
+#include "api/turn_customizer.h"
+#include "api/video_track_source_proxy.h"
#include "logging/rtc_event_log/rtc_event_log.h"
-#include "media/base/rtpdataengine.h"
-#include "media/sctp/sctptransport.h"
-#include "pc/rtpparametersconversion.h"
+#include "media/base/rtp_data_engine.h"
+#include "media/sctp/sctp_transport.h"
+#include "pc/rtp_parameters_conversion.h"
#include "rtc_base/bind.h"
#include "rtc_base/checks.h"
// Adding 'nogncheck' to disable the gn include headers check to support modular
// WebRTC build targets.
// TODO(zhihuang): This wouldn't be necessary if the interface and
// implementation of the media engine were in separate build targets.
-#include "media/engine/webrtcmediaengine.h" // nogncheck
-#include "media/engine/webrtcvideodecoderfactory.h" // nogncheck
-#include "media/engine/webrtcvideoencoderfactory.h" // nogncheck
+#include "media/engine/webrtc_media_engine.h" // nogncheck
+#include "media/engine/webrtc_video_decoder_factory.h" // nogncheck
+#include "media/engine/webrtc_video_encoder_factory.h" // nogncheck
#include "modules/audio_device/include/audio_device.h" // nogncheck
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/client/basicportallocator.h"
-#include "pc/audiotrack.h"
-#include "pc/localaudiosource.h"
-#include "pc/mediastream.h"
-#include "pc/peerconnection.h"
-#include "pc/videocapturertracksource.h"
-#include "pc/videotrack.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/client/basic_port_allocator.h"
+#include "pc/audio_track.h"
+#include "pc/local_audio_source.h"
+#include "pc/media_stream.h"
+#include "pc/peer_connection.h"
+#include "pc/video_capturer_track_source.h"
+#include "pc/video_track.h"
#include "system_wrappers/include/field_trial.h"
namespace webrtc {
diff --git a/pc/peer_connection_factory.h b/pc/peer_connection_factory.h
index e64eb10..6b1958c 100644
--- a/pc/peer_connection_factory.h
+++ b/pc/peer_connection_factory.h
@@ -9,18 +9,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_PEERCONNECTIONFACTORY_H_
-#define PC_PEERCONNECTIONFACTORY_H_
+#ifndef PC_PEER_CONNECTION_FACTORY_H_
+#define PC_PEER_CONNECTION_FACTORY_H_
#include <memory>
#include <string>
+#include "api/media_stream_interface.h"
#include "api/media_transport_interface.h"
-#include "api/mediastreaminterface.h"
-#include "api/peerconnectioninterface.h"
-#include "media/sctp/sctptransportinternal.h"
-#include "pc/channelmanager.h"
-#include "rtc_base/rtccertificategenerator.h"
+#include "api/peer_connection_interface.h"
+#include "media/sctp/sctp_transport_internal.h"
+#include "pc/channel_manager.h"
+#include "rtc_base/rtc_certificate_generator.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/thread.h"
@@ -156,4 +156,4 @@
} // namespace webrtc
-#endif // PC_PEERCONNECTIONFACTORY_H_
+#endif // PC_PEER_CONNECTION_FACTORY_H_
diff --git a/pc/peer_connection_factory_unittest.cc b/pc/peer_connection_factory_unittest.cc
index 01a6fb2..3f3cc15 100644
--- a/pc/peer_connection_factory_unittest.cc
+++ b/pc/peer_connection_factory_unittest.cc
@@ -20,29 +20,29 @@
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
#include "api/create_peerconnection_factory.h"
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
#include "api/jsep.h"
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
#include "api/video_codecs/video_decoder_factory.h"
#include "api/video_codecs/video_encoder_factory.h"
-#include "media/base/fakevideocapturer.h"
+#include "media/base/fake_video_capturer.h"
#include "modules/audio_device/include/audio_device.h"
#include "modules/audio_processing/include/audio_processing.h"
-#include "p2p/base/fakeportallocator.h"
+#include "p2p/base/fake_port_allocator.h"
#include "p2p/base/port.h"
-#include "p2p/base/portinterface.h"
-#include "pc/peerconnectionfactory.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "rtc_base/socketaddress.h"
+#include "p2p/base/port_interface.h"
+#include "pc/peer_connection_factory.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "rtc_base/socket_address.h"
#include "test/gtest.h"
#ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
#endif
-#include "pc/test/fakertccertificategenerator.h"
-#include "pc/test/fakevideotrackrenderer.h"
+#include "pc/test/fake_rtc_certificate_generator.h"
+#include "pc/test/fake_video_track_renderer.h"
using webrtc::DataChannelInterface;
using webrtc::FakeVideoTrackRenderer;
diff --git a/pc/peer_connection_histogram_unittest.cc b/pc/peer_connection_histogram_unittest.cc
index 987fa3a..2bbebdb 100644
--- a/pc/peer_connection_histogram_unittest.cc
+++ b/pc/peer_connection_histogram_unittest.cc
@@ -16,28 +16,28 @@
#include "absl/memory/memory.h"
#include "absl/types/optional.h"
-#include "api/call/callfactoryinterface.h"
+#include "api/call/call_factory_interface.h"
#include "api/jsep.h"
-#include "api/peerconnectioninterface.h"
-#include "api/peerconnectionproxy.h"
-#include "api/rtcerror.h"
-#include "media/base/fakemediaengine.h"
-#include "p2p/base/portallocator.h"
-#include "p2p/client/basicportallocator.h"
-#include "pc/peerconnection.h"
-#include "pc/peerconnectionfactory.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/sdputils.h"
-#include "pc/test/mockpeerconnectionobservers.h"
+#include "api/peer_connection_interface.h"
+#include "api/peer_connection_proxy.h"
+#include "api/rtc_error.h"
+#include "media/base/fake_media_engine.h"
+#include "p2p/base/port_allocator.h"
+#include "p2p/client/basic_port_allocator.h"
+#include "pc/peer_connection.h"
+#include "pc/peer_connection_factory.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/sdp_utils.h"
+#include "pc/test/mock_peer_connection_observers.h"
#include "rtc_base/checks.h"
-#include "rtc_base/fakenetwork.h"
+#include "rtc_base/fake_network.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/rtccertificategenerator.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/rtc_certificate_generator.h"
#include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
#include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
#include "system_wrappers/include/metrics.h"
#include "test/gtest.h"
diff --git a/pc/peer_connection_ice_unittest.cc b/pc/peer_connection_ice_unittest.cc
index 619705b..4ef5458 100644
--- a/pc/peer_connection_ice_unittest.cc
+++ b/pc/peer_connection_ice_unittest.cc
@@ -8,29 +8,29 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/fakeportallocator.h"
-#include "p2p/base/teststunserver.h"
-#include "p2p/client/basicportallocator.h"
-#include "pc/mediasession.h"
-#include "pc/peerconnection.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/sdputils.h"
+#include "p2p/base/fake_port_allocator.h"
+#include "p2p/base/test_stun_server.h"
+#include "p2p/client/basic_port_allocator.h"
+#include "pc/media_session.h"
+#include "pc/peer_connection.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/sdp_utils.h"
#ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
#endif
#include "absl/memory/memory.h"
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
#include "api/create_peerconnection_factory.h"
-#include "api/peerconnectionproxy.h"
-#include "api/umametrics.h"
+#include "api/peer_connection_proxy.h"
+#include "api/uma_metrics.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "rtc_base/fakenetwork.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "rtc_base/fake_network.h"
#include "rtc_base/gunit.h"
#include "rtc_base/strings/string_builder.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
#include "system_wrappers/include/metrics.h"
namespace webrtc {
diff --git a/pc/peer_connection_integrationtest.cc b/pc/peer_connection_integrationtest.cc
index 0bd3d09..84c5c88 100644
--- a/pc/peer_connection_integrationtest.cc
+++ b/pc/peer_connection_integrationtest.cc
@@ -25,12 +25,12 @@
#include "absl/memory/memory.h"
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "api/mediastreaminterface.h"
-#include "api/peerconnectioninterface.h"
-#include "api/peerconnectionproxy.h"
-#include "api/rtpreceiverinterface.h"
+#include "api/media_stream_interface.h"
+#include "api/peer_connection_interface.h"
+#include "api/peer_connection_proxy.h"
+#include "api/rtp_receiver_interface.h"
#include "api/test/loopback_media_transport.h"
-#include "api/umametrics.h"
+#include "api/uma_metrics.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
#include "api/video_codecs/sdp_video_format.h"
@@ -38,35 +38,35 @@
#include "logging/rtc_event_log/fake_rtc_event_log_factory.h"
#include "logging/rtc_event_log/rtc_event_log_factory.h"
#include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
-#include "media/engine/fakewebrtcvideoengine.h"
-#include "media/engine/webrtcmediaengine.h"
+#include "media/engine/fake_webrtc_video_engine.h"
+#include "media/engine/webrtc_media_engine.h"
#include "modules/audio_processing/include/audio_processing.h"
-#include "p2p/base/mockasyncresolver.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/portinterface.h"
-#include "p2p/base/teststunserver.h"
-#include "p2p/base/testturncustomizer.h"
-#include "p2p/base/testturnserver.h"
-#include "p2p/client/basicportallocator.h"
-#include "pc/dtmfsender.h"
-#include "pc/localaudiosource.h"
-#include "pc/mediasession.h"
-#include "pc/peerconnection.h"
-#include "pc/peerconnectionfactory.h"
-#include "pc/rtpmediautils.h"
-#include "pc/sessiondescription.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "pc/test/fakeperiodicvideotracksource.h"
-#include "pc/test/fakertccertificategenerator.h"
-#include "pc/test/fakevideotrackrenderer.h"
-#include "pc/test/mockpeerconnectionobservers.h"
-#include "rtc_base/fakenetwork.h"
-#include "rtc_base/firewallsocketserver.h"
+#include "p2p/base/mock_async_resolver.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/port_interface.h"
+#include "p2p/base/test_stun_server.h"
+#include "p2p/base/test_turn_customizer.h"
+#include "p2p/base/test_turn_server.h"
+#include "p2p/client/basic_port_allocator.h"
+#include "pc/dtmf_sender.h"
+#include "pc/local_audio_source.h"
+#include "pc/media_session.h"
+#include "pc/peer_connection.h"
+#include "pc/peer_connection_factory.h"
+#include "pc/rtp_media_utils.h"
+#include "pc/session_description.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "pc/test/fake_periodic_video_track_source.h"
+#include "pc/test/fake_rtc_certificate_generator.h"
+#include "pc/test/fake_video_track_renderer.h"
+#include "pc/test/mock_peer_connection_observers.h"
+#include "rtc_base/fake_network.h"
+#include "rtc_base/firewall_socket_server.h"
#include "rtc_base/gunit.h"
#include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/testcertificateverifier.h"
-#include "rtc_base/timeutils.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/test_certificate_verifier.h"
+#include "rtc_base/time_utils.h"
+#include "rtc_base/virtual_socket_server.h"
#include "system_wrappers/include/metrics.h"
#include "test/gmock.h"
diff --git a/pc/peer_connection_interface_unittest.cc b/pc/peer_connection_interface_unittest.cc
index 5b9f775..9cd1e14 100644
--- a/pc/peer_connection_interface_unittest.cc
+++ b/pc/peer_connection_interface_unittest.cc
@@ -23,19 +23,19 @@
#include "api/audio_codecs/audio_encoder_factory.h"
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "api/call/callfactoryinterface.h"
+#include "api/call/call_factory_interface.h"
#include "api/create_peerconnection_factory.h"
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
#include "api/jsep.h"
-#include "api/jsepsessiondescription.h"
-#include "api/mediastreaminterface.h"
-#include "api/mediatypes.h"
-#include "api/peerconnectioninterface.h"
-#include "api/rtcerror.h"
-#include "api/rtceventlogoutput.h"
-#include "api/rtpreceiverinterface.h"
-#include "api/rtpsenderinterface.h"
-#include "api/rtptransceiverinterface.h"
+#include "api/jsep_session_description.h"
+#include "api/media_stream_interface.h"
+#include "api/media_types.h"
+#include "api/peer_connection_interface.h"
+#include "api/rtc_error.h"
+#include "api/rtc_event_log_output.h"
+#include "api/rtp_receiver_interface.h"
+#include "api/rtp_sender_interface.h"
+#include "api/rtp_transceiver_interface.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
#include "api/video_codecs/video_decoder_factory.h"
@@ -45,54 +45,54 @@
#include "logging/rtc_event_log/rtc_event_log_factory.h"
#include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
#include "media/base/codec.h"
-#include "media/base/fakevideocapturer.h"
-#include "media/base/mediaconfig.h"
-#include "media/base/mediaengine.h"
-#include "media/base/streamparams.h"
-#include "media/base/videocapturer.h"
-#include "media/engine/webrtcmediaengine.h"
-#include "media/sctp/sctptransportinternal.h"
+#include "media/base/fake_video_capturer.h"
+#include "media/base/media_config.h"
+#include "media/base/media_engine.h"
+#include "media/base/stream_params.h"
+#include "media/base/video_capturer.h"
+#include "media/engine/webrtc_media_engine.h"
+#include "media/sctp/sctp_transport_internal.h"
#include "modules/audio_device/include/audio_device.h"
#include "modules/audio_processing/include/audio_processing.h"
-#include "p2p/base/fakeportallocator.h"
-#include "p2p/base/p2pconstants.h"
+#include "p2p/base/fake_port_allocator.h"
+#include "p2p/base/p2p_constants.h"
#include "p2p/base/port.h"
-#include "p2p/base/portallocator.h"
-#include "p2p/base/transportdescription.h"
-#include "p2p/base/transportinfo.h"
-#include "pc/audiotrack.h"
-#include "pc/mediasession.h"
-#include "pc/mediastream.h"
-#include "pc/peerconnection.h"
-#include "pc/peerconnectionfactory.h"
-#include "pc/rtcstatscollector.h"
-#include "pc/rtpsender.h"
-#include "pc/sessiondescription.h"
-#include "pc/streamcollection.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "pc/test/fakertccertificategenerator.h"
-#include "pc/test/fakevideotracksource.h"
-#include "pc/test/mockpeerconnectionobservers.h"
-#include "pc/test/testsdpstrings.h"
-#include "pc/videotrack.h"
+#include "p2p/base/port_allocator.h"
+#include "p2p/base/transport_description.h"
+#include "p2p/base/transport_info.h"
+#include "pc/audio_track.h"
+#include "pc/media_session.h"
+#include "pc/media_stream.h"
+#include "pc/peer_connection.h"
+#include "pc/peer_connection_factory.h"
+#include "pc/rtc_stats_collector.h"
+#include "pc/rtp_sender.h"
+#include "pc/session_description.h"
+#include "pc/stream_collection.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "pc/test/fake_rtc_certificate_generator.h"
+#include "pc/test/fake_video_track_source.h"
+#include "pc/test/mock_peer_connection_observers.h"
+#include "pc/test/test_sdp_strings.h"
+#include "pc/video_track.h"
#include "rtc_base/checks.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
#include "rtc_base/gunit.h"
#include "rtc_base/platform_file.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/rtccertificategenerator.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/rtc_certificate_generator.h"
#include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/string_utils.h"
#include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/time_utils.h"
+#include "rtc_base/virtual_socket_server.h"
#include "test/gmock.h"
#include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
#ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
#endif
namespace webrtc {
diff --git a/pc/peer_connection_internal.h b/pc/peer_connection_internal.h
index cb3627b..2cfee76 100644
--- a/pc/peer_connection_internal.h
+++ b/pc/peer_connection_internal.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_PEERCONNECTIONINTERNAL_H_
-#define PC_PEERCONNECTIONINTERNAL_H_
+#ifndef PC_PEER_CONNECTION_INTERNAL_H_
+#define PC_PEER_CONNECTION_INTERNAL_H_
#include <map>
#include <memory>
@@ -17,10 +17,10 @@
#include <string>
#include <vector>
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
#include "call/call.h"
-#include "pc/datachannel.h"
-#include "pc/rtptransceiver.h"
+#include "pc/data_channel.h"
+#include "pc/rtp_transceiver.h"
namespace webrtc {
@@ -90,4 +90,4 @@
} // namespace webrtc
-#endif // PC_PEERCONNECTIONINTERNAL_H_
+#endif // PC_PEER_CONNECTION_INTERNAL_H_
diff --git a/pc/peer_connection_jsep_unittest.cc b/pc/peer_connection_jsep_unittest.cc
index 7a04474..3acf11e 100644
--- a/pc/peer_connection_jsep_unittest.cc
+++ b/pc/peer_connection_jsep_unittest.cc
@@ -12,20 +12,20 @@
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
-#include "media/engine/webrtcmediaengine.h"
+#include "media/engine/webrtc_media_engine.h"
#include "modules/audio_processing/include/audio_processing.h"
-#include "pc/mediasession.h"
-#include "pc/peerconnectionfactory.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/sdputils.h"
+#include "pc/media_session.h"
+#include "pc/peer_connection_factory.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/sdp_utils.h"
#ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
#endif
#include "absl/memory/memory.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "pc/test/fakesctptransport.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "pc/test/fake_sctp_transport.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
#include "test/gmock.h"
// This file contains tests that ensure the PeerConnection's implementation of
diff --git a/pc/peer_connection_media_unittest.cc b/pc/peer_connection_media_unittest.cc
index 25aea98..3115eb6 100644
--- a/pc/peer_connection_media_unittest.cc
+++ b/pc/peer_connection_media_unittest.cc
@@ -14,22 +14,22 @@
#include <tuple>
-#include "api/call/callfactoryinterface.h"
+#include "api/call/call_factory_interface.h"
#include "api/test/fake_media_transport.h"
#include "logging/rtc_event_log/rtc_event_log_factory.h"
-#include "media/base/fakemediaengine.h"
-#include "p2p/base/fakeportallocator.h"
-#include "pc/mediasession.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/rtpmediautils.h"
-#include "pc/sdputils.h"
+#include "media/base/fake_media_engine.h"
+#include "p2p/base/fake_port_allocator.h"
+#include "pc/media_session.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/rtp_media_utils.h"
+#include "pc/sdp_utils.h"
#ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
#endif
#include "absl/memory/memory.h"
-#include "pc/test/fakertccertificategenerator.h"
+#include "pc/test/fake_rtc_certificate_generator.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
#include "test/gmock.h"
namespace webrtc {
diff --git a/pc/peer_connection_rampup_tests.cc b/pc/peer_connection_rampup_tests.cc
index abec373..321affd 100644
--- a/pc/peer_connection_rampup_tests.cc
+++ b/pc/peer_connection_rampup_tests.cc
@@ -23,39 +23,39 @@
#include "api/audio_options.h"
#include "api/create_peerconnection_factory.h"
#include "api/jsep.h"
-#include "api/mediastreaminterface.h"
-#include "api/peerconnectioninterface.h"
-#include "api/stats/rtcstats.h"
+#include "api/media_stream_interface.h"
+#include "api/peer_connection_interface.h"
+#include "api/stats/rtc_stats.h"
+#include "api/stats/rtc_stats_report.h"
#include "api/stats/rtcstats_objects.h"
-#include "api/stats/rtcstatsreport.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
#include "api/video_codecs/video_decoder_factory.h"
#include "api/video_codecs/video_encoder_factory.h"
#include "modules/audio_device/include/audio_device.h"
#include "modules/audio_processing/include/audio_processing.h"
-#include "p2p/base/portallocator.h"
-#include "p2p/base/portinterface.h"
-#include "p2p/base/testturnserver.h"
-#include "p2p/client/basicportallocator.h"
-#include "pc/peerconnection.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "pc/test/framegeneratorcapturervideotracksource.h"
-#include "pc/test/mockpeerconnectionobservers.h"
+#include "p2p/base/port_allocator.h"
+#include "p2p/base/port_interface.h"
+#include "p2p/base/test_turn_server.h"
+#include "p2p/client/basic_port_allocator.h"
+#include "pc/peer_connection.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "pc/test/frame_generator_capturer_video_track_source.h"
+#include "pc/test/mock_peer_connection_observers.h"
#include "rtc_base/checks.h"
-#include "rtc_base/fakenetwork.h"
-#include "rtc_base/firewallsocketserver.h"
+#include "rtc_base/fake_network.h"
+#include "rtc_base/firewall_socket_server.h"
#include "rtc_base/gunit.h"
#include "rtc_base/helpers.h"
#include "rtc_base/location.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/testcertificateverifier.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/test_certificate_verifier.h"
#include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
#include "system_wrappers/include/clock.h"
#include "test/gtest.h"
#include "test/testsupport/perf_test.h"
diff --git a/pc/peer_connection_rtp_unittest.cc b/pc/peer_connection_rtp_unittest.cc
index 7d49fec..0b95d2d 100644
--- a/pc/peer_connection_rtp_unittest.cc
+++ b/pc/peer_connection_rtp_unittest.cc
@@ -23,34 +23,34 @@
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
#include "api/create_peerconnection_factory.h"
#include "api/jsep.h"
-#include "api/mediastreaminterface.h"
-#include "api/mediatypes.h"
-#include "api/peerconnectioninterface.h"
-#include "api/rtcerror.h"
-#include "api/rtpparameters.h"
-#include "api/rtpreceiverinterface.h"
-#include "api/rtpsenderinterface.h"
-#include "api/rtptransceiverinterface.h"
-#include "api/setremotedescriptionobserverinterface.h"
-#include "api/umametrics.h"
+#include "api/media_stream_interface.h"
+#include "api/media_types.h"
+#include "api/peer_connection_interface.h"
+#include "api/rtc_error.h"
+#include "api/rtp_parameters.h"
+#include "api/rtp_receiver_interface.h"
+#include "api/rtp_sender_interface.h"
+#include "api/rtp_transceiver_interface.h"
+#include "api/set_remote_description_observer_interface.h"
+#include "api/uma_metrics.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
#include "api/video_codecs/video_decoder_factory.h"
#include "api/video_codecs/video_encoder_factory.h"
-#include "media/base/streamparams.h"
+#include "media/base/stream_params.h"
#include "modules/audio_device/include/audio_device.h"
#include "modules/audio_processing/include/audio_processing.h"
-#include "p2p/base/portallocator.h"
-#include "pc/mediasession.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/sdputils.h"
-#include "pc/sessiondescription.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "pc/test/mockpeerconnectionobservers.h"
+#include "p2p/base/port_allocator.h"
+#include "pc/media_session.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/sdp_utils.h"
+#include "pc/session_description.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "pc/test/mock_peer_connection_observers.h"
#include "rtc_base/checks.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/rtccertificategenerator.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/rtc_certificate_generator.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/thread.h"
#include "system_wrappers/include/metrics.h"
diff --git a/pc/peer_connection_signaling_unittest.cc b/pc/peer_connection_signaling_unittest.cc
index d90411c..ed76753 100644
--- a/pc/peer_connection_signaling_unittest.cc
+++ b/pc/peer_connection_signaling_unittest.cc
@@ -16,20 +16,20 @@
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
#include "api/create_peerconnection_factory.h"
-#include "api/peerconnectionproxy.h"
+#include "api/peer_connection_proxy.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
-#include "pc/peerconnection.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/sdputils.h"
+#include "pc/peer_connection.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/sdp_utils.h"
#ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
#endif
#include "absl/memory/memory.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "pc/test/fakertccertificategenerator.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "pc/test/fake_rtc_certificate_generator.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
#include "test/gmock.h"
namespace webrtc {
diff --git a/pc/peer_connection_wrapper.cc b/pc/peer_connection_wrapper.cc
index 05e7cf7..6bfb59f 100644
--- a/pc/peer_connection_wrapper.cc
+++ b/pc/peer_connection_wrapper.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/peerconnectionwrapper.h"
+#include "pc/peer_connection_wrapper.h"
#include <stdint.h>
#include <memory>
@@ -16,14 +16,14 @@
#include <utility>
#include <vector>
-#include "api/setremotedescriptionobserverinterface.h"
-#include "pc/sdputils.h"
-#include "pc/test/fakevideotracksource.h"
+#include "api/set_remote_description_observer_interface.h"
+#include "pc/sdp_utils.h"
+#include "pc/test/fake_video_track_source.h"
#include "rtc_base/checks.h"
#include "rtc_base/function_view.h"
#include "rtc_base/gunit.h"
#include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/pc/peer_connection_wrapper.h b/pc/peer_connection_wrapper.h
index 63a2501..0acd58f 100644
--- a/pc/peer_connection_wrapper.h
+++ b/pc/peer_connection_wrapper.h
@@ -8,23 +8,23 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_PEERCONNECTIONWRAPPER_H_
-#define PC_PEERCONNECTIONWRAPPER_H_
+#ifndef PC_PEER_CONNECTION_WRAPPER_H_
+#define PC_PEER_CONNECTION_WRAPPER_H_
#include <memory>
#include <string>
#include <vector>
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
#include "api/jsep.h"
-#include "api/mediastreaminterface.h"
-#include "api/mediatypes.h"
-#include "api/peerconnectioninterface.h"
-#include "api/rtcerror.h"
-#include "api/rtpsenderinterface.h"
-#include "api/rtptransceiverinterface.h"
-#include "api/stats/rtcstatsreport.h"
-#include "pc/test/mockpeerconnectionobservers.h"
+#include "api/media_stream_interface.h"
+#include "api/media_types.h"
+#include "api/peer_connection_interface.h"
+#include "api/rtc_error.h"
+#include "api/rtp_sender_interface.h"
+#include "api/rtp_transceiver_interface.h"
+#include "api/stats/rtc_stats_report.h"
+#include "pc/test/mock_peer_connection_observers.h"
#include "rtc_base/function_view.h"
#include "rtc_base/scoped_ref_ptr.h"
@@ -192,4 +192,4 @@
} // namespace webrtc
-#endif // PC_PEERCONNECTIONWRAPPER_H_
+#endif // PC_PEER_CONNECTION_WRAPPER_H_
diff --git a/pc/proxy_unittest.cc b/pc/proxy_unittest.cc
index 072e606..f9b7063 100644
--- a/pc/proxy_unittest.cc
+++ b/pc/proxy_unittest.cc
@@ -14,7 +14,7 @@
#include <string>
#include "rtc_base/gunit.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
#include "test/gmock.h"
using ::testing::_;
diff --git a/pc/remote_audio_source.cc b/pc/remote_audio_source.cc
index 53a9726..ac7604d 100644
--- a/pc/remote_audio_source.cc
+++ b/pc/remote_audio_source.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/remoteaudiosource.h"
+#include "pc/remote_audio_source.h"
#include <stddef.h>
#include <algorithm>
@@ -16,7 +16,7 @@
#include "absl/memory/memory.h"
#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/location.h"
#include "rtc_base/logging.h"
#include "rtc_base/scoped_ref_ptr.h"
diff --git a/pc/remote_audio_source.h b/pc/remote_audio_source.h
index 4d87331..399e7e3 100644
--- a/pc/remote_audio_source.h
+++ b/pc/remote_audio_source.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_REMOTEAUDIOSOURCE_H_
-#define PC_REMOTEAUDIOSOURCE_H_
+#ifndef PC_REMOTE_AUDIO_SOURCE_H_
+#define PC_REMOTE_AUDIO_SOURCE_H_
#include <list>
#include <string>
@@ -17,8 +17,8 @@
#include "api/call/audio_sink.h"
#include "api/notifier.h"
#include "pc/channel.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/messagehandler.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/message_handler.h"
namespace rtc {
struct Message;
@@ -73,4 +73,4 @@
} // namespace webrtc
-#endif // PC_REMOTEAUDIOSOURCE_H_
+#endif // PC_REMOTE_AUDIO_SOURCE_H_
diff --git a/pc/rtc_stats_collector.cc b/pc/rtc_stats_collector.cc
index d48ecc0..b1a44ee 100644
--- a/pc/rtc_stats_collector.cc
+++ b/pc/rtc_stats_collector.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/rtcstatscollector.h"
+#include "pc/rtc_stats_collector.h"
#include <memory>
#include <string>
@@ -17,16 +17,16 @@
#include "absl/memory/memory.h"
#include "api/candidate.h"
-#include "api/mediastreaminterface.h"
-#include "api/peerconnectioninterface.h"
-#include "media/base/mediachannel.h"
-#include "p2p/base/p2pconstants.h"
+#include "api/media_stream_interface.h"
+#include "api/peer_connection_interface.h"
+#include "media/base/media_channel.h"
+#include "p2p/base/p2p_constants.h"
#include "p2p/base/port.h"
-#include "pc/peerconnection.h"
-#include "pc/rtcstatstraversal.h"
+#include "pc/peer_connection.h"
+#include "pc/rtc_stats_traversal.h"
#include "rtc_base/checks.h"
#include "rtc_base/strings/string_builder.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "rtc_base/trace_event.h"
namespace webrtc {
diff --git a/pc/rtc_stats_collector.h b/pc/rtc_stats_collector.h
index 8dd16e3..e3402df 100644
--- a/pc/rtc_stats_collector.h
+++ b/pc/rtc_stats_collector.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_RTCSTATSCOLLECTOR_H_
-#define PC_RTCSTATSCOLLECTOR_H_
+#ifndef PC_RTC_STATS_COLLECTOR_H_
+#define PC_RTC_STATS_COLLECTOR_H_
#include <map>
#include <memory>
@@ -18,20 +18,20 @@
#include <vector>
#include "absl/types/optional.h"
+#include "api/stats/rtc_stats_collector_callback.h"
+#include "api/stats/rtc_stats_report.h"
#include "api/stats/rtcstats_objects.h"
-#include "api/stats/rtcstatscollectorcallback.h"
-#include "api/stats/rtcstatsreport.h"
#include "call/call.h"
-#include "media/base/mediachannel.h"
-#include "pc/datachannel.h"
-#include "pc/peerconnectioninternal.h"
-#include "pc/trackmediainfomap.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/refcount.h"
+#include "media/base/media_channel.h"
+#include "pc/data_channel.h"
+#include "pc/peer_connection_internal.h"
+#include "pc/track_media_info_map.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/ref_count.h"
#include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/ssl_identity.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace webrtc {
@@ -271,4 +271,4 @@
} // namespace webrtc
-#endif // PC_RTCSTATSCOLLECTOR_H_
+#endif // PC_RTC_STATS_COLLECTOR_H_
diff --git a/pc/rtc_stats_collector_unittest.cc b/pc/rtc_stats_collector_unittest.cc
index 2be4371..4635d0e 100644
--- a/pc/rtc_stats_collector_unittest.cc
+++ b/pc/rtc_stats_collector_unittest.cc
@@ -16,26 +16,26 @@
#include <vector>
#include "absl/memory/memory.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
+#include "api/stats/rtc_stats_report.h"
#include "api/stats/rtcstats_objects.h"
-#include "api/stats/rtcstatsreport.h"
#include "api/units/time_delta.h"
-#include "p2p/base/p2pconstants.h"
+#include "p2p/base/p2p_constants.h"
#include "p2p/base/port.h"
-#include "pc/mediastream.h"
-#include "pc/mediastreamtrack.h"
-#include "pc/rtcstatscollector.h"
-#include "pc/test/fakepeerconnectionforstats.h"
-#include "pc/test/mock_datachannel.h"
-#include "pc/test/mock_rtpreceiverinternal.h"
-#include "pc/test/mock_rtpsenderinternal.h"
-#include "pc/test/rtcstatsobtainer.h"
+#include "pc/media_stream.h"
+#include "pc/media_stream_track.h"
+#include "pc/rtc_stats_collector.h"
+#include "pc/test/fake_peer_connection_for_stats.h"
+#include "pc/test/mock_data_channel.h"
+#include "pc/test/mock_rtp_receiver_internal.h"
+#include "pc/test/mock_rtp_sender_internal.h"
+#include "pc/test/rtc_stats_obtainer.h"
#include "rtc_base/checks.h"
-#include "rtc_base/fakeclock.h"
-#include "rtc_base/fakesslidentity.h"
+#include "rtc_base/fake_clock.h"
+#include "rtc_base/fake_ssl_identity.h"
#include "rtc_base/gunit.h"
#include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
using testing::AtLeast;
using testing::Invoke;
diff --git a/pc/rtc_stats_integrationtest.cc b/pc/rtc_stats_integrationtest.cc
index aa45975..cae01ae 100644
--- a/pc/rtc_stats_integrationtest.cc
+++ b/pc/rtc_stats_integrationtest.cc
@@ -22,25 +22,25 @@
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
#include "api/audio_options.h"
-#include "api/datachannelinterface.h"
-#include "api/peerconnectioninterface.h"
-#include "api/rtpreceiverinterface.h"
-#include "api/rtpsenderinterface.h"
-#include "api/stats/rtcstats.h"
+#include "api/data_channel_interface.h"
+#include "api/peer_connection_interface.h"
+#include "api/rtp_receiver_interface.h"
+#include "api/rtp_sender_interface.h"
+#include "api/stats/rtc_stats.h"
+#include "api/stats/rtc_stats_report.h"
#include "api/stats/rtcstats_objects.h"
-#include "api/stats/rtcstatsreport.h"
-#include "api/test/fakeconstraints.h"
-#include "pc/rtcstatstraversal.h"
-#include "pc/test/peerconnectiontestwrapper.h"
-#include "pc/test/rtcstatsobtainer.h"
+#include "api/test/fake_constraints.h"
+#include "pc/rtc_stats_traversal.h"
+#include "pc/test/peer_connection_test_wrapper.h"
+#include "pc/test/rtc_stats_obtainer.h"
#include "rtc_base/checks.h"
#include "rtc_base/event_tracer.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/thread.h"
#include "rtc_base/trace_event.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/pc/rtc_stats_traversal.cc b/pc/rtc_stats_traversal.cc
index 62b8c52..e7af0e1 100644
--- a/pc/rtc_stats_traversal.cc
+++ b/pc/rtc_stats_traversal.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/rtcstatstraversal.h"
+#include "pc/rtc_stats_traversal.h"
#include <memory>
#include <string>
diff --git a/pc/rtc_stats_traversal.h b/pc/rtc_stats_traversal.h
index eb5c809..f648ec6 100644
--- a/pc/rtc_stats_traversal.h
+++ b/pc/rtc_stats_traversal.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_RTCSTATSTRAVERSAL_H_
-#define PC_RTCSTATSTRAVERSAL_H_
+#ifndef PC_RTC_STATS_TRAVERSAL_H_
+#define PC_RTC_STATS_TRAVERSAL_H_
#include <string>
#include <vector>
-#include "api/stats/rtcstats.h"
-#include "api/stats/rtcstatsreport.h"
+#include "api/stats/rtc_stats.h"
+#include "api/stats/rtc_stats_report.h"
#include "rtc_base/scoped_ref_ptr.h"
namespace webrtc {
@@ -41,4 +41,4 @@
} // namespace webrtc
-#endif // PC_RTCSTATSTRAVERSAL_H_
+#endif // PC_RTC_STATS_TRAVERSAL_H_
diff --git a/pc/rtc_stats_traversal_unittest.cc b/pc/rtc_stats_traversal_unittest.cc
index d5b0de7..de2aae7 100644
--- a/pc/rtc_stats_traversal_unittest.cc
+++ b/pc/rtc_stats_traversal_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/rtcstatstraversal.h"
+#include "pc/rtc_stats_traversal.h"
#include <memory>
#include <string>
diff --git a/pc/rtcp_mux_filter.cc b/pc/rtcp_mux_filter.cc
index dceaf46..a8cf717 100644
--- a/pc/rtcp_mux_filter.cc
+++ b/pc/rtcp_mux_filter.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/rtcpmuxfilter.h"
+#include "pc/rtcp_mux_filter.h"
#include "rtc_base/logging.h"
diff --git a/pc/rtcp_mux_filter.h b/pc/rtcp_mux_filter.h
index 55b6ea6..48050de 100644
--- a/pc/rtcp_mux_filter.h
+++ b/pc/rtcp_mux_filter.h
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_RTCPMUXFILTER_H_
-#define PC_RTCPMUXFILTER_H_
+#ifndef PC_RTCP_MUX_FILTER_H_
+#define PC_RTCP_MUX_FILTER_H_
-#include "pc/sessiondescription.h"
+#include "pc/session_description.h"
namespace cricket {
@@ -75,4 +75,4 @@
} // namespace cricket
-#endif // PC_RTCPMUXFILTER_H_
+#endif // PC_RTCP_MUX_FILTER_H_
diff --git a/pc/rtcp_mux_filter_unittest.cc b/pc/rtcp_mux_filter_unittest.cc
index 095f08f..586da23 100644
--- a/pc/rtcp_mux_filter_unittest.cc
+++ b/pc/rtcp_mux_filter_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/rtcpmuxfilter.h"
+#include "pc/rtcp_mux_filter.h"
#include "test/gtest.h"
diff --git a/pc/rtp_media_utils.cc b/pc/rtp_media_utils.cc
index 051cc0a..f4a6120 100644
--- a/pc/rtp_media_utils.cc
+++ b/pc/rtp_media_utils.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/rtpmediautils.h"
+#include "pc/rtp_media_utils.h"
#include "rtc_base/checks.h"
diff --git a/pc/rtp_media_utils.h b/pc/rtp_media_utils.h
index 5f02d89..3ff40c9 100644
--- a/pc/rtp_media_utils.h
+++ b/pc/rtp_media_utils.h
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_RTPMEDIAUTILS_H_
-#define PC_RTPMEDIAUTILS_H_
+#ifndef PC_RTP_MEDIA_UTILS_H_
+#define PC_RTP_MEDIA_UTILS_H_
-#include "api/rtptransceiverinterface.h"
+#include "api/rtp_transceiver_interface.h"
namespace webrtc {
@@ -54,4 +54,4 @@
} // namespace webrtc
-#endif // PC_RTPMEDIAUTILS_H_
+#endif // PC_RTP_MEDIA_UTILS_H_
diff --git a/pc/rtp_media_utils_unittest.cc b/pc/rtp_media_utils_unittest.cc
index af7e8f6..fbaa7a3 100644
--- a/pc/rtp_media_utils_unittest.cc
+++ b/pc/rtp_media_utils_unittest.cc
@@ -10,7 +10,7 @@
#include <tuple>
-#include "pc/rtpmediautils.h"
+#include "pc/rtp_media_utils.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/pc/rtp_parameters_conversion.cc b/pc/rtp_parameters_conversion.cc
index 000b980..cf9e6e1 100644
--- a/pc/rtp_parameters_conversion.cc
+++ b/pc/rtp_parameters_conversion.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/rtpparametersconversion.h"
+#include "pc/rtp_parameters_conversion.h"
#include <cstdint>
#include <set>
@@ -17,9 +17,9 @@
#include <utility>
#include "api/array_view.h"
-#include "api/mediatypes.h"
-#include "media/base/mediaconstants.h"
-#include "media/base/rtputils.h"
+#include "api/media_types.h"
+#include "media/base/media_constants.h"
+#include "media/base/rtp_utils.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/strings/string_builder.h"
diff --git a/pc/rtp_parameters_conversion.h b/pc/rtp_parameters_conversion.h
index b77d3b7..dc24a45 100644
--- a/pc/rtp_parameters_conversion.h
+++ b/pc/rtp_parameters_conversion.h
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_RTPPARAMETERSCONVERSION_H_
-#define PC_RTPPARAMETERSCONVERSION_H_
+#ifndef PC_RTP_PARAMETERS_CONVERSION_H_
+#define PC_RTP_PARAMETERS_CONVERSION_H_
#include <iosfwd>
#include <vector>
#include "absl/types/optional.h"
-#include "api/rtcerror.h"
-#include "api/rtpparameters.h"
+#include "api/rtc_error.h"
+#include "api/rtp_parameters.h"
#include "media/base/codec.h"
-#include "media/base/streamparams.h"
-#include "pc/sessiondescription.h"
+#include "media/base/stream_params.h"
+#include "pc/session_description.h"
namespace webrtc {
@@ -106,4 +106,4 @@
} // namespace webrtc
-#endif // PC_RTPPARAMETERSCONVERSION_H_
+#endif // PC_RTP_PARAMETERS_CONVERSION_H_
diff --git a/pc/rtp_parameters_conversion_unittest.cc b/pc/rtp_parameters_conversion_unittest.cc
index f4f1b92..27708cc 100644
--- a/pc/rtp_parameters_conversion_unittest.cc
+++ b/pc/rtp_parameters_conversion_unittest.cc
@@ -10,7 +10,7 @@
#include <algorithm>
-#include "pc/rtpparametersconversion.h"
+#include "pc/rtp_parameters_conversion.h"
#include "rtc_base/gunit.h"
namespace webrtc {
diff --git a/pc/rtp_receiver.cc b/pc/rtp_receiver.cc
index be1bd4b..837175a 100644
--- a/pc/rtp_receiver.cc
+++ b/pc/rtp_receiver.cc
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/rtpreceiver.h"
+#include "pc/rtp_receiver.h"
#include <stddef.h>
#include <utility>
#include <vector>
-#include "api/mediastreamproxy.h"
-#include "api/mediastreamtrackproxy.h"
-#include "api/videosourceproxy.h"
-#include "pc/audiotrack.h"
-#include "pc/mediastream.h"
-#include "pc/videotrack.h"
+#include "api/media_stream_proxy.h"
+#include "api/media_stream_track_proxy.h"
+#include "api/video_track_source_proxy.h"
+#include "pc/audio_track.h"
+#include "pc/media_stream.h"
+#include "pc/video_track.h"
#include "rtc_base/checks.h"
#include "rtc_base/location.h"
#include "rtc_base/logging.h"
diff --git a/pc/rtp_receiver.h b/pc/rtp_receiver.h
index ca477a6..754fce0 100644
--- a/pc/rtp_receiver.h
+++ b/pc/rtp_receiver.h
@@ -12,27 +12,27 @@
// An RtpReceiver associates a MediaStreamTrackInterface with an underlying
// transport (provided by cricket::VoiceChannel/cricket::VideoChannel)
-#ifndef PC_RTPRECEIVER_H_
-#define PC_RTPRECEIVER_H_
+#ifndef PC_RTP_RECEIVER_H_
+#define PC_RTP_RECEIVER_H_
#include <stdint.h>
#include <string>
#include <vector>
#include "absl/types/optional.h"
-#include "api/crypto/framedecryptorinterface.h"
-#include "api/mediastreaminterface.h"
-#include "api/mediatypes.h"
-#include "api/rtpparameters.h"
-#include "api/rtpreceiverinterface.h"
+#include "api/crypto/frame_decryptor_interface.h"
+#include "api/media_stream_interface.h"
+#include "api/media_types.h"
+#include "api/rtp_parameters.h"
+#include "api/rtp_receiver_interface.h"
#include "api/video/video_frame.h"
#include "api/video/video_sink_interface.h"
#include "api/video/video_source_interface.h"
-#include "media/base/mediachannel.h"
-#include "media/base/videobroadcaster.h"
-#include "pc/remoteaudiosource.h"
-#include "pc/videotracksource.h"
-#include "rtc_base/refcountedobject.h"
+#include "media/base/media_channel.h"
+#include "media/base/video_broadcaster.h"
+#include "pc/remote_audio_source.h"
+#include "pc/video_track_source.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/thread.h"
@@ -261,4 +261,4 @@
} // namespace webrtc
-#endif // PC_RTPRECEIVER_H_
+#endif // PC_RTP_RECEIVER_H_
diff --git a/pc/rtp_sender.cc b/pc/rtp_sender.cc
index ec99a4b..b97b876 100644
--- a/pc/rtp_sender.cc
+++ b/pc/rtp_sender.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/rtpsender.h"
+#include "pc/rtp_sender.h"
#include <utility>
#include <vector>
#include "api/audio_options.h"
-#include "api/mediastreaminterface.h"
-#include "media/base/mediaengine.h"
-#include "pc/statscollector.h"
+#include "api/media_stream_interface.h"
+#include "media/base/media_engine.h"
+#include "pc/stats_collector.h"
#include "rtc_base/checks.h"
#include "rtc_base/helpers.h"
#include "rtc_base/location.h"
diff --git a/pc/rtp_sender.h b/pc/rtp_sender.h
index 07fae6b..6ed0603 100644
--- a/pc/rtp_sender.h
+++ b/pc/rtp_sender.h
@@ -12,19 +12,19 @@
// An RtpSender associates a MediaStreamTrackInterface with an underlying
// transport (provided by AudioProviderInterface/VideoProviderInterface)
-#ifndef PC_RTPSENDER_H_
-#define PC_RTPSENDER_H_
+#ifndef PC_RTP_SENDER_H_
+#define PC_RTP_SENDER_H_
#include <memory>
#include <string>
#include <vector>
-#include "api/mediastreaminterface.h"
-#include "api/rtpsenderinterface.h"
-#include "media/base/audiosource.h"
-#include "media/base/mediachannel.h"
-#include "pc/dtmfsender.h"
-#include "rtc_base/criticalsection.h"
+#include "api/media_stream_interface.h"
+#include "api/rtp_sender_interface.h"
+#include "media/base/audio_source.h"
+#include "media/base/media_channel.h"
+#include "pc/dtmf_sender.h"
+#include "rtc_base/critical_section.h"
namespace webrtc {
@@ -270,4 +270,4 @@
} // namespace webrtc
-#endif // PC_RTPSENDER_H_
+#endif // PC_RTP_SENDER_H_
diff --git a/pc/rtp_sender_receiver_unittest.cc b/pc/rtp_sender_receiver_unittest.cc
index ec1e949..5672a9c 100644
--- a/pc/rtp_sender_receiver_unittest.cc
+++ b/pc/rtp_sender_receiver_unittest.cc
@@ -18,39 +18,39 @@
#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "api/audio_options.h"
-#include "api/crypto/cryptooptions.h"
-#include "api/crypto/framedecryptorinterface.h"
-#include "api/crypto/frameencryptorinterface.h"
-#include "api/dtmfsenderinterface.h"
-#include "api/mediastreaminterface.h"
-#include "api/rtcerror.h"
-#include "api/rtpparameters.h"
+#include "api/crypto/crypto_options.h"
+#include "api/crypto/frame_decryptor_interface.h"
+#include "api/crypto/frame_encryptor_interface.h"
+#include "api/dtmf_sender_interface.h"
+#include "api/media_stream_interface.h"
+#include "api/rtc_error.h"
+#include "api/rtp_parameters.h"
#include "api/test/fake_frame_decryptor.h"
#include "api/test/fake_frame_encryptor.h"
#include "logging/rtc_event_log/rtc_event_log.h"
#include "media/base/codec.h"
-#include "media/base/fakemediaengine.h"
-#include "media/base/mediachannel.h"
-#include "media/base/mediaconfig.h"
-#include "media/base/mediaengine.h"
-#include "media/base/rtpdataengine.h"
-#include "media/base/streamparams.h"
-#include "media/base/testutils.h"
-#include "media/engine/fakewebrtccall.h"
-#include "p2p/base/dtlstransportinternal.h"
-#include "p2p/base/fakedtlstransport.h"
-#include "p2p/base/p2pconstants.h"
-#include "pc/audiotrack.h"
+#include "media/base/fake_media_engine.h"
+#include "media/base/media_channel.h"
+#include "media/base/media_config.h"
+#include "media/base/media_engine.h"
+#include "media/base/rtp_data_engine.h"
+#include "media/base/stream_params.h"
+#include "media/base/test_utils.h"
+#include "media/engine/fake_webrtc_call.h"
+#include "p2p/base/dtls_transport_internal.h"
+#include "p2p/base/fake_dtls_transport.h"
+#include "p2p/base/p2p_constants.h"
+#include "pc/audio_track.h"
#include "pc/channel.h"
-#include "pc/channelmanager.h"
-#include "pc/dtlssrtptransport.h"
-#include "pc/localaudiosource.h"
-#include "pc/mediastream.h"
-#include "pc/rtpreceiver.h"
-#include "pc/rtpsender.h"
-#include "pc/rtptransportinternal.h"
-#include "pc/test/fakevideotracksource.h"
-#include "pc/videotrack.h"
+#include "pc/channel_manager.h"
+#include "pc/dtls_srtp_transport.h"
+#include "pc/local_audio_source.h"
+#include "pc/media_stream.h"
+#include "pc/rtp_receiver.h"
+#include "pc/rtp_sender.h"
+#include "pc/rtp_transport_internal.h"
+#include "pc/test/fake_video_track_source.h"
+#include "pc/video_track.h"
#include "rtc_base/checks.h"
#include "rtc_base/gunit.h"
#include "rtc_base/scoped_ref_ptr.h"
diff --git a/pc/rtp_transceiver.cc b/pc/rtp_transceiver.cc
index ffb9bdd..b04c20c 100644
--- a/pc/rtp_transceiver.cc
+++ b/pc/rtp_transceiver.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/rtptransceiver.h"
+#include "pc/rtp_transceiver.h"
#include <algorithm>
#include <string>
-#include "pc/rtpmediautils.h"
+#include "pc/rtp_media_utils.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
diff --git a/pc/rtp_transceiver.h b/pc/rtp_transceiver.h
index 07db196..7c234ce 100644
--- a/pc/rtp_transceiver.h
+++ b/pc/rtp_transceiver.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_RTPTRANSCEIVER_H_
-#define PC_RTPTRANSCEIVER_H_
+#ifndef PC_RTP_TRANSCEIVER_H_
+#define PC_RTP_TRANSCEIVER_H_
#include <string>
#include <vector>
-#include "api/rtptransceiverinterface.h"
-#include "pc/rtpreceiver.h"
-#include "pc/rtpsender.h"
+#include "api/rtp_transceiver_interface.h"
+#include "pc/rtp_receiver.h"
+#include "pc/rtp_sender.h"
namespace webrtc {
@@ -216,4 +216,4 @@
} // namespace webrtc
-#endif // PC_RTPTRANSCEIVER_H_
+#endif // PC_RTP_TRANSCEIVER_H_
diff --git a/pc/rtp_transceiver_unittest.cc b/pc/rtp_transceiver_unittest.cc
index f8af12f..885a5a1 100644
--- a/pc/rtp_transceiver_unittest.cc
+++ b/pc/rtp_transceiver_unittest.cc
@@ -10,9 +10,9 @@
// This file contains tests for |RtpTransceiver|.
-#include "pc/rtptransceiver.h"
+#include "pc/rtp_transceiver.h"
-#include "pc/test/mock_channelinterface.h"
+#include "pc/test/mock_channel_interface.h"
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/pc/rtp_transport.cc b/pc/rtp_transport.cc
index f4adb80..0b076f7 100644
--- a/pc/rtp_transport.cc
+++ b/pc/rtp_transport.cc
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/rtptransport.h"
+#include "pc/rtp_transport.h"
#include <errno.h>
#include <string>
#include <utility>
#include "api/rtp_headers.h"
-#include "api/rtpparameters.h"
-#include "media/base/rtputils.h"
+#include "api/rtp_parameters.h"
+#include "media/base/rtp_utils.h"
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
#include "rtc_base/checks.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
#include "rtc_base/logging.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/trace_event.h"
diff --git a/pc/rtp_transport.h b/pc/rtp_transport.h
index dab5903..f188a17 100644
--- a/pc/rtp_transport.h
+++ b/pc/rtp_transport.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_RTPTRANSPORT_H_
-#define PC_RTPTRANSPORT_H_
+#ifndef PC_RTP_TRANSPORT_H_
+#define PC_RTP_TRANSPORT_H_
#include <string>
#include "call/rtp_demuxer.h"
#include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
-#include "pc/rtptransportinternal.h"
+#include "pc/rtp_transport_internal.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
namespace rtc {
@@ -152,4 +152,4 @@
} // namespace webrtc
-#endif // PC_RTPTRANSPORT_H_
+#endif // PC_RTP_TRANSPORT_H_
diff --git a/pc/rtp_transport_internal.h b/pc/rtp_transport_internal.h
index e633836..f8a5f2b 100644
--- a/pc/rtp_transport_internal.h
+++ b/pc/rtp_transport_internal.h
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_RTPTRANSPORTINTERNAL_H_
-#define PC_RTPTRANSPORTINTERNAL_H_
+#ifndef PC_RTP_TRANSPORT_INTERNAL_H_
+#define PC_RTP_TRANSPORT_INTERNAL_H_
#include <string>
-#include "api/ortc/srtptransportinterface.h"
+#include "api/ortc/srtp_transport_interface.h"
#include "call/rtp_demuxer.h"
-#include "p2p/base/icetransportinternal.h"
-#include "pc/sessiondescription.h"
-#include "rtc_base/networkroute.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "p2p/base/ice_transport_internal.h"
+#include "pc/session_description.h"
+#include "rtc_base/network_route.h"
+#include "rtc_base/ssl_stream_adapter.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
namespace rtc {
@@ -105,4 +105,4 @@
} // namespace webrtc
-#endif // PC_RTPTRANSPORTINTERNAL_H_
+#endif // PC_RTP_TRANSPORT_INTERNAL_H_
diff --git a/pc/rtp_transport_internal_adapter.h b/pc/rtp_transport_internal_adapter.h
index fd92c51..c8fa8cc 100644
--- a/pc/rtp_transport_internal_adapter.h
+++ b/pc/rtp_transport_internal_adapter.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_RTPTRANSPORTINTERNALADAPTER_H_
-#define PC_RTPTRANSPORTINTERNALADAPTER_H_
+#ifndef PC_RTP_TRANSPORT_INTERNAL_ADAPTER_H_
+#define PC_RTP_TRANSPORT_INTERNAL_ADAPTER_H_
#include <memory>
#include <utility>
-#include "pc/rtptransportinternal.h"
+#include "pc/rtp_transport_internal.h"
namespace webrtc {
@@ -111,4 +111,4 @@
} // namespace webrtc
-#endif // PC_RTPTRANSPORTINTERNALADAPTER_H_
+#endif // PC_RTP_TRANSPORT_INTERNAL_ADAPTER_H_
diff --git a/pc/rtp_transport_unittest.cc b/pc/rtp_transport_unittest.cc
index 3b28c67..f3b2bb6 100644
--- a/pc/rtp_transport_unittest.cc
+++ b/pc/rtp_transport_unittest.cc
@@ -14,10 +14,10 @@
#include <utility>
#include "api/rtp_headers.h"
-#include "api/rtpparameters.h"
-#include "p2p/base/fakepackettransport.h"
-#include "pc/rtptransport.h"
-#include "pc/rtptransporttestutil.h"
+#include "api/rtp_parameters.h"
+#include "p2p/base/fake_packet_transport.h"
+#include "pc/rtp_transport.h"
+#include "pc/test/rtp_transport_test_util.h"
#include "rtc_base/buffer.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "test/gtest.h"
diff --git a/pc/sctp_utils.cc b/pc/sctp_utils.cc
index 58fbde8..aa7b6c1 100644
--- a/pc/sctp_utils.cc
+++ b/pc/sctp_utils.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/sctputils.h"
+#include "pc/sctp_utils.h"
#include <stddef.h>
#include <stdint.h>
-#include "rtc_base/bytebuffer.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/byte_buffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
#include "rtc_base/logging.h"
namespace webrtc {
diff --git a/pc/sctp_utils.h b/pc/sctp_utils.h
index 7a4708a..468c960 100644
--- a/pc/sctp_utils.h
+++ b/pc/sctp_utils.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_SCTPUTILS_H_
-#define PC_SCTPUTILS_H_
+#ifndef PC_SCTP_UTILS_H_
+#define PC_SCTP_UTILS_H_
#include <string>
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
namespace rtc {
class CopyOnWriteBuffer;
@@ -38,4 +38,4 @@
void WriteDataChannelOpenAckMessage(rtc::CopyOnWriteBuffer* payload);
} // namespace webrtc
-#endif // PC_SCTPUTILS_H_
+#endif // PC_SCTP_UTILS_H_
diff --git a/pc/sctp_utils_unittest.cc b/pc/sctp_utils_unittest.cc
index 0718a23..72db952 100644
--- a/pc/sctp_utils_unittest.cc
+++ b/pc/sctp_utils_unittest.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/sctputils.h"
+#include "pc/sctp_utils.h"
#include <stdint.h>
-#include "rtc_base/bytebuffer.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/byte_buffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
#include "test/gtest.h"
class SctpUtilsTest : public testing::Test {
diff --git a/pc/sdp_serializer.cc b/pc/sdp_serializer.cc
index 8e20aa2..cdaddd7 100644
--- a/pc/sdp_serializer.cc
+++ b/pc/sdp_serializer.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/sdpserializer.h"
+#include "pc/sdp_serializer.h"
#include <algorithm>
#include <string>
@@ -17,8 +17,8 @@
#include "api/jsep.h"
#include "rtc_base/checks.h"
+#include "rtc_base/string_encode.h"
#include "rtc_base/string_to_number.h"
-#include "rtc_base/stringencode.h"
#include "rtc_base/strings/string_builder.h"
using cricket::RidDescription;
diff --git a/pc/sdp_serializer.h b/pc/sdp_serializer.h
index 3c6f31b..476ebaf 100644
--- a/pc/sdp_serializer.h
+++ b/pc/sdp_serializer.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_SDPSERIALIZER_H_
-#define PC_SDPSERIALIZER_H_
+#ifndef PC_SDP_SERIALIZER_H_
+#define PC_SDP_SERIALIZER_H_
#include <string>
#include "absl/strings/string_view.h"
-#include "api/rtcerror.h"
-#include "media/base/riddescription.h"
-#include "pc/sessiondescription.h"
+#include "api/rtc_error.h"
+#include "media/base/rid_description.h"
+#include "pc/session_description.h"
namespace webrtc {
@@ -57,4 +57,4 @@
} // namespace webrtc
-#endif // PC_SDPSERIALIZER_H_
+#endif // PC_SDP_SERIALIZER_H_
diff --git a/pc/sdp_serializer_unittest.cc b/pc/sdp_serializer_unittest.cc
index c5e95d0..76fa8ba 100644
--- a/pc/sdp_serializer_unittest.cc
+++ b/pc/sdp_serializer_unittest.cc
@@ -13,7 +13,7 @@
#include <utility>
#include <vector>
-#include "pc/sdpserializer.h"
+#include "pc/sdp_serializer.h"
#include "rtc_base/gunit.h"
using ::testing::ValuesIn;
diff --git a/pc/sdp_utils.cc b/pc/sdp_utils.cc
index 07bff7b..b20a667 100644
--- a/pc/sdp_utils.cc
+++ b/pc/sdp_utils.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/sdputils.h"
+#include "pc/sdp_utils.h"
#include <string>
#include <utility>
#include "absl/memory/memory.h"
-#include "api/jsepsessiondescription.h"
+#include "api/jsep_session_description.h"
namespace webrtc {
diff --git a/pc/sdp_utils.h b/pc/sdp_utils.h
index 0d2d304..5e765fa 100644
--- a/pc/sdp_utils.h
+++ b/pc/sdp_utils.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_SDPUTILS_H_
-#define PC_SDPUTILS_H_
+#ifndef PC_SDP_UTILS_H_
+#define PC_SDP_UTILS_H_
#include <functional>
#include <memory>
#include <string>
#include "api/jsep.h"
-#include "pc/sessiondescription.h"
+#include "pc/session_description.h"
namespace webrtc {
@@ -57,4 +57,4 @@
} // namespace webrtc
-#endif // PC_SDPUTILS_H_
+#endif // PC_SDP_UTILS_H_
diff --git a/pc/session_description.cc b/pc/session_description.cc
index dd56eaf..1029ee8 100644
--- a/pc/session_description.cc
+++ b/pc/session_description.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/sessiondescription.h"
+#include "pc/session_description.h"
#include <algorithm>
#include <utility>
diff --git a/pc/session_description.h b/pc/session_description.h
index 9998356..13da227 100644
--- a/pc/session_description.h
+++ b/pc/session_description.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_SESSIONDESCRIPTION_H_
-#define PC_SESSIONDESCRIPTION_H_
+#ifndef PC_SESSION_DESCRIPTION_H_
+#define PC_SESSION_DESCRIPTION_H_
#include <stddef.h>
#include <stdint.h>
@@ -17,16 +17,16 @@
#include <string>
#include <vector>
-#include "api/cryptoparams.h"
-#include "api/mediatypes.h"
-#include "api/rtpparameters.h"
-#include "api/rtptransceiverinterface.h"
-#include "media/base/mediachannel.h"
-#include "media/base/streamparams.h"
-#include "p2p/base/transportdescription.h"
-#include "p2p/base/transportinfo.h"
-#include "pc/simulcastdescription.h"
-#include "rtc_base/socketaddress.h"
+#include "api/crypto_params.h"
+#include "api/media_types.h"
+#include "api/rtp_parameters.h"
+#include "api/rtp_transceiver_interface.h"
+#include "media/base/media_channel.h"
+#include "media/base/stream_params.h"
+#include "p2p/base/transport_description.h"
+#include "p2p/base/transport_info.h"
+#include "pc/simulcast_description.h"
+#include "rtc_base/socket_address.h"
namespace cricket {
@@ -549,4 +549,4 @@
} // namespace cricket
-#endif // PC_SESSIONDESCRIPTION_H_
+#endif // PC_SESSION_DESCRIPTION_H_
diff --git a/pc/session_description_unittest.cc b/pc/session_description_unittest.cc
index 4e9d7dc..3b05dca 100644
--- a/pc/session_description_unittest.cc
+++ b/pc/session_description_unittest.cc
@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/sessiondescription.h"
+#include "pc/session_description.h"
#include "test/gtest.h"
diff --git a/pc/simulcast_description.cc b/pc/simulcast_description.cc
index 61849ce..0359ffc 100644
--- a/pc/simulcast_description.cc
+++ b/pc/simulcast_description.cc
@@ -10,7 +10,7 @@
#include <utility>
-#include "pc/simulcastdescription.h"
+#include "pc/simulcast_description.h"
#include "rtc_base/checks.h"
namespace cricket {
diff --git a/pc/simulcast_description.h b/pc/simulcast_description.h
index 0781a6a..1337a9c 100644
--- a/pc/simulcast_description.h
+++ b/pc/simulcast_description.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_SIMULCASTDESCRIPTION_H_
-#define PC_SIMULCASTDESCRIPTION_H_
+#ifndef PC_SIMULCAST_DESCRIPTION_H_
+#define PC_SIMULCAST_DESCRIPTION_H_
#include <string>
#include <vector>
@@ -108,4 +108,4 @@
} // namespace cricket
-#endif // PC_SIMULCASTDESCRIPTION_H_
+#endif // PC_SIMULCAST_DESCRIPTION_H_
diff --git a/pc/srtp_filter.cc b/pc/srtp_filter.cc
index 0dff807..cdfaeaa 100644
--- a/pc/srtp_filter.cc
+++ b/pc/srtp_filter.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/srtpfilter.h"
+#include "pc/srtp_filter.h"
#include <string.h>
#include <cstdint>
#include "rtc_base/logging.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ssl_stream_adapter.h"
#include "rtc_base/third_party/base64/base64.h"
#include "rtc_base/zero_memory.h"
diff --git a/pc/srtp_filter.h b/pc/srtp_filter.h
index 4ab0dd7..5b6c99d 100644
--- a/pc/srtp_filter.h
+++ b/pc/srtp_filter.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_SRTPFILTER_H_
-#define PC_SRTPFILTER_H_
+#ifndef PC_SRTP_FILTER_H_
+#define PC_SRTP_FILTER_H_
#include <list>
#include <map>
@@ -19,13 +19,13 @@
#include "absl/types/optional.h"
#include "api/array_view.h"
-#include "api/cryptoparams.h"
+#include "api/crypto_params.h"
#include "api/jsep.h"
-#include "pc/sessiondescription.h"
+#include "pc/session_description.h"
#include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/ssl_stream_adapter.h"
#include "rtc_base/thread_checker.h"
// Forward declaration to avoid pulling in libsrtp headers here
@@ -143,4 +143,4 @@
} // namespace cricket
-#endif // PC_SRTPFILTER_H_
+#endif // PC_SRTP_FILTER_H_
diff --git a/pc/srtp_filter_unittest.cc b/pc/srtp_filter_unittest.cc
index 326e1ba..d7368d1 100644
--- a/pc/srtp_filter_unittest.cc
+++ b/pc/srtp_filter_unittest.cc
@@ -10,9 +10,9 @@
#include <string.h>
-#include "api/cryptoparams.h"
-#include "pc/srtpfilter.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "api/crypto_params.h"
+#include "pc/srtp_filter.h"
+#include "rtc_base/ssl_stream_adapter.h"
#include "test/gtest.h"
using cricket::CryptoParams;
diff --git a/pc/srtp_session.cc b/pc/srtp_session.cc
index aadd471..fccf7da 100644
--- a/pc/srtp_session.cc
+++ b/pc/srtp_session.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/srtpsession.h"
+#include "pc/srtp_session.h"
-#include "media/base/rtputils.h"
-#include "pc/externalhmac.h"
-#include "rtc_base/criticalsection.h"
+#include "media/base/rtp_utils.h"
+#include "pc/external_hmac.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/logging.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ssl_stream_adapter.h"
#include "system_wrappers/include/metrics.h"
#include "third_party/libsrtp/include/srtp.h"
#include "third_party/libsrtp/include/srtp_priv.h"
diff --git a/pc/srtp_session.h b/pc/srtp_session.h
index ce05ce6..dd89e43 100644
--- a/pc/srtp_session.h
+++ b/pc/srtp_session.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_SRTPSESSION_H_
-#define PC_SRTPSESSION_H_
+#ifndef PC_SRTP_SESSION_H_
+#define PC_SRTP_SESSION_H_
#include <vector>
@@ -128,4 +128,4 @@
} // namespace cricket
-#endif // PC_SRTPSESSION_H_
+#endif // PC_SRTP_SESSION_H_
diff --git a/pc/srtp_session_unittest.cc b/pc/srtp_session_unittest.cc
index b95f19f..dc0be62 100644
--- a/pc/srtp_session_unittest.cc
+++ b/pc/srtp_session_unittest.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/srtpsession.h"
+#include "pc/srtp_session.h"
#include <string.h>
#include <string>
-#include "media/base/fakertp.h"
-#include "pc/srtptestutil.h"
-#include "rtc_base/byteorder.h"
-#include "rtc_base/sslstreamadapter.h" // For rtc::SRTP_*
+#include "media/base/fake_rtp.h"
+#include "pc/test/srtp_test_util.h"
+#include "rtc_base/byte_order.h"
+#include "rtc_base/ssl_stream_adapter.h" // For rtc::SRTP_*
#include "system_wrappers/include/metrics.h"
#include "test/gtest.h"
#include "third_party/libsrtp/include/srtp.h"
diff --git a/pc/srtp_transport.cc b/pc/srtp_transport.cc
index 8585fec..c7e4f0e 100644
--- a/pc/srtp_transport.cc
+++ b/pc/srtp_transport.cc
@@ -8,22 +8,22 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/srtptransport.h"
+#include "pc/srtp_transport.h"
#include <stdint.h>
#include <string.h>
#include <string>
#include <vector>
-#include "media/base/rtputils.h"
-#include "pc/rtptransport.h"
-#include "pc/srtpsession.h"
-#include "rtc_base/asyncpacketsocket.h"
+#include "media/base/rtp_utils.h"
+#include "pc/rtp_transport.h"
+#include "pc/srtp_session.h"
+#include "rtc_base/async_packet_socket.h"
#include "rtc_base/checks.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ssl_stream_adapter.h"
#include "rtc_base/third_party/base64/base64.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/trace_event.h"
diff --git a/pc/srtp_transport.h b/pc/srtp_transport.h
index 57809d4..7512711 100644
--- a/pc/srtp_transport.h
+++ b/pc/srtp_transport.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_SRTPTRANSPORT_H_
-#define PC_SRTPTRANSPORT_H_
+#ifndef PC_SRTP_TRANSPORT_H_
+#define PC_SRTP_TRANSPORT_H_
#include <stddef.h>
#include <cstdint>
@@ -18,15 +18,15 @@
#include <vector>
#include "absl/types/optional.h"
-#include "api/cryptoparams.h"
-#include "api/rtcerror.h"
-#include "p2p/base/packettransportinternal.h"
-#include "pc/rtptransport.h"
-#include "pc/srtpsession.h"
-#include "rtc_base/asyncpacketsocket.h"
+#include "api/crypto_params.h"
+#include "api/rtc_error.h"
+#include "p2p/base/packet_transport_internal.h"
+#include "pc/rtp_transport.h"
+#include "pc/srtp_session.h"
+#include "rtc_base/async_packet_socket.h"
#include "rtc_base/buffer.h"
-#include "rtc_base/copyonwritebuffer.h"
-#include "rtc_base/networkroute.h"
+#include "rtc_base/copy_on_write_buffer.h"
+#include "rtc_base/network_route.h"
namespace webrtc {
@@ -170,4 +170,4 @@
} // namespace webrtc
-#endif // PC_SRTPTRANSPORT_H_
+#endif // PC_SRTP_TRANSPORT_H_
diff --git a/pc/srtp_transport_unittest.cc b/pc/srtp_transport_unittest.cc
index 8f16836..d429283 100644
--- a/pc/srtp_transport_unittest.cc
+++ b/pc/srtp_transport_unittest.cc
@@ -14,16 +14,16 @@
#include "absl/memory/memory.h"
#include "call/rtp_demuxer.h"
-#include "media/base/fakertp.h"
-#include "p2p/base/dtlstransportinternal.h"
-#include "p2p/base/fakepackettransport.h"
-#include "pc/rtptransporttestutil.h"
-#include "pc/srtptestutil.h"
-#include "pc/srtptransport.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/byteorder.h"
+#include "media/base/fake_rtp.h"
+#include "p2p/base/dtls_transport_internal.h"
+#include "p2p/base/fake_packet_transport.h"
+#include "pc/srtp_transport.h"
+#include "pc/test/rtp_transport_test_util.h"
+#include "pc/test/srtp_test_util.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/byte_order.h"
#include "rtc_base/checks.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ssl_stream_adapter.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "test/gtest.h"
diff --git a/pc/stats_collector.cc b/pc/stats_collector.cc
index f9aa4f4..178f05e 100644
--- a/pc/stats_collector.cc
+++ b/pc/stats_collector.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/statscollector.h"
+#include "pc/stats_collector.h"
#include <memory>
#include <set>
@@ -16,7 +16,7 @@
#include <vector>
#include "pc/channel.h"
-#include "pc/peerconnection.h"
+#include "pc/peer_connection.h"
#include "rtc_base/checks.h"
#include "rtc_base/third_party/base64/base64.h"
diff --git a/pc/stats_collector.h b/pc/stats_collector.h
index 786d5df..d0be338 100644
--- a/pc/stats_collector.h
+++ b/pc/stats_collector.h
@@ -11,8 +11,8 @@
// This file contains a class used for gathering statistics from an ongoing
// libjingle PeerConnection.
-#ifndef PC_STATSCOLLECTOR_H_
-#define PC_STATSCOLLECTOR_H_
+#ifndef PC_STATS_COLLECTOR_H_
+#define PC_STATS_COLLECTOR_H_
#include <stdint.h>
#include <map>
@@ -21,13 +21,13 @@
#include <utility>
#include <vector>
-#include "api/mediastreaminterface.h"
-#include "api/peerconnectioninterface.h"
-#include "api/statstypes.h"
+#include "api/media_stream_interface.h"
+#include "api/peer_connection_interface.h"
+#include "api/stats_types.h"
#include "p2p/base/port.h"
-#include "pc/peerconnectioninternal.h"
+#include "pc/peer_connection_internal.h"
#include "rtc_base/network_constants.h"
-#include "rtc_base/sslcertificate.h"
+#include "rtc_base/ssl_certificate.h"
namespace webrtc {
@@ -154,4 +154,4 @@
} // namespace webrtc
-#endif // PC_STATSCOLLECTOR_H_
+#endif // PC_STATS_COLLECTOR_H_
diff --git a/pc/stats_collector_unittest.cc b/pc/stats_collector_unittest.cc
index 582b60d..4fdb8cd 100644
--- a/pc/stats_collector_unittest.cc
+++ b/pc/stats_collector_unittest.cc
@@ -16,28 +16,28 @@
#include "absl/types/optional.h"
#include "api/audio_codecs/audio_encoder.h"
#include "api/candidate.h"
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
#include "call/call.h"
-#include "media/base/mediachannel.h"
+#include "media/base/media_channel.h"
#include "modules/audio_processing/include/audio_processing_statistics.h"
-#include "pc/datachannel.h"
-#include "pc/mediastream.h"
-#include "pc/mediastreamtrack.h"
-#include "pc/statscollector.h"
-#include "pc/test/fakepeerconnectionforstats.h"
-#include "pc/test/fakevideotracksource.h"
-#include "pc/transportstats.h"
-#include "pc/videotrack.h"
-#include "rtc_base/fakesslidentity.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/nethelper.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/rtccertificate.h"
+#include "pc/data_channel.h"
+#include "pc/media_stream.h"
+#include "pc/media_stream_track.h"
+#include "pc/stats_collector.h"
+#include "pc/test/fake_peer_connection_for_stats.h"
+#include "pc/test/fake_video_track_source.h"
+#include "pc/transport_stats.h"
+#include "pc/video_track.h"
+#include "rtc_base/fake_ssl_identity.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/net_helper.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/rtc_certificate.h"
#include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/sslstreamadapter.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/ssl_stream_adapter.h"
+#include "rtc_base/string_encode.h"
#include "rtc_base/third_party/base64/base64.h"
#include "rtc_base/thread.h"
#include "test/gtest.h"
diff --git a/pc/stream_collection.h b/pc/stream_collection.h
index 76317f9..28cd46f 100644
--- a/pc/stream_collection.h
+++ b/pc/stream_collection.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_STREAMCOLLECTION_H_
-#define PC_STREAMCOLLECTION_H_
+#ifndef PC_STREAM_COLLECTION_H_
+#define PC_STREAM_COLLECTION_H_
#include <string>
#include <vector>
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
namespace webrtc {
@@ -99,4 +99,4 @@
} // namespace webrtc
-#endif // PC_STREAMCOLLECTION_H_
+#endif // PC_STREAM_COLLECTION_H_
diff --git a/pc/test/android_test_initializer.cc b/pc/test/android_test_initializer.cc
index a67716d..584aeda 100644
--- a/pc/test/android_test_initializer.cc
+++ b/pc/test/android_test_initializer.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
#include <pthread.h>
@@ -28,7 +28,7 @@
// TODO(phoglund): This include is also to a target we can't really depend on.
// We need to either break it out into a smaller target or find some way to
// not use it.
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/ssl_adapter.h"
namespace webrtc {
diff --git a/pc/test/android_test_initializer.h b/pc/test/android_test_initializer.h
index 9c00a63..4181dd2 100644
--- a/pc/test/android_test_initializer.h
+++ b/pc/test/android_test_initializer.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_TEST_ANDROIDTESTINITIALIZER_H_
-#define PC_TEST_ANDROIDTESTINITIALIZER_H_
+#ifndef PC_TEST_ANDROID_TEST_INITIALIZER_H_
+#define PC_TEST_ANDROID_TEST_INITIALIZER_H_
namespace webrtc {
@@ -17,4 +17,4 @@
} // namespace webrtc
-#endif // PC_TEST_ANDROIDTESTINITIALIZER_H_
+#endif // PC_TEST_ANDROID_TEST_INITIALIZER_H_
diff --git a/pc/test/fake_audio_capture_module.cc b/pc/test/fake_audio_capture_module.cc
index fbb1ebb..db0886d 100644
--- a/pc/test/fake_audio_capture_module.cc
+++ b/pc/test/fake_audio_capture_module.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/test/fakeaudiocapturemodule.h"
+#include "pc/test/fake_audio_capture_module.h"
#include <string.h>
#include "rtc_base/checks.h"
#include "rtc_base/location.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
// Audio sample value that is high enough that it doesn't occur naturally when
// frames are being faked. E.g. NetEq will not generate this large sample value
diff --git a/pc/test/fake_audio_capture_module.h b/pc/test/fake_audio_capture_module.h
index 2f56ef4..495cd01 100644
--- a/pc/test/fake_audio_capture_module.h
+++ b/pc/test/fake_audio_capture_module.h
@@ -17,15 +17,15 @@
// Note P postfix of a function indicates that it should only be called by the
// processing thread.
-#ifndef PC_TEST_FAKEAUDIOCAPTUREMODULE_H_
-#define PC_TEST_FAKEAUDIOCAPTUREMODULE_H_
+#ifndef PC_TEST_FAKE_AUDIO_CAPTURE_MODULE_H_
+#define PC_TEST_FAKE_AUDIO_CAPTURE_MODULE_H_
#include <memory>
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_device/include/audio_device.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/messagehandler.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/message_handler.h"
#include "rtc_base/scoped_ref_ptr.h"
namespace rtc {
@@ -224,4 +224,4 @@
rtc::CriticalSection crit_callback_;
};
-#endif // PC_TEST_FAKEAUDIOCAPTUREMODULE_H_
+#endif // PC_TEST_FAKE_AUDIO_CAPTURE_MODULE_H_
diff --git a/pc/test/fake_audio_capture_module_unittest.cc b/pc/test/fake_audio_capture_module_unittest.cc
index 8e6db4b..30a8090 100644
--- a/pc/test/fake_audio_capture_module_unittest.cc
+++ b/pc/test/fake_audio_capture_module_unittest.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/test/fakeaudiocapturemodule.h"
+#include "pc/test/fake_audio_capture_module.h"
#include <string.h>
#include <algorithm>
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/gunit.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "test/gtest.h"
diff --git a/pc/test/fake_data_channel_provider.h b/pc/test/fake_data_channel_provider.h
index 83c5cb3..2ada4a9 100644
--- a/pc/test/fake_data_channel_provider.h
+++ b/pc/test/fake_data_channel_provider.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_TEST_FAKEDATACHANNELPROVIDER_H_
-#define PC_TEST_FAKEDATACHANNELPROVIDER_H_
+#ifndef PC_TEST_FAKE_DATA_CHANNEL_PROVIDER_H_
+#define PC_TEST_FAKE_DATA_CHANNEL_PROVIDER_H_
#include <set>
-#include "pc/datachannel.h"
+#include "pc/data_channel.h"
#include "rtc_base/checks.h"
class FakeDataChannelProvider : public webrtc::DataChannelProviderInterface {
@@ -152,4 +152,4 @@
std::set<uint32_t> send_ssrcs_;
std::set<uint32_t> recv_ssrcs_;
};
-#endif // PC_TEST_FAKEDATACHANNELPROVIDER_H_
+#endif // PC_TEST_FAKE_DATA_CHANNEL_PROVIDER_H_
diff --git a/pc/test/fake_peer_connection_base.h b/pc/test/fake_peer_connection_base.h
index b4bc7b9..85feebc 100644
--- a/pc/test/fake_peer_connection_base.h
+++ b/pc/test/fake_peer_connection_base.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_TEST_FAKEPEERCONNECTIONBASE_H_
-#define PC_TEST_FAKEPEERCONNECTIONBASE_H_
+#ifndef PC_TEST_FAKE_PEER_CONNECTION_BASE_H_
+#define PC_TEST_FAKE_PEER_CONNECTION_BASE_H_
#include <map>
#include <memory>
@@ -17,7 +17,7 @@
#include <string>
#include <vector>
-#include "pc/peerconnectioninternal.h"
+#include "pc/peer_connection_internal.h"
namespace webrtc {
@@ -299,4 +299,4 @@
} // namespace webrtc
-#endif // PC_TEST_FAKEPEERCONNECTIONBASE_H_
+#endif // PC_TEST_FAKE_PEER_CONNECTION_BASE_H_
diff --git a/pc/test/fake_peer_connection_for_stats.h b/pc/test/fake_peer_connection_for_stats.h
index 9540ee7..e33514a 100644
--- a/pc/test/fake_peer_connection_for_stats.h
+++ b/pc/test/fake_peer_connection_for_stats.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_TEST_FAKEPEERCONNECTIONFORSTATS_H_
-#define PC_TEST_FAKEPEERCONNECTIONFORSTATS_H_
+#ifndef PC_TEST_FAKE_PEER_CONNECTION_FOR_STATS_H_
+#define PC_TEST_FAKE_PEER_CONNECTION_FOR_STATS_H_
#include <map>
#include <memory>
@@ -19,10 +19,10 @@
#include <vector>
#include "absl/memory/memory.h"
-#include "media/base/fakemediaengine.h"
-#include "pc/streamcollection.h"
-#include "pc/test/fakedatachannelprovider.h"
-#include "pc/test/fakepeerconnectionbase.h"
+#include "media/base/fake_media_engine.h"
+#include "pc/stream_collection.h"
+#include "pc/test/fake_data_channel_provider.h"
+#include "pc/test/fake_peer_connection_base.h"
namespace webrtc {
@@ -384,4 +384,4 @@
} // namespace webrtc
-#endif // PC_TEST_FAKEPEERCONNECTIONFORSTATS_H_
+#endif // PC_TEST_FAKE_PEER_CONNECTION_FOR_STATS_H_
diff --git a/pc/test/fake_periodic_video_source.h b/pc/test/fake_periodic_video_source.h
index 146d49e..597f0ee 100644
--- a/pc/test/fake_periodic_video_source.h
+++ b/pc/test/fake_periodic_video_source.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_TEST_FAKEPERIODICVIDEOSOURCE_H_
-#define PC_TEST_FAKEPERIODICVIDEOSOURCE_H_
+#ifndef PC_TEST_FAKE_PERIODIC_VIDEO_SOURCE_H_
+#define PC_TEST_FAKE_PERIODIC_VIDEO_SOURCE_H_
#include <memory>
#include "absl/memory/memory.h"
#include "api/video/video_source_interface.h"
-#include "media/base/fakeframesource.h"
-#include "media/base/videobroadcaster.h"
+#include "media/base/fake_frame_source.h"
+#include "media/base/video_broadcaster.h"
#include "rtc_base/task_queue.h"
namespace webrtc {
@@ -99,4 +99,4 @@
} // namespace webrtc
-#endif // PC_TEST_FAKEPERIODICVIDEOSOURCE_H_
+#endif // PC_TEST_FAKE_PERIODIC_VIDEO_SOURCE_H_
diff --git a/pc/test/fake_periodic_video_track_source.h b/pc/test/fake_periodic_video_track_source.h
index ab428d8..cc406d6 100644
--- a/pc/test/fake_periodic_video_track_source.h
+++ b/pc/test/fake_periodic_video_track_source.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_TEST_FAKEPERIODICVIDEOTRACKSOURCE_H_
-#define PC_TEST_FAKEPERIODICVIDEOTRACKSOURCE_H_
+#ifndef PC_TEST_FAKE_PERIODIC_VIDEO_TRACK_SOURCE_H_
+#define PC_TEST_FAKE_PERIODIC_VIDEO_TRACK_SOURCE_H_
-#include "pc/test/fakeperiodicvideosource.h"
-#include "pc/videotracksource.h"
+#include "pc/test/fake_periodic_video_source.h"
+#include "pc/video_track_source.h"
namespace webrtc {
@@ -38,4 +38,4 @@
} // namespace webrtc
-#endif // PC_TEST_FAKEPERIODICVIDEOTRACKSOURCE_H_
+#endif // PC_TEST_FAKE_PERIODIC_VIDEO_TRACK_SOURCE_H_
diff --git a/pc/test/fake_rtc_certificate_generator.h b/pc/test/fake_rtc_certificate_generator.h
index a3e7654..9c43ba9 100644
--- a/pc/test/fake_rtc_certificate_generator.h
+++ b/pc/test/fake_rtc_certificate_generator.h
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_
-#define PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_
+#ifndef PC_TEST_FAKE_RTC_CERTIFICATE_GENERATOR_H_
+#define PC_TEST_FAKE_RTC_CERTIFICATE_GENERATOR_H_
#include <memory>
#include <string>
#include <utility>
-#include "api/peerconnectioninterface.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/rtccertificategenerator.h"
+#include "api/peer_connection_interface.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/rtc_certificate_generator.h"
// RSA with mod size 1024, pub exp 0x10001.
static const rtc::RTCCertificatePEM kRsaPems[] = {
@@ -241,4 +241,4 @@
int generated_failures_ = 0;
};
-#endif // PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_
+#endif // PC_TEST_FAKE_RTC_CERTIFICATE_GENERATOR_H_
diff --git a/pc/test/fake_sctp_transport.h b/pc/test/fake_sctp_transport.h
index 294376d..b2c5c1a 100644
--- a/pc/test/fake_sctp_transport.h
+++ b/pc/test/fake_sctp_transport.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_TEST_FAKESCTPTRANSPORT_H_
-#define PC_TEST_FAKESCTPTRANSPORT_H_
+#ifndef PC_TEST_FAKE_SCTP_TRANSPORT_H_
+#define PC_TEST_FAKE_SCTP_TRANSPORT_H_
#include <memory>
-#include "media/sctp/sctptransportinternal.h"
+#include "media/sctp/sctp_transport_internal.h"
// Used for tests in this file to verify that PeerConnection responds to signals
// from the SctpTransport correctly, and calls Start with the correct
@@ -61,4 +61,4 @@
FakeSctpTransport* last_fake_sctp_transport_ = nullptr;
};
-#endif // PC_TEST_FAKESCTPTRANSPORT_H_
+#endif // PC_TEST_FAKE_SCTP_TRANSPORT_H_
diff --git a/pc/test/fake_video_track_renderer.h b/pc/test/fake_video_track_renderer.h
index 617261a..f6e341b 100644
--- a/pc/test/fake_video_track_renderer.h
+++ b/pc/test/fake_video_track_renderer.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_TEST_FAKEVIDEOTRACKRENDERER_H_
-#define PC_TEST_FAKEVIDEOTRACKRENDERER_H_
+#ifndef PC_TEST_FAKE_VIDEO_TRACK_RENDERER_H_
+#define PC_TEST_FAKE_VIDEO_TRACK_RENDERER_H_
-#include "api/mediastreaminterface.h"
-#include "media/base/fakevideorenderer.h"
+#include "api/media_stream_interface.h"
+#include "media/base/fake_video_renderer.h"
namespace webrtc {
@@ -30,4 +30,4 @@
} // namespace webrtc
-#endif // PC_TEST_FAKEVIDEOTRACKRENDERER_H_
+#endif // PC_TEST_FAKE_VIDEO_TRACK_RENDERER_H_
diff --git a/pc/test/fake_video_track_source.h b/pc/test/fake_video_track_source.h
index 1b5bd87..295201e 100644
--- a/pc/test/fake_video_track_source.h
+++ b/pc/test/fake_video_track_source.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_TEST_FAKEVIDEOTRACKSOURCE_H_
-#define PC_TEST_FAKEVIDEOTRACKSOURCE_H_
+#ifndef PC_TEST_FAKE_VIDEO_TRACK_SOURCE_H_
+#define PC_TEST_FAKE_VIDEO_TRACK_SOURCE_H_
-#include "api/mediastreaminterface.h"
-#include "pc/videotracksource.h"
+#include "api/media_stream_interface.h"
+#include "pc/video_track_source.h"
namespace webrtc {
@@ -47,4 +47,4 @@
} // namespace webrtc
-#endif // PC_TEST_FAKEVIDEOTRACKSOURCE_H_
+#endif // PC_TEST_FAKE_VIDEO_TRACK_SOURCE_H_
diff --git a/pc/test/frame_generator_capturer_video_track_source.h b/pc/test/frame_generator_capturer_video_track_source.h
index c9324ed..3c68d1b 100644
--- a/pc/test/frame_generator_capturer_video_track_source.h
+++ b/pc/test/frame_generator_capturer_video_track_source.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_TEST_FRAMEGENERATORCAPTURERVIDEOTRACKSOURCE_H_
-#define PC_TEST_FRAMEGENERATORCAPTURERVIDEOTRACKSOURCE_H_
+#ifndef PC_TEST_FRAME_GENERATOR_CAPTURER_VIDEO_TRACK_SOURCE_H_
+#define PC_TEST_FRAME_GENERATOR_CAPTURER_VIDEO_TRACK_SOURCE_H_
#include <memory>
#include <utility>
-#include "pc/videotracksource.h"
+#include "pc/video_track_source.h"
#include "test/frame_generator_capturer.h"
namespace webrtc {
@@ -73,4 +73,4 @@
} // namespace webrtc
-#endif // PC_TEST_FRAMEGENERATORCAPTURERVIDEOTRACKSOURCE_H_
+#endif // PC_TEST_FRAME_GENERATOR_CAPTURER_VIDEO_TRACK_SOURCE_H_
diff --git a/pc/test/mock_channel_interface.h b/pc/test/mock_channel_interface.h
index 4c32a8f..b559e84 100644
--- a/pc/test/mock_channel_interface.h
+++ b/pc/test/mock_channel_interface.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_TEST_MOCK_CHANNELINTERFACE_H_
-#define PC_TEST_MOCK_CHANNELINTERFACE_H_
+#ifndef PC_TEST_MOCK_CHANNEL_INTERFACE_H_
+#define PC_TEST_MOCK_CHANNEL_INTERFACE_H_
#include <string>
-#include "pc/channelinterface.h"
+#include "pc/channel_interface.h"
#include "test/gmock.h"
namespace cricket {
@@ -44,4 +44,4 @@
} // namespace cricket
-#endif // PC_TEST_MOCK_CHANNELINTERFACE_H_
+#endif // PC_TEST_MOCK_CHANNEL_INTERFACE_H_
diff --git a/pc/test/mock_data_channel.h b/pc/test/mock_data_channel.h
index fe88714..2db0c36 100644
--- a/pc/test/mock_data_channel.h
+++ b/pc/test/mock_data_channel.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_TEST_MOCK_DATACHANNEL_H_
-#define PC_TEST_MOCK_DATACHANNEL_H_
+#ifndef PC_TEST_MOCK_DATA_CHANNEL_H_
+#define PC_TEST_MOCK_DATA_CHANNEL_H_
#include <string>
-#include "pc/datachannel.h"
+#include "pc/data_channel.h"
#include "test/gmock.h"
namespace webrtc {
@@ -54,4 +54,4 @@
} // namespace webrtc
-#endif // PC_TEST_MOCK_DATACHANNEL_H_
+#endif // PC_TEST_MOCK_DATA_CHANNEL_H_
diff --git a/pc/test/mock_peer_connection_observers.h b/pc/test/mock_peer_connection_observers.h
index 0657853..eeac9b0 100644
--- a/pc/test/mock_peer_connection_observers.h
+++ b/pc/test/mock_peer_connection_observers.h
@@ -11,8 +11,8 @@
// This file contains mock implementations of observers used in PeerConnection.
// TODO(steveanton): These aren't really mocks and should be renamed.
-#ifndef PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_
-#define PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_
+#ifndef PC_TEST_MOCK_PEER_CONNECTION_OBSERVERS_H_
+#define PC_TEST_MOCK_PEER_CONNECTION_OBSERVERS_H_
#include <map>
#include <memory>
@@ -21,9 +21,9 @@
#include <vector>
#include "absl/memory/memory.h"
-#include "api/datachannelinterface.h"
-#include "api/jsepicecandidate.h"
-#include "pc/streamcollection.h"
+#include "api/data_channel_interface.h"
+#include "api/jsep_ice_candidate.h"
+#include "pc/stream_collection.h"
#include "rtc_base/checks.h"
namespace webrtc {
@@ -515,4 +515,4 @@
} // namespace webrtc
-#endif // PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_
+#endif // PC_TEST_MOCK_PEER_CONNECTION_OBSERVERS_H_
diff --git a/pc/test/mock_rtp_receiver_internal.h b/pc/test/mock_rtp_receiver_internal.h
index 84b0d71..10807da 100644
--- a/pc/test/mock_rtp_receiver_internal.h
+++ b/pc/test/mock_rtp_receiver_internal.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_TEST_MOCK_RTPRECEIVERINTERNAL_H_
-#define PC_TEST_MOCK_RTPRECEIVERINTERNAL_H_
+#ifndef PC_TEST_MOCK_RTP_RECEIVER_INTERNAL_H_
+#define PC_TEST_MOCK_RTP_RECEIVER_INTERNAL_H_
#include <string>
#include <vector>
-#include "pc/rtpreceiver.h"
+#include "pc/rtp_receiver.h"
#include "test/gmock.h"
namespace webrtc {
@@ -54,4 +54,4 @@
} // namespace webrtc
-#endif // PC_TEST_MOCK_RTPRECEIVERINTERNAL_H_
+#endif // PC_TEST_MOCK_RTP_RECEIVER_INTERNAL_H_
diff --git a/pc/test/mock_rtp_sender_internal.h b/pc/test/mock_rtp_sender_internal.h
index dd4f694..7859175 100644
--- a/pc/test/mock_rtp_sender_internal.h
+++ b/pc/test/mock_rtp_sender_internal.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_TEST_MOCK_RTPSENDERINTERNAL_H_
-#define PC_TEST_MOCK_RTPSENDERINTERNAL_H_
+#ifndef PC_TEST_MOCK_RTP_SENDER_INTERNAL_H_
+#define PC_TEST_MOCK_RTP_SENDER_INTERNAL_H_
#include <string>
#include <vector>
-#include "pc/rtpsender.h"
+#include "pc/rtp_sender.h"
#include "test/gmock.h"
namespace webrtc {
@@ -50,4 +50,4 @@
} // namespace webrtc
-#endif // PC_TEST_MOCK_RTPSENDERINTERNAL_H_
+#endif // PC_TEST_MOCK_RTP_SENDER_INTERNAL_H_
diff --git a/pc/test/peer_connection_test_wrapper.cc b/pc/test/peer_connection_test_wrapper.cc
index 96007bb..089a780 100644
--- a/pc/test/peer_connection_test_wrapper.cc
+++ b/pc/test/peer_connection_test_wrapper.cc
@@ -23,20 +23,20 @@
#include "api/video_codecs/video_encoder_factory.h"
#include "modules/audio_device/include/audio_device.h"
#include "modules/audio_processing/include/audio_processing.h"
-#include "p2p/base/fakeportallocator.h"
-#include "p2p/base/portallocator.h"
-#include "pc/test/fakeperiodicvideosource.h"
-#include "pc/test/fakeperiodicvideotracksource.h"
-#include "pc/test/fakertccertificategenerator.h"
-#include "pc/test/mockpeerconnectionobservers.h"
-#include "pc/test/peerconnectiontestwrapper.h"
+#include "p2p/base/fake_port_allocator.h"
+#include "p2p/base/port_allocator.h"
+#include "pc/test/fake_periodic_video_source.h"
+#include "pc/test/fake_periodic_video_track_source.h"
+#include "pc/test/fake_rtc_certificate_generator.h"
+#include "pc/test/mock_peer_connection_observers.h"
+#include "pc/test/peer_connection_test_wrapper.h"
#include "rtc_base/gunit.h"
#include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/rtccertificategenerator.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/rtc_certificate_generator.h"
+#include "rtc_base/string_encode.h"
#include "rtc_base/thread_checker.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "test/gtest.h"
using webrtc::FakeConstraints;
diff --git a/pc/test/peer_connection_test_wrapper.h b/pc/test/peer_connection_test_wrapper.h
index defe8f3..8bbf42f 100644
--- a/pc/test/peer_connection_test_wrapper.h
+++ b/pc/test/peer_connection_test_wrapper.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_TEST_PEERCONNECTIONTESTWRAPPER_H_
-#define PC_TEST_PEERCONNECTIONTESTWRAPPER_H_
+#ifndef PC_TEST_PEER_CONNECTION_TEST_WRAPPER_H_
+#define PC_TEST_PEER_CONNECTION_TEST_WRAPPER_H_
#include <memory>
#include <string>
@@ -18,15 +18,15 @@
#include "api/audio_codecs/audio_decoder_factory.h"
#include "api/audio_codecs/audio_encoder_factory.h"
#include "api/audio_options.h"
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
#include "api/jsep.h"
-#include "api/mediastreaminterface.h"
-#include "api/peerconnectioninterface.h"
-#include "api/rtcerror.h"
-#include "api/rtpreceiverinterface.h"
-#include "api/test/fakeconstraints.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "pc/test/fakevideotrackrenderer.h"
+#include "api/media_stream_interface.h"
+#include "api/peer_connection_interface.h"
+#include "api/rtc_error.h"
+#include "api/rtp_receiver_interface.h"
+#include "api/test/fake_constraints.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "pc/test/fake_video_track_renderer.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
@@ -126,4 +126,4 @@
int num_get_user_media_calls_ = 0;
};
-#endif // PC_TEST_PEERCONNECTIONTESTWRAPPER_H_
+#endif // PC_TEST_PEER_CONNECTION_TEST_WRAPPER_H_
diff --git a/pc/test/rtc_stats_obtainer.h b/pc/test/rtc_stats_obtainer.h
index cb8ecd5..f0ec3eb 100644
--- a/pc/test/rtc_stats_obtainer.h
+++ b/pc/test/rtc_stats_obtainer.h
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_TEST_RTCSTATSOBTAINER_H_
-#define PC_TEST_RTCSTATSOBTAINER_H_
+#ifndef PC_TEST_RTC_STATS_OBTAINER_H_
+#define PC_TEST_RTC_STATS_OBTAINER_H_
-#include "api/stats/rtcstatsreport.h"
+#include "api/stats/rtc_stats_report.h"
#include "rtc_base/gunit.h"
namespace webrtc {
@@ -50,4 +50,4 @@
} // namespace webrtc
-#endif // PC_TEST_RTCSTATSOBTAINER_H_
+#endif // PC_TEST_RTC_STATS_OBTAINER_H_
diff --git a/pc/test/rtp_transport_test_util.h b/pc/test/rtp_transport_test_util.h
index f2c3512..0353b74 100644
--- a/pc/test/rtp_transport_test_util.h
+++ b/pc/test/rtp_transport_test_util.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_RTPTRANSPORTTESTUTIL_H_
-#define PC_RTPTRANSPORTTESTUTIL_H_
+#ifndef PC_TEST_RTP_TRANSPORT_TEST_UTIL_H_
+#define PC_TEST_RTP_TRANSPORT_TEST_UTIL_H_
#include "call/rtp_packet_sink_interface.h"
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
-#include "pc/rtptransportinternal.h"
+#include "pc/rtp_transport_internal.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
namespace webrtc {
@@ -75,4 +75,4 @@
} // namespace webrtc
-#endif // PC_RTPTRANSPORTTESTUTIL_H_
+#endif // PC_TEST_RTP_TRANSPORT_TEST_UTIL_H_
diff --git a/pc/test/srtp_test_util.h b/pc/test/srtp_test_util.h
index edb3d76..ed12e54 100644
--- a/pc/test/srtp_test_util.h
+++ b/pc/test/srtp_test_util.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_SRTPTESTUTIL_H_
-#define PC_SRTPTESTUTIL_H_
+#ifndef PC_TEST_SRTP_TEST_UTIL_H_
+#define PC_TEST_SRTP_TEST_UTIL_H_
#include <string>
@@ -42,4 +42,4 @@
} // namespace rtc
-#endif // PC_SRTPTESTUTIL_H_
+#endif // PC_TEST_SRTP_TEST_UTIL_H_
diff --git a/pc/test/test_sdp_strings.h b/pc/test/test_sdp_strings.h
index ba139e2..849757d 100644
--- a/pc/test/test_sdp_strings.h
+++ b/pc/test/test_sdp_strings.h
@@ -10,8 +10,8 @@
// This file contain SDP strings used for testing.
-#ifndef PC_TEST_TESTSDPSTRINGS_H_
-#define PC_TEST_TESTSDPSTRINGS_H_
+#ifndef PC_TEST_TEST_SDP_STRINGS_H_
+#define PC_TEST_TEST_SDP_STRINGS_H_
namespace webrtc {
@@ -181,4 +181,4 @@
} // namespace webrtc
-#endif // PC_TEST_TESTSDPSTRINGS_H_
+#endif // PC_TEST_TEST_SDP_STRINGS_H_
diff --git a/pc/track_media_info_map.cc b/pc/track_media_info_map.cc
index b5abb7e..459f3ea 100644
--- a/pc/track_media_info_map.cc
+++ b/pc/track_media_info_map.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/trackmediainfomap.h"
+#include "pc/track_media_info_map.h"
#include <string>
#include <utility>
diff --git a/pc/track_media_info_map.h b/pc/track_media_info_map.h
index fa1f7e7..542501e 100644
--- a/pc/track_media_info_map.h
+++ b/pc/track_media_info_map.h
@@ -8,19 +8,19 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_TRACKMEDIAINFOMAP_H_
-#define PC_TRACKMEDIAINFOMAP_H_
+#ifndef PC_TRACK_MEDIA_INFO_MAP_H_
+#define PC_TRACK_MEDIA_INFO_MAP_H_
#include <map>
#include <memory>
#include <string>
#include <vector>
-#include "api/mediastreaminterface.h"
-#include "media/base/mediachannel.h"
-#include "pc/rtpreceiver.h"
-#include "pc/rtpsender.h"
-#include "rtc_base/refcount.h"
+#include "api/media_stream_interface.h"
+#include "media/base/media_channel.h"
+#include "pc/rtp_receiver.h"
+#include "pc/rtp_sender.h"
+#include "rtc_base/ref_count.h"
namespace webrtc {
@@ -127,4 +127,4 @@
} // namespace webrtc
-#endif // PC_TRACKMEDIAINFOMAP_H_
+#endif // PC_TRACK_MEDIA_INFO_MAP_H_
diff --git a/pc/track_media_info_map_unittest.cc b/pc/track_media_info_map_unittest.cc
index 1b320d0..9edd60e 100644
--- a/pc/track_media_info_map_unittest.cc
+++ b/pc/track_media_info_map_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/trackmediainfomap.h"
+#include "pc/track_media_info_map.h"
#include <initializer_list>
#include <memory>
@@ -16,15 +16,15 @@
#include <utility>
#include <vector>
-#include "api/rtpreceiverinterface.h"
-#include "api/rtpsenderinterface.h"
-#include "media/base/mediachannel.h"
-#include "pc/audiotrack.h"
-#include "pc/test/fakevideotracksource.h"
-#include "pc/test/mock_rtpreceiverinternal.h"
-#include "pc/test/mock_rtpsenderinternal.h"
-#include "pc/videotrack.h"
-#include "rtc_base/refcount.h"
+#include "api/rtp_receiver_interface.h"
+#include "api/rtp_sender_interface.h"
+#include "media/base/media_channel.h"
+#include "pc/audio_track.h"
+#include "pc/test/fake_video_track_source.h"
+#include "pc/test/mock_rtp_receiver_internal.h"
+#include "pc/test/mock_rtp_sender_internal.h"
+#include "pc/video_track.h"
+#include "rtc_base/ref_count.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/pc/transport_stats.cc b/pc/transport_stats.cc
index df2df58..f6dd7d6 100644
--- a/pc/transport_stats.cc
+++ b/pc/transport_stats.cc
@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/transportstats.h"
+#include "pc/transport_stats.h"
namespace cricket {
diff --git a/pc/transport_stats.h b/pc/transport_stats.h
index 84abc54..8813dbe 100644
--- a/pc/transport_stats.h
+++ b/pc/transport_stats.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_TRANSPORTSTATS_H_
-#define PC_TRANSPORTSTATS_H_
+#ifndef PC_TRANSPORT_STATS_H_
+#define PC_TRANSPORT_STATS_H_
#include <string>
#include <vector>
-#include "p2p/base/dtlstransportinternal.h"
+#include "p2p/base/dtls_transport_internal.h"
#include "p2p/base/port.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ssl_stream_adapter.h"
namespace cricket {
@@ -48,4 +48,4 @@
} // namespace cricket
-#endif // PC_TRANSPORTSTATS_H_
+#endif // PC_TRANSPORT_STATS_H_
diff --git a/pc/unique_id_generator.cc b/pc/unique_id_generator.cc
index 6927bbe..6b508f1 100644
--- a/pc/unique_id_generator.cc
+++ b/pc/unique_id_generator.cc
@@ -14,8 +14,8 @@
#include <vector>
#include "rtc_base/helpers.h"
+#include "rtc_base/string_encode.h"
#include "rtc_base/string_to_number.h"
-#include "rtc_base/stringencode.h"
namespace webrtc {
diff --git a/pc/video_capturer_track_source.cc b/pc/video_capturer_track_source.cc
index 0767dcf..c7403f7 100644
--- a/pc/video_capturer_track_source.cc
+++ b/pc/video_capturer_track_source.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/videocapturertracksource.h"
+#include "pc/video_capturer_track_source.h"
#include <cstdlib>
#include <string>
#include <utility>
#include <vector>
-#include "api/mediaconstraintsinterface.h"
+#include "api/media_constraints_interface.h"
#include "rtc_base/arraysize.h"
#include "rtc_base/checks.h"
diff --git a/pc/video_capturer_track_source.h b/pc/video_capturer_track_source.h
index 0a254db..6915b4b 100644
--- a/pc/video_capturer_track_source.h
+++ b/pc/video_capturer_track_source.h
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_VIDEOCAPTURERTRACKSOURCE_H_
-#define PC_VIDEOCAPTURERTRACKSOURCE_H_
+#ifndef PC_VIDEO_CAPTURER_TRACK_SOURCE_H_
+#define PC_VIDEO_CAPTURER_TRACK_SOURCE_H_
#include <memory>
-#include "api/mediastreaminterface.h"
-#include "media/base/videocapturer.h"
-#include "media/base/videocommon.h"
-#include "pc/videotracksource.h"
-#include "rtc_base/asyncinvoker.h"
+#include "api/media_stream_interface.h"
+#include "media/base/video_capturer.h"
+#include "media/base/video_common.h"
+#include "pc/video_track_source.h"
+#include "rtc_base/async_invoker.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
// VideoCapturerTrackSource implements VideoTrackSourceInterface. It owns a
@@ -83,4 +83,4 @@
} // namespace webrtc
-#endif // PC_VIDEOCAPTURERTRACKSOURCE_H_
+#endif // PC_VIDEO_CAPTURER_TRACK_SOURCE_H_
diff --git a/pc/video_capturer_track_source_unittest.cc b/pc/video_capturer_track_source_unittest.cc
index aef82a1..4d2e4c3 100644
--- a/pc/video_capturer_track_source_unittest.cc
+++ b/pc/video_capturer_track_source_unittest.cc
@@ -13,11 +13,11 @@
#include <utility>
#include <vector>
-#include "api/test/fakeconstraints.h"
-#include "media/base/fakevideocapturer.h"
-#include "media/base/fakevideorenderer.h"
-#include "media/base/mediachannel.h"
-#include "pc/videocapturertracksource.h"
+#include "api/test/fake_constraints.h"
+#include "media/base/fake_video_capturer.h"
+#include "media/base/fake_video_renderer.h"
+#include "media/base/media_channel.h"
+#include "pc/video_capturer_track_source.h"
#include "rtc_base/arraysize.h"
#include "rtc_base/event.h"
#include "rtc_base/gunit.h"
diff --git a/pc/video_track.cc b/pc/video_track.cc
index 8975287..f93e3d5 100644
--- a/pc/video_track.cc
+++ b/pc/video_track.cc
@@ -12,10 +12,10 @@
#include <vector>
#include "api/notifier.h"
-#include "pc/videotrack.h"
+#include "pc/video_track.h"
#include "rtc_base/checks.h"
#include "rtc_base/location.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
namespace webrtc {
diff --git a/pc/video_track.h b/pc/video_track.h
index e6761e1..0111a66 100644
--- a/pc/video_track.h
+++ b/pc/video_track.h
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_VIDEOTRACK_H_
-#define PC_VIDEOTRACK_H_
+#ifndef PC_VIDEO_TRACK_H_
+#define PC_VIDEO_TRACK_H_
#include <string>
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "api/video/video_frame.h"
#include "api/video/video_sink_interface.h"
#include "api/video/video_source_interface.h"
-#include "media/base/videosourcebase.h"
-#include "pc/mediastreamtrack.h"
+#include "media/base/video_source_base.h"
+#include "pc/media_stream_track.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_annotations.h"
@@ -65,4 +65,4 @@
} // namespace webrtc
-#endif // PC_VIDEOTRACK_H_
+#endif // PC_VIDEO_TRACK_H_
diff --git a/pc/video_track_source.cc b/pc/video_track_source.cc
index cf0ffd7..408c8d7 100644
--- a/pc/video_track_source.cc
+++ b/pc/video_track_source.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/videotracksource.h"
+#include "pc/video_track_source.h"
#include "rtc_base/checks.h"
diff --git a/pc/video_track_source.h b/pc/video_track_source.h
index cedb75b..ad0fe09 100644
--- a/pc/video_track_source.h
+++ b/pc/video_track_source.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_VIDEOTRACKSOURCE_H_
-#define PC_VIDEOTRACKSOURCE_H_
+#ifndef PC_VIDEO_TRACK_SOURCE_H_
+#define PC_VIDEO_TRACK_SOURCE_H_
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "api/notifier.h"
#include "api/video/video_sink_interface.h"
-#include "media/base/mediachannel.h"
+#include "media/base/media_channel.h"
#include "rtc_base/system/rtc_export.h"
#include "rtc_base/thread_checker.h"
@@ -52,4 +52,4 @@
} // namespace webrtc
-#endif // PC_VIDEOTRACKSOURCE_H_
+#endif // PC_VIDEO_TRACK_SOURCE_H_
diff --git a/pc/video_track_unittest.cc b/pc/video_track_unittest.cc
index 4973d8e..806da7c 100644
--- a/pc/video_track_unittest.cc
+++ b/pc/video_track_unittest.cc
@@ -10,12 +10,12 @@
#include <memory>
-#include "media/base/fakevideocapturer.h"
-#include "media/base/videocommon.h"
-#include "pc/test/fakevideotrackrenderer.h"
-#include "pc/videotrack.h"
-#include "pc/videotracksource.h"
-#include "rtc_base/refcountedobject.h"
+#include "media/base/fake_video_capturer.h"
+#include "media/base/video_common.h"
+#include "pc/test/fake_video_track_renderer.h"
+#include "pc/video_track.h"
+#include "pc/video_track_source.h"
+#include "rtc_base/ref_counted_object.h"
#include "test/gtest.h"
using webrtc::FakeVideoTrackRenderer;
diff --git a/pc/webrtc_sdp.cc b/pc/webrtc_sdp.cc
index 5707b3c..094525a 100644
--- a/pc/webrtc_sdp.cc
+++ b/pc/webrtc_sdp.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/webrtcsdp.h"
+#include "pc/webrtc_sdp.h"
#include <ctype.h>
#include <limits.h>
@@ -26,24 +26,24 @@
#include "absl/memory/memory.h"
#include "absl/strings/match.h"
#include "api/candidate.h"
-#include "api/cryptoparams.h"
-#include "api/jsepicecandidate.h"
-#include "api/jsepsessiondescription.h"
-#include "api/mediatypes.h"
+#include "api/crypto_params.h"
+#include "api/jsep_ice_candidate.h"
+#include "api/jsep_session_description.h"
+#include "api/media_types.h"
// for RtpExtension
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
#include "media/base/codec.h"
-#include "media/base/mediaconstants.h"
-#include "media/base/rtputils.h"
-#include "media/sctp/sctptransportinternal.h"
-#include "p2p/base/p2pconstants.h"
+#include "media/base/media_constants.h"
+#include "media/base/rtp_utils.h"
+#include "media/sctp/sctp_transport_internal.h"
+#include "p2p/base/p2p_constants.h"
#include "p2p/base/port.h"
-#include "pc/mediasession.h"
-#include "pc/sdpserializer.h"
+#include "pc/media_session.h"
+#include "pc/sdp_serializer.h"
#include "rtc_base/arraysize.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/messagedigest.h"
+#include "rtc_base/message_digest.h"
#include "rtc_base/strings/string_builder.h"
using cricket::AudioContentDescription;
diff --git a/pc/webrtc_sdp.h b/pc/webrtc_sdp.h
index f185c08..1d1e7aa 100644
--- a/pc/webrtc_sdp.h
+++ b/pc/webrtc_sdp.h
@@ -17,8 +17,8 @@
// * draft-lennox-mmusic-sdp-source-selection-02 -
// Mechanisms for Media Source Selection in SDP
-#ifndef PC_WEBRTCSDP_H_
-#define PC_WEBRTCSDP_H_
+#ifndef PC_WEBRTC_SDP_H_
+#define PC_WEBRTC_SDP_H_
#include <string>
@@ -86,4 +86,4 @@
} // namespace webrtc
-#endif // PC_WEBRTCSDP_H_
+#endif // PC_WEBRTC_SDP_H_
diff --git a/pc/webrtc_sdp_unittest.cc b/pc/webrtc_sdp_unittest.cc
index 849f6c5..210848f 100644
--- a/pc/webrtc_sdp_unittest.cc
+++ b/pc/webrtc_sdp_unittest.cc
@@ -18,33 +18,33 @@
#include <vector>
#include "api/array_view.h"
-#include "api/cryptoparams.h"
-#include "api/jsepsessiondescription.h"
-#include "api/mediatypes.h"
-#include "api/rtpparameters.h"
-#include "api/rtptransceiverinterface.h"
+#include "api/crypto_params.h"
+#include "api/jsep_session_description.h"
+#include "api/media_types.h"
+#include "api/rtp_parameters.h"
+#include "api/rtp_transceiver_interface.h"
#include "media/base/codec.h"
-#include "media/base/mediaconstants.h"
-#include "media/base/streamparams.h"
-#include "p2p/base/p2pconstants.h"
+#include "media/base/media_constants.h"
+#include "media/base/stream_params.h"
+#include "p2p/base/p2p_constants.h"
#include "p2p/base/port.h"
-#include "p2p/base/transportdescription.h"
-#include "p2p/base/transportinfo.h"
-#include "pc/mediasession.h"
-#include "pc/sessiondescription.h"
+#include "p2p/base/transport_description.h"
+#include "p2p/base/transport_info.h"
+#include "pc/media_session.h"
+#include "pc/session_description.h"
#include "rtc_base/checks.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/sslfingerprint.h"
-#include "rtc_base/stringencode.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_fingerprint.h"
+#include "rtc_base/string_encode.h"
+#include "rtc_base/string_utils.h"
#include "test/gmock.h"
#include "test/gtest.h"
#ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
#endif
-#include "pc/webrtcsdp.h"
+#include "pc/webrtc_sdp.h"
using cricket::AudioCodec;
using cricket::AudioContentDescription;
diff --git a/pc/webrtc_session_description_factory.cc b/pc/webrtc_session_description_factory.cc
index 754a06c..563632c 100644
--- a/pc/webrtc_session_description_factory.cc
+++ b/pc/webrtc_session_description_factory.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "pc/webrtcsessiondescriptionfactory.h"
+#include "pc/webrtc_session_description_factory.h"
#include <stddef.h>
#include <algorithm>
@@ -19,16 +19,16 @@
#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "api/jsep.h"
-#include "api/jsepsessiondescription.h"
-#include "api/rtcerror.h"
-#include "pc/sessiondescription.h"
+#include "api/jsep_session_description.h"
+#include "api/rtc_error.h"
+#include "pc/session_description.h"
#include "rtc_base/checks.h"
#include "rtc_base/location.h"
#include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/sslstreamadapter.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/ssl_stream_adapter.h"
+#include "rtc_base/string_encode.h"
using cricket::MediaSessionOptions;
diff --git a/pc/webrtc_session_description_factory.h b/pc/webrtc_session_description_factory.h
index 21859c7..a1bd0c7 100644
--- a/pc/webrtc_session_description_factory.h
+++ b/pc/webrtc_session_description_factory.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
-#define PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
+#ifndef PC_WEBRTC_SESSION_DESCRIPTION_FACTORY_H_
+#define PC_WEBRTC_SESSION_DESCRIPTION_FACTORY_H_
#include <stdint.h>
#include <memory>
@@ -17,16 +17,16 @@
#include <string>
#include "api/jsep.h"
-#include "api/peerconnectioninterface.h"
-#include "p2p/base/transportdescription.h"
-#include "p2p/base/transportdescriptionfactory.h"
-#include "pc/mediasession.h"
-#include "pc/peerconnectioninternal.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/rtccertificategenerator.h"
+#include "api/peer_connection_interface.h"
+#include "p2p/base/transport_description.h"
+#include "p2p/base/transport_description_factory.h"
+#include "pc/media_session.h"
+#include "pc/peer_connection_internal.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/rtc_certificate_generator.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
@@ -159,4 +159,4 @@
};
} // namespace webrtc
-#endif // PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
+#endif // PC_WEBRTC_SESSION_DESCRIPTION_FACTORY_H_