(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/api/BUILD.gn b/api/BUILD.gn
index bc3d649..aeb03e5 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -40,7 +40,7 @@
rtc_source_set("callfactory_api") {
visibility = [ "*" ]
sources = [
- "call/callfactoryinterface.h",
+ "call/call_factory_interface.h",
]
}
@@ -77,59 +77,59 @@
visibility = [ "*" ]
cflags = []
sources = [
- "asyncresolverfactory.h",
+ "async_resolver_factory.h",
"bitrate_constraints.h",
"candidate.cc",
"candidate.h",
- "crypto/cryptooptions.cc",
- "crypto/cryptooptions.h",
- "crypto/framedecryptorinterface.h",
- "crypto/frameencryptorinterface.h",
- "cryptoparams.h",
- "datachannelinterface.cc",
- "datachannelinterface.h",
- "dtlstransportinterface.h",
- "dtmfsenderinterface.h",
+ "crypto/crypto_options.cc",
+ "crypto/crypto_options.h",
+ "crypto/frame_decryptor_interface.h",
+ "crypto/frame_encryptor_interface.h",
+ "crypto_params.h",
+ "data_channel_interface.cc",
+ "data_channel_interface.h",
+ "dtls_transport_interface.h",
+ "dtmf_sender_interface.h",
"jsep.cc",
"jsep.h",
- "jsepicecandidate.cc",
- "jsepicecandidate.h",
- "jsepsessiondescription.h",
+ "jsep_ice_candidate.cc",
+ "jsep_ice_candidate.h",
+ "jsep_session_description.h",
+ "media_constraints_interface.cc",
+ "media_constraints_interface.h",
+ "media_stream_interface.cc",
+ "media_stream_interface.h",
+ "media_stream_proxy.h",
+ "media_stream_track_proxy.h",
"media_transport_interface.cc",
"media_transport_interface.h",
- "mediaconstraintsinterface.cc",
- "mediaconstraintsinterface.h",
- "mediastreaminterface.cc",
- "mediastreaminterface.h",
- "mediastreamproxy.h",
- "mediastreamtrackproxy.h",
- "mediatypes.cc",
- "mediatypes.h",
+ "media_types.cc",
+ "media_types.h",
"notifier.h",
- "peerconnectionfactoryproxy.h",
- "peerconnectioninterface.cc",
- "peerconnectioninterface.h",
- "peerconnectionproxy.h",
+ "peer_connection_factory_proxy.h",
+ "peer_connection_interface.cc",
+ "peer_connection_interface.h",
+ "peer_connection_proxy.h",
"proxy.cc",
"proxy.h",
- "rtcerror.cc",
- "rtcerror.h",
+ "rtc_error.cc",
+ "rtc_error.h",
"rtp_headers.cc",
"rtp_headers.h",
- "rtpparameters.cc",
- "rtpparameters.h",
- "rtpreceiverinterface.cc",
- "rtpreceiverinterface.h",
- "rtpsenderinterface.cc",
- "rtpsenderinterface.h",
- "rtptransceiverinterface.cc",
- "rtptransceiverinterface.h",
- "setremotedescriptionobserverinterface.h",
- "statstypes.cc",
- "statstypes.h",
- "turncustomizer.h",
- "umametrics.h",
- "videosourceproxy.h",
+ "rtp_parameters.cc",
+ "rtp_parameters.h",
+ "rtp_receiver_interface.cc",
+ "rtp_receiver_interface.h",
+ "rtp_sender_interface.cc",
+ "rtp_sender_interface.h",
+ "rtp_transceiver_interface.cc",
+ "rtp_transceiver_interface.h",
+ "set_remote_description_observer_interface.h",
+ "stats_types.cc",
+ "stats_types.h",
+ "turn_customizer.h",
+ "uma_metrics.h",
+ "video_track_source_proxy.h",
]
deps = [
":array_view",
@@ -240,16 +240,16 @@
rtc_source_set("libjingle_logging_api") {
visibility = [ "*" ]
sources = [
- "rtceventlogoutput.h",
+ "rtc_event_log_output.h",
]
}
rtc_source_set("ortc_api") {
visibility = [ "*" ]
sources = [
- "ortc/packettransportinterface.h",
- "ortc/rtptransportinterface.h",
- "ortc/srtptransportinterface.h",
+ "ortc/packet_transport_interface.h",
+ "ortc/rtp_transport_interface.h",
+ "ortc/srtp_transport_interface.h",
]
deps = [
@@ -262,10 +262,10 @@
visibility = [ "*" ]
cflags = []
sources = [
- "stats/rtcstats.h",
+ "stats/rtc_stats.h",
+ "stats/rtc_stats_collector_callback.h",
+ "stats/rtc_stats_report.h",
"stats/rtcstats_objects.h",
- "stats/rtcstatscollectorcallback.h",
- "stats/rtcstatsreport.h",
]
deps = [
@@ -346,7 +346,7 @@
rtc_source_set("refcountedbase") {
visibility = [ "*" ]
sources = [
- "refcountedbase.h",
+ "ref_counted_base.h",
]
deps = [
"../rtc_base:rtc_base_approved",
@@ -357,7 +357,7 @@
visibility = [ "*" ]
testonly = true
sources = [
- "test/fakeconstraints.h",
+ "test/fake_constraints.h",
]
deps = [
@@ -666,8 +666,8 @@
sources = [
"array_view_unittest.cc",
- "rtcerror_unittest.cc",
- "rtpparameters_unittest.cc",
+ "rtc_error_unittest.cc",
+ "rtp_parameters_unittest.cc",
"test/loopback_media_transport_unittest.cc",
]
diff --git a/api/DEPS b/api/DEPS
index 82885d4..37d0e9b 100644
--- a/api/DEPS
+++ b/api/DEPS
@@ -57,13 +57,13 @@
"+modules/audio_coding/codecs/opus/audio_encoder_opus.h",
],
- "asyncresolverfactory\.h": [
- "+rtc_base/asyncresolverinterface.h",
+ "async_resolver_factory\.h": [
+ "+rtc_base/async_resolver_interface.h",
],
"candidate\.h": [
"+rtc_base/network_constants.h",
- "+rtc_base/socketaddress.h",
+ "+rtc_base/socket_address.h",
],
"create_peerconnection_factory\.h": [
@@ -71,17 +71,17 @@
"+rtc_base/scoped_ref_ptr.h",
],
- "datachannelinterface\.h": [
- "+rtc_base/copyonwritebuffer.h",
- "+rtc_base/refcount.h",
+ "data_channel_interface\.h": [
+ "+rtc_base/copy_on_write_buffer.h",
+ "+rtc_base/ref_count.h",
],
- "dtlstransportinterface\.h": [
- "+rtc_base/refcount.h",
+ "dtls_transport_interface\.h": [
+ "+rtc_base/ref_count.h",
],
- "dtmfsenderinterface\.h": [
- "+rtc_base/refcount.h",
+ "dtmf_sender_interface\.h": [
+ "+rtc_base/ref_count.h",
],
"fec_controller\.h": [
@@ -89,118 +89,118 @@
],
"jsep\.h": [
- "+rtc_base/refcount.h",
+ "+rtc_base/ref_count.h",
],
- "jsepicecandidate\.h": [
- "+rtc_base/constructormagic.h",
+ "jsep_ice_candidate\.h": [
+ "+rtc_base/constructor_magic.h",
],
- "jsepsessiondescription\.h": [
- "+rtc_base/constructormagic.h",
+ "jsep_session_description\.h": [
+ "+rtc_base/constructor_magic.h",
],
- "mediastreaminterface\.h": [
+ "media_stream_interface\.h": [
"+modules/audio_processing/include/audio_processing_statistics.h",
- "+rtc_base/refcount.h",
+ "+rtc_base/ref_count.h",
"+rtc_base/scoped_ref_ptr.h",
],
"media_transport_interface\.h": [
- "+rtc_base/copyonwritebuffer.h", # As used by datachannelinterface.h
- "+rtc_base/networkroute.h",
+ "+rtc_base/copy_on_write_buffer.h", # As used by datachannelinterface.h
+ "+rtc_base/network_route.h",
"+rtc_base/deprecation.h",
],
- "peerconnectionfactoryproxy\.h": [
+ "peer_connection_factory_proxy\.h": [
"+rtc_base/bind.h",
],
- "peerconnectioninterface\.h": [
+ "peer_connection_interface\.h": [
"+logging/rtc_event_log/rtc_event_log_factory_interface.h",
- "+media/base/mediaconfig.h",
- "+media/base/videocapturer.h",
- "+media/base/mediaengine.h",
- "+p2p/base/portallocator.h",
- "+rtc_base/bitrateallocationstrategy.h",
+ "+media/base/media_config.h",
+ "+media/base/video_capturer.h",
+ "+media/base/media_engine.h",
+ "+p2p/base/port_allocator.h",
+ "+rtc_base/bitrate_allocation_strategy.h",
"+rtc_base/network.h",
"+rtc_base/platform_file.h",
- "+rtc_base/rtccertificate.h",
- "+rtc_base/rtccertificategenerator.h",
- "+rtc_base/socketaddress.h",
- "+rtc_base/sslcertificate.h",
- "+rtc_base/sslstreamadapter.h",
+ "+rtc_base/rtc_certificate.h",
+ "+rtc_base/rtc_certificate_generator.h",
+ "+rtc_base/socket_address.h",
+ "+rtc_base/ssl_certificate.h",
+ "+rtc_base/ssl_stream_adapter.h",
],
"proxy\.h": [
"+rtc_base/event.h",
- "+rtc_base/messagehandler.h", # Inherits from it.
- "+rtc_base/messagequeue.h", # Inherits from MessageData.
- "+rtc_base/refcountedobject.h",
+ "+rtc_base/message_handler.h", # Inherits from it.
+ "+rtc_base/message_queue.h", # Inherits from MessageData.
+ "+rtc_base/ref_counted_object.h",
"+rtc_base/scoped_ref_ptr.h",
"+rtc_base/thread.h",
],
- "refcountedbase\.h": [
- "+rtc_base/constructormagic.h",
- "+rtc_base/refcount.h",
- "+rtc_base/refcounter.h",
+ "ref_counted_base\.h": [
+ "+rtc_base/constructor_magic.h",
+ "+rtc_base/ref_count.h",
+ "+rtc_base/ref_counter.h",
],
- "rtcerror\.h": [
+ "rtc_error\.h": [
"+rtc_base/logging.h",
],
- "rtpreceiverinterface\.h": [
- "+rtc_base/refcount.h",
+ "rtp_receiver_interface\.h": [
+ "+rtc_base/ref_count.h",
"+rtc_base/scoped_ref_ptr.h",
],
- "rtpsenderinterface\.h": [
- "+rtc_base/refcount.h",
+ "rtp_sender_interface\.h": [
+ "+rtc_base/ref_count.h",
"+rtc_base/scoped_ref_ptr.h",
],
- "rtptransceiverinterface\.h": [
- "+rtc_base/refcount.h",
+ "rtp_transceiver_interface\.h": [
+ "+rtc_base/ref_count.h",
"+rtc_base/scoped_ref_ptr.h",
],
- "setremotedescriptionobserverinterface\.h": [
- "+rtc_base/refcount.h",
+ "set_remote_description_observer_interface\.h": [
+ "+rtc_base/ref_count.h",
],
- "statstypes\.h": [
- "+rtc_base/constructormagic.h",
- "+rtc_base/refcount.h",
+ "stats_types\.h": [
+ "+rtc_base/constructor_magic.h",
+ "+rtc_base/ref_count.h",
"+rtc_base/scoped_ref_ptr.h",
- "+rtc_base/stringencode.h",
+ "+rtc_base/string_encode.h",
"+rtc_base/thread_checker.h",
],
- "umametrics\.h": [
- "+rtc_base/refcount.h",
+ "uma_metrics\.h": [
+ "+rtc_base/ref_count.h",
],
"audio_frame\.h": [
- "+rtc_base/constructormagic.h",
+ "+rtc_base/constructor_magic.h",
],
"audio_mixer\.h": [
- "+rtc_base/refcount.h",
+ "+rtc_base/ref_count.h",
],
"audio_decoder\.h": [
"+rtc_base/buffer.h",
- "+rtc_base/constructormagic.h",
+ "+rtc_base/constructor_magic.h",
],
"audio_decoder_factory\.h": [
- "+rtc_base/refcount.h",
+ "+rtc_base/ref_count.h",
],
"audio_decoder_factory_template\.h": [
- "+rtc_base/refcountedobject.h",
+ "+rtc_base/ref_counted_object.h",
"+rtc_base/scoped_ref_ptr.h",
],
@@ -210,11 +210,11 @@
],
"audio_encoder_factory\.h": [
- "+rtc_base/refcount.h",
+ "+rtc_base/ref_count.h",
],
"audio_encoder_factory_template\.h": [
- "+rtc_base/refcountedobject.h",
+ "+rtc_base/ref_counted_object.h",
"+rtc_base/scoped_ref_ptr.h",
],
@@ -226,22 +226,22 @@
"+rtc_base/scoped_ref_ptr.h",
],
- "framedecryptorinterface\.h": [
- "+rtc_base/refcount.h",
+ "frame_decryptor_interface\.h": [
+ "+rtc_base/ref_count.h",
],
- "frameencryptorinterface\.h": [
- "+rtc_base/refcount.h",
+ "frame_encryptor_interface\.h": [
+ "+rtc_base/ref_count.h",
],
- "rtcstatscollectorcallback\.h": [
- "+rtc_base/refcount.h",
+ "rtc_stats_collector_callback\.h": [
+ "+rtc_base/ref_count.h",
"+rtc_base/scoped_ref_ptr.h",
],
- "rtcstatsreport\.h": [
- "+rtc_base/refcount.h",
- "+rtc_base/refcountedobject.h",
+ "rtc_stats_report\.h": [
+ "+rtc_base/ref_count.h",
+ "+rtc_base/ref_counted_object.h",
"+rtc_base/scoped_ref_ptr.h",
],
@@ -250,11 +250,11 @@
],
"fake_frame_decryptor\.h": [
- "+rtc_base/refcountedobject.h",
+ "+rtc_base/ref_counted_object.h",
],
"fake_frame_encryptor\.h": [
- "+rtc_base/refcountedobject.h",
+ "+rtc_base/ref_counted_object.h",
],
"mock.*\.h": [
@@ -262,7 +262,7 @@
],
"simulated_network\.h": [
- "+rtc_base/criticalsection.h",
+ "+rtc_base/critical_section.h",
"+rtc_base/random.h",
"+rtc_base/thread_annotations.h",
],
@@ -280,7 +280,7 @@
],
"video_encoder_config\.h": [
- "+rtc_base/refcount.h",
+ "+rtc_base/ref_count.h",
"+rtc_base/scoped_ref_ptr.h",
],
diff --git a/api/async_resolver_factory.h b/api/async_resolver_factory.h
index 96abee4..93d3f79 100644
--- a/api/async_resolver_factory.h
+++ b/api/async_resolver_factory.h
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_ASYNCRESOLVERFACTORY_H_
-#define API_ASYNCRESOLVERFACTORY_H_
+#ifndef API_ASYNC_RESOLVER_FACTORY_H_
+#define API_ASYNC_RESOLVER_FACTORY_H_
-#include "rtc_base/asyncresolverinterface.h"
+#include "rtc_base/async_resolver_interface.h"
namespace webrtc {
@@ -29,4 +29,4 @@
} // namespace webrtc
-#endif // API_ASYNCRESOLVERFACTORY_H_
+#endif // API_ASYNC_RESOLVER_FACTORY_H_
diff --git a/api/audio/audio_frame.cc b/api/audio/audio_frame.cc
index 75d30b0..1e706b9 100644
--- a/api/audio/audio_frame.cc
+++ b/api/audio/audio_frame.cc
@@ -13,7 +13,7 @@
#include <string.h>
#include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace webrtc {
diff --git a/api/audio/audio_frame.h b/api/audio/audio_frame.h
index dd6ac02..8f1dc62 100644
--- a/api/audio/audio_frame.h
+++ b/api/audio/audio_frame.h
@@ -14,7 +14,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
namespace webrtc {
diff --git a/api/audio/audio_mixer.h b/api/audio/audio_mixer.h
index 14eefc1..b290cfa 100644
--- a/api/audio/audio_mixer.h
+++ b/api/audio/audio_mixer.h
@@ -14,7 +14,7 @@
#include <memory>
#include "api/audio/audio_frame.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
namespace webrtc {
diff --git a/api/audio_codecs/audio_decoder.h b/api/audio_codecs/audio_decoder.h
index 684266a..e4e5e1e 100644
--- a/api/audio_codecs/audio_decoder.h
+++ b/api/audio_codecs/audio_decoder.h
@@ -19,7 +19,7 @@
#include "absl/types/optional.h"
#include "api/array_view.h"
#include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
namespace webrtc {
diff --git a/api/audio_codecs/audio_decoder_factory.h b/api/audio_codecs/audio_decoder_factory.h
index 3d80958..c36a0e1 100644
--- a/api/audio_codecs/audio_decoder_factory.h
+++ b/api/audio_codecs/audio_decoder_factory.h
@@ -18,7 +18,7 @@
#include "api/audio_codecs/audio_codec_pair_id.h"
#include "api/audio_codecs/audio_decoder.h"
#include "api/audio_codecs/audio_format.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
namespace webrtc {
diff --git a/api/audio_codecs/audio_decoder_factory_template.h b/api/audio_codecs/audio_decoder_factory_template.h
index 22bb7de..e7f1443 100644
--- a/api/audio_codecs/audio_decoder_factory_template.h
+++ b/api/audio_codecs/audio_decoder_factory_template.h
@@ -15,7 +15,7 @@
#include <vector>
#include "api/audio_codecs/audio_decoder_factory.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/scoped_ref_ptr.h"
namespace webrtc {
diff --git a/api/audio_codecs/audio_encoder_factory.h b/api/audio_codecs/audio_encoder_factory.h
index a5fd561b..48995a8 100644
--- a/api/audio_codecs/audio_encoder_factory.h
+++ b/api/audio_codecs/audio_encoder_factory.h
@@ -18,7 +18,7 @@
#include "api/audio_codecs/audio_codec_pair_id.h"
#include "api/audio_codecs/audio_encoder.h"
#include "api/audio_codecs/audio_format.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
namespace webrtc {
diff --git a/api/audio_codecs/audio_encoder_factory_template.h b/api/audio_codecs/audio_encoder_factory_template.h
index 2088619..01a6a74 100644
--- a/api/audio_codecs/audio_encoder_factory_template.h
+++ b/api/audio_codecs/audio_encoder_factory_template.h
@@ -15,7 +15,7 @@
#include <vector>
#include "api/audio_codecs/audio_encoder_factory.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/scoped_ref_ptr.h"
namespace webrtc {
diff --git a/api/call/call_factory_interface.h b/api/call/call_factory_interface.h
index a7f3245..c3d5b41 100644
--- a/api/call/call_factory_interface.h
+++ b/api/call/call_factory_interface.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_CALL_CALLFACTORYINTERFACE_H_
-#define API_CALL_CALLFACTORYINTERFACE_H_
+#ifndef API_CALL_CALL_FACTORY_INTERFACE_H_
+#define API_CALL_CALL_FACTORY_INTERFACE_H_
#include <memory>
@@ -33,4 +33,4 @@
} // namespace webrtc
-#endif // API_CALL_CALLFACTORYINTERFACE_H_
+#endif // API_CALL_CALL_FACTORY_INTERFACE_H_
diff --git a/api/candidate.cc b/api/candidate.cc
index 5637566..c857f89 100644
--- a/api/candidate.cc
+++ b/api/candidate.cc
@@ -11,7 +11,7 @@
#include "api/candidate.h"
#include "rtc_base/helpers.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
#include "rtc_base/strings/string_builder.h"
namespace cricket {
diff --git a/api/candidate.h b/api/candidate.h
index 02b4bca..7452055 100644
--- a/api/candidate.h
+++ b/api/candidate.h
@@ -19,7 +19,7 @@
#include "rtc_base/checks.h"
#include "rtc_base/network_constants.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
#include "rtc_base/system/rtc_export.h"
namespace cricket {
diff --git a/api/create_peerconnection_factory.cc b/api/create_peerconnection_factory.cc
index d714dfe..3e1566e 100644
--- a/api/create_peerconnection_factory.cc
+++ b/api/create_peerconnection_factory.cc
@@ -16,16 +16,16 @@
#include "api/audio/audio_mixer.h"
#include "api/audio_codecs/audio_decoder_factory.h"
#include "api/audio_codecs/audio_encoder_factory.h"
-#include "api/call/callfactoryinterface.h"
+#include "api/call/call_factory_interface.h"
#include "api/fec_controller.h"
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
#include "api/transport/network_control.h"
#include "api/video_codecs/video_decoder_factory.h"
#include "api/video_codecs/video_encoder_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/base/mediaengine.h"
-#include "media/engine/webrtcmediaengine.h"
+#include "media/base/media_engine.h"
+#include "media/engine/webrtc_media_engine.h"
#include "modules/audio_device/include/audio_device.h"
#include "modules/audio_processing/include/audio_processing.h"
#include "rtc_base/scoped_ref_ptr.h"
diff --git a/api/create_peerconnection_factory.h b/api/create_peerconnection_factory.h
index 063de18..c3729d2 100644
--- a/api/create_peerconnection_factory.h
+++ b/api/create_peerconnection_factory.h
@@ -17,7 +17,7 @@
#include "api/audio_codecs/audio_decoder_factory.h"
#include "api/audio_codecs/audio_encoder_factory.h"
#include "api/fec_controller.h"
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
#include "api/transport/network_control.h"
#include "rtc_base/deprecation.h"
#include "rtc_base/scoped_ref_ptr.h"
diff --git a/api/crypto/crypto_options.cc b/api/crypto/crypto_options.cc
index 7f34f19..9a3de2c 100644
--- a/api/crypto/crypto_options.cc
+++ b/api/crypto/crypto_options.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/crypto/cryptooptions.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "api/crypto/crypto_options.h"
+#include "rtc_base/ssl_stream_adapter.h"
namespace webrtc {
diff --git a/api/crypto/crypto_options.h b/api/crypto/crypto_options.h
index e730ab2..f0b91d0 100644
--- a/api/crypto/crypto_options.h
+++ b/api/crypto/crypto_options.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_CRYPTO_CRYPTOOPTIONS_H_
-#define API_CRYPTO_CRYPTOOPTIONS_H_
+#ifndef API_CRYPTO_CRYPTO_OPTIONS_H_
+#define API_CRYPTO_CRYPTO_OPTIONS_H_
#include <vector>
@@ -63,4 +63,4 @@
} // namespace webrtc
-#endif // API_CRYPTO_CRYPTOOPTIONS_H_
+#endif // API_CRYPTO_CRYPTO_OPTIONS_H_
diff --git a/api/crypto/frame_decryptor_interface.h b/api/crypto/frame_decryptor_interface.h
index 587df47..400e056 100644
--- a/api/crypto/frame_decryptor_interface.h
+++ b/api/crypto/frame_decryptor_interface.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_CRYPTO_FRAMEDECRYPTORINTERFACE_H_
-#define API_CRYPTO_FRAMEDECRYPTORINTERFACE_H_
+#ifndef API_CRYPTO_FRAME_DECRYPTOR_INTERFACE_H_
+#define API_CRYPTO_FRAME_DECRYPTOR_INTERFACE_H_
#include <vector>
#include "api/array_view.h"
-#include "api/mediatypes.h"
-#include "rtc_base/refcount.h"
+#include "api/media_types.h"
+#include "rtc_base/ref_count.h"
namespace webrtc {
@@ -56,4 +56,4 @@
} // namespace webrtc
-#endif // API_CRYPTO_FRAMEDECRYPTORINTERFACE_H_
+#endif // API_CRYPTO_FRAME_DECRYPTOR_INTERFACE_H_
diff --git a/api/crypto/frame_encryptor_interface.h b/api/crypto/frame_encryptor_interface.h
index 72bc04b..d5b6d8a 100644
--- a/api/crypto/frame_encryptor_interface.h
+++ b/api/crypto/frame_encryptor_interface.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_CRYPTO_FRAMEENCRYPTORINTERFACE_H_
-#define API_CRYPTO_FRAMEENCRYPTORINTERFACE_H_
+#ifndef API_CRYPTO_FRAME_ENCRYPTOR_INTERFACE_H_
+#define API_CRYPTO_FRAME_ENCRYPTOR_INTERFACE_H_
#include "api/array_view.h"
-#include "api/mediatypes.h"
-#include "rtc_base/refcount.h"
+#include "api/media_types.h"
+#include "rtc_base/ref_count.h"
namespace webrtc {
@@ -52,4 +52,4 @@
} // namespace webrtc
-#endif // API_CRYPTO_FRAMEENCRYPTORINTERFACE_H_
+#endif // API_CRYPTO_FRAME_ENCRYPTOR_INTERFACE_H_
diff --git a/api/crypto_params.h b/api/crypto_params.h
index abe9055..5da352c 100644
--- a/api/crypto_params.h
+++ b/api/crypto_params.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_CRYPTOPARAMS_H_
-#define API_CRYPTOPARAMS_H_
+#ifndef API_CRYPTO_PARAMS_H_
+#define API_CRYPTO_PARAMS_H_
#include <string>
@@ -38,4 +38,4 @@
} // namespace cricket
-#endif // API_CRYPTOPARAMS_H_
+#endif // API_CRYPTO_PARAMS_H_
diff --git a/api/data_channel_interface.cc b/api/data_channel_interface.cc
index 141462d..240ccbe 100644
--- a/api/data_channel_interface.cc
+++ b/api/data_channel_interface.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
namespace webrtc {
diff --git a/api/data_channel_interface.h b/api/data_channel_interface.h
index 7cb5582..91a9804 100644
--- a/api/data_channel_interface.h
+++ b/api/data_channel_interface.h
@@ -11,16 +11,16 @@
// This file contains interfaces for DataChannels
// http://dev.w3.org/2011/webrtc/editor/webrtc.html#rtcdatachannel
-#ifndef API_DATACHANNELINTERFACE_H_
-#define API_DATACHANNELINTERFACE_H_
+#ifndef API_DATA_CHANNEL_INTERFACE_H_
+#define API_DATA_CHANNEL_INTERFACE_H_
#include <stddef.h>
#include <stdint.h>
#include <string>
#include "rtc_base/checks.h"
-#include "rtc_base/copyonwritebuffer.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/copy_on_write_buffer.h"
+#include "rtc_base/ref_count.h"
namespace webrtc {
@@ -177,4 +177,4 @@
} // namespace webrtc
-#endif // API_DATACHANNELINTERFACE_H_
+#endif // API_DATA_CHANNEL_INTERFACE_H_
diff --git a/api/dtls_transport_interface.h b/api/dtls_transport_interface.h
index bff6752..abe7378 100644
--- a/api/dtls_transport_interface.h
+++ b/api/dtls_transport_interface.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_DTLSTRANSPORTINTERFACE_H_
-#define API_DTLSTRANSPORTINTERFACE_H_
+#ifndef API_DTLS_TRANSPORT_INTERFACE_H_
+#define API_DTLS_TRANSPORT_INTERFACE_H_
-#include "api/rtcerror.h"
-#include "rtc_base/refcount.h"
+#include "api/rtc_error.h"
+#include "rtc_base/ref_count.h"
namespace webrtc {
@@ -66,4 +66,4 @@
} // namespace webrtc
-#endif // API_DTLSTRANSPORTINTERFACE_H_
+#endif // API_DTLS_TRANSPORT_INTERFACE_H_
diff --git a/api/dtmf_sender_interface.h b/api/dtmf_sender_interface.h
index d8714f5..9cdfba1 100644
--- a/api/dtmf_sender_interface.h
+++ b/api/dtmf_sender_interface.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_DTMFSENDERINTERFACE_H_
-#define API_DTMFSENDERINTERFACE_H_
+#ifndef API_DTMF_SENDER_INTERFACE_H_
+#define API_DTMF_SENDER_INTERFACE_H_
#include <string>
-#include "api/mediastreaminterface.h"
-#include "rtc_base/refcount.h"
+#include "api/media_stream_interface.h"
+#include "rtc_base/ref_count.h"
namespace webrtc {
@@ -97,4 +97,4 @@
} // namespace webrtc
-#endif // API_DTMFSENDERINTERFACE_H_
+#endif // API_DTMF_SENDER_INTERFACE_H_
diff --git a/api/jsep.h b/api/jsep.h
index 1c50455..6da7827 100644
--- a/api/jsep.h
+++ b/api/jsep.h
@@ -27,8 +27,8 @@
#include <vector>
#include "absl/types/optional.h"
-#include "api/rtcerror.h"
-#include "rtc_base/refcount.h"
+#include "api/rtc_error.h"
+#include "rtc_base/ref_count.h"
#include "rtc_base/system/rtc_export.h"
namespace cricket {
diff --git a/api/jsep_ice_candidate.cc b/api/jsep_ice_candidate.cc
index ed2f792..59da4e4 100644
--- a/api/jsep_ice_candidate.cc
+++ b/api/jsep_ice_candidate.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/jsepicecandidate.h"
+#include "api/jsep_ice_candidate.h"
#include <algorithm>
#include <utility>
diff --git a/api/jsep_ice_candidate.h b/api/jsep_ice_candidate.h
index 9cc7443..5b22454 100644
--- a/api/jsep_ice_candidate.h
+++ b/api/jsep_ice_candidate.h
@@ -11,8 +11,8 @@
// TODO(deadbeef): Move this out of api/; it's an implementation detail and
// shouldn't be used externally.
-#ifndef API_JSEPICECANDIDATE_H_
-#define API_JSEPICECANDIDATE_H_
+#ifndef API_JSEP_ICE_CANDIDATE_H_
+#define API_JSEP_ICE_CANDIDATE_H_
#include <stddef.h>
#include <string>
@@ -20,7 +20,7 @@
#include "api/candidate.h"
#include "api/jsep.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
namespace webrtc {
@@ -82,4 +82,4 @@
} // namespace webrtc
-#endif // API_JSEPICECANDIDATE_H_
+#endif // API_JSEP_ICE_CANDIDATE_H_
diff --git a/api/jsep_session_description.h b/api/jsep_session_description.h
index 49b80fa..75ae0cd 100644
--- a/api/jsep_session_description.h
+++ b/api/jsep_session_description.h
@@ -11,8 +11,8 @@
// TODO(deadbeef): Move this out of api/; it's an implementation detail and
// shouldn't be used externally.
-#ifndef API_JSEPSESSIONDESCRIPTION_H_
-#define API_JSEPSESSIONDESCRIPTION_H_
+#ifndef API_JSEP_SESSION_DESCRIPTION_H_
+#define API_JSEP_SESSION_DESCRIPTION_H_
#include <memory>
#include <string>
@@ -21,8 +21,8 @@
#include "absl/strings/string_view.h"
#include "api/candidate.h"
#include "api/jsep.h"
-#include "api/jsepicecandidate.h"
-#include "rtc_base/constructormagic.h"
+#include "api/jsep_ice_candidate.h"
+#include "rtc_base/constructor_magic.h"
namespace cricket {
class SessionDescription;
@@ -88,4 +88,4 @@
} // namespace webrtc
-#endif // API_JSEPSESSIONDESCRIPTION_H_
+#endif // API_JSEP_SESSION_DESCRIPTION_H_
diff --git a/api/media_constraints_interface.cc b/api/media_constraints_interface.cc
index b66ba05..ddf5559 100644
--- a/api/media_constraints_interface.cc
+++ b/api/media_constraints_interface.cc
@@ -8,12 +8,12 @@
* 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/peerconnectioninterface.h"
-#include "media/base/mediaconfig.h"
-#include "rtc_base/stringencode.h"
+#include "api/peer_connection_interface.h"
+#include "media/base/media_config.h"
+#include "rtc_base/string_encode.h"
namespace {
diff --git a/api/media_constraints_interface.h b/api/media_constraints_interface.h
index c9a6e1b..fc49cbe 100644
--- a/api/media_constraints_interface.h
+++ b/api/media_constraints_interface.h
@@ -18,15 +18,15 @@
// be removed from WebRTC.
// https://bugs.chromium.org/p/webrtc/issues/detail?id=9239
-#ifndef API_MEDIACONSTRAINTSINTERFACE_H_
-#define API_MEDIACONSTRAINTSINTERFACE_H_
+#ifndef API_MEDIA_CONSTRAINTS_INTERFACE_H_
+#define API_MEDIA_CONSTRAINTS_INTERFACE_H_
#include <stddef.h>
#include <string>
#include <vector>
#include "api/audio_options.h"
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
namespace webrtc {
@@ -156,4 +156,4 @@
} // namespace webrtc
-#endif // API_MEDIACONSTRAINTSINTERFACE_H_
+#endif // API_MEDIA_CONSTRAINTS_INTERFACE_H_
diff --git a/api/media_stream_interface.cc b/api/media_stream_interface.cc
index 7154014..73566c4 100644
--- a/api/media_stream_interface.cc
+++ b/api/media_stream_interface.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
namespace webrtc {
diff --git a/api/media_stream_interface.h b/api/media_stream_interface.h
index 6d96766..af89e9d 100644
--- a/api/media_stream_interface.h
+++ b/api/media_stream_interface.h
@@ -14,8 +14,8 @@
// interfaces must be used only with PeerConnection. PeerConnectionManager
// interface provides the factory methods to create MediaStream and MediaTracks.
-#ifndef API_MEDIASTREAMINTERFACE_H_
-#define API_MEDIASTREAMINTERFACE_H_
+#ifndef API_MEDIA_STREAM_INTERFACE_H_
+#define API_MEDIA_STREAM_INTERFACE_H_
#include <stddef.h>
@@ -28,7 +28,7 @@
#include "api/video/video_sink_interface.h"
#include "api/video/video_source_interface.h"
#include "modules/audio_processing/include/audio_processing_statistics.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
#include "rtc_base/scoped_ref_ptr.h"
namespace webrtc {
@@ -294,4 +294,4 @@
} // namespace webrtc
-#endif // API_MEDIASTREAMINTERFACE_H_
+#endif // API_MEDIA_STREAM_INTERFACE_H_
diff --git a/api/media_stream_proxy.h b/api/media_stream_proxy.h
index 4c54459..5169679 100644
--- a/api/media_stream_proxy.h
+++ b/api/media_stream_proxy.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_MEDIASTREAMPROXY_H_
-#define API_MEDIASTREAMPROXY_H_
+#ifndef API_MEDIA_STREAM_PROXY_H_
+#define API_MEDIA_STREAM_PROXY_H_
#include <string>
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "api/proxy.h"
namespace webrtc {
@@ -41,4 +41,4 @@
} // namespace webrtc
-#endif // API_MEDIASTREAMPROXY_H_
+#endif // API_MEDIA_STREAM_PROXY_H_
diff --git a/api/media_stream_track_proxy.h b/api/media_stream_track_proxy.h
index 77b7bad..d3dc255 100644
--- a/api/media_stream_track_proxy.h
+++ b/api/media_stream_track_proxy.h
@@ -11,12 +11,12 @@
// This file includes proxy classes for tracks. The purpose is
// to make sure tracks are only accessed from the signaling thread.
-#ifndef API_MEDIASTREAMTRACKPROXY_H_
-#define API_MEDIASTREAMTRACKPROXY_H_
+#ifndef API_MEDIA_STREAM_TRACK_PROXY_H_
+#define API_MEDIA_STREAM_TRACK_PROXY_H_
#include <string>
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "api/proxy.h"
namespace webrtc {
@@ -62,4 +62,4 @@
} // namespace webrtc
-#endif // API_MEDIASTREAMTRACKPROXY_H_
+#endif // API_MEDIA_STREAM_TRACK_PROXY_H_
diff --git a/api/media_transport_interface.h b/api/media_transport_interface.h
index 4531fe4..ee1b8e3 100644
--- a/api/media_transport_interface.h
+++ b/api/media_transport_interface.h
@@ -25,11 +25,11 @@
#include "absl/types/optional.h"
#include "api/array_view.h"
-#include "api/rtcerror.h"
+#include "api/rtc_error.h"
#include "api/video/encoded_image.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
#include "rtc_base/deprecation.h"
-#include "rtc_base/networkroute.h"
+#include "rtc_base/network_route.h"
namespace rtc {
class PacketTransportInternal;
diff --git a/api/media_types.cc b/api/media_types.cc
index 599542d..3359f1d 100644
--- a/api/media_types.cc
+++ b/api/media_types.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/mediatypes.h"
+#include "api/media_types.h"
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "rtc_base/checks.h"
namespace {
diff --git a/api/media_types.h b/api/media_types.h
index f281276..64e2ebc 100644
--- a/api/media_types.h
+++ b/api/media_types.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_MEDIATYPES_H_
-#define API_MEDIATYPES_H_
+#ifndef API_MEDIA_TYPES_H_
+#define API_MEDIA_TYPES_H_
#include <string>
@@ -33,4 +33,4 @@
} // namespace webrtc
-#endif // API_MEDIATYPES_H_
+#endif // API_MEDIA_TYPES_H_
diff --git a/api/notifier.h b/api/notifier.h
index e5c61c9..c03b104 100644
--- a/api/notifier.h
+++ b/api/notifier.h
@@ -13,7 +13,7 @@
#include <list>
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "rtc_base/checks.h"
namespace webrtc {
diff --git a/api/ortc/packet_transport_interface.h b/api/ortc/packet_transport_interface.h
index f357f8a..8fef270 100644
--- a/api/ortc/packet_transport_interface.h
+++ b/api/ortc/packet_transport_interface.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_ORTC_PACKETTRANSPORTINTERFACE_H_
-#define API_ORTC_PACKETTRANSPORTINTERFACE_H_
+#ifndef API_ORTC_PACKET_TRANSPORT_INTERFACE_H_
+#define API_ORTC_PACKET_TRANSPORT_INTERFACE_H_
namespace rtc {
@@ -36,4 +36,4 @@
} // namespace webrtc
-#endif // API_ORTC_PACKETTRANSPORTINTERFACE_H_
+#endif // API_ORTC_PACKET_TRANSPORT_INTERFACE_H_
diff --git a/api/ortc/rtp_transport_interface.h b/api/ortc/rtp_transport_interface.h
index 4b9d161..ec71216 100644
--- a/api/ortc/rtp_transport_interface.h
+++ b/api/ortc/rtp_transport_interface.h
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_ORTC_RTPTRANSPORTINTERFACE_H_
-#define API_ORTC_RTPTRANSPORTINTERFACE_H_
+#ifndef API_ORTC_RTP_TRANSPORT_INTERFACE_H_
+#define API_ORTC_RTP_TRANSPORT_INTERFACE_H_
#include <string>
#include "absl/types/optional.h"
-#include "api/ortc/packettransportinterface.h"
-#include "api/rtcerror.h"
+#include "api/ortc/packet_transport_interface.h"
+#include "api/rtc_error.h"
#include "api/rtp_headers.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
namespace webrtc {
@@ -91,4 +91,4 @@
} // namespace webrtc
-#endif // API_ORTC_RTPTRANSPORTINTERFACE_H_
+#endif // API_ORTC_RTP_TRANSPORT_INTERFACE_H_
diff --git a/api/ortc/srtp_transport_interface.h b/api/ortc/srtp_transport_interface.h
index 4b757e4..65ef1ef 100644
--- a/api/ortc/srtp_transport_interface.h
+++ b/api/ortc/srtp_transport_interface.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_ORTC_SRTPTRANSPORTINTERFACE_H_
-#define API_ORTC_SRTPTRANSPORTINTERFACE_H_
+#ifndef API_ORTC_SRTP_TRANSPORT_INTERFACE_H_
+#define API_ORTC_SRTP_TRANSPORT_INTERFACE_H_
-#include "api/cryptoparams.h"
-#include "api/ortc/rtptransportinterface.h"
-#include "api/rtcerror.h"
+#include "api/crypto_params.h"
+#include "api/ortc/rtp_transport_interface.h"
+#include "api/rtc_error.h"
namespace webrtc {
@@ -45,4 +45,4 @@
} // namespace webrtc
-#endif // API_ORTC_SRTPTRANSPORTINTERFACE_H_
+#endif // API_ORTC_SRTP_TRANSPORT_INTERFACE_H_
diff --git a/api/peer_connection_factory_proxy.h b/api/peer_connection_factory_proxy.h
index d885cc1..1f37034 100644
--- a/api/peer_connection_factory_proxy.h
+++ b/api/peer_connection_factory_proxy.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_PEERCONNECTIONFACTORYPROXY_H_
-#define API_PEERCONNECTIONFACTORYPROXY_H_
+#ifndef API_PEER_CONNECTION_FACTORY_PROXY_H_
+#define API_PEER_CONNECTION_FACTORY_PROXY_H_
#include <memory>
#include <string>
#include <utility>
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
#include "api/proxy.h"
#include "rtc_base/bind.h"
@@ -74,4 +74,4 @@
} // namespace webrtc
-#endif // API_PEERCONNECTIONFACTORYPROXY_H_
+#endif // API_PEER_CONNECTION_FACTORY_PROXY_H_
diff --git a/api/peer_connection_interface.cc b/api/peer_connection_interface.cc
index a9b95a9..57754b6 100644
--- a/api/peer_connection_interface.cc
+++ b/api/peer_connection_interface.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/peerconnectioninterface.h"
-#include "api/dtlstransportinterface.h"
+#include "api/peer_connection_interface.h"
+#include "api/dtls_transport_interface.h"
namespace webrtc {
diff --git a/api/peer_connection_interface.h b/api/peer_connection_interface.h
index 91d71b4..d431a8e 100644
--- a/api/peer_connection_interface.h
+++ b/api/peer_connection_interface.h
@@ -64,55 +64,55 @@
// 7. Once a candidate has been gathered, the PeerConnection will call the
// observer function OnIceCandidate. Send these candidates to the remote peer.
-#ifndef API_PEERCONNECTIONINTERFACE_H_
-#define API_PEERCONNECTIONINTERFACE_H_
+#ifndef API_PEER_CONNECTION_INTERFACE_H_
+#define API_PEER_CONNECTION_INTERFACE_H_
#include <memory>
#include <string>
#include <vector>
-#include "api/asyncresolverfactory.h"
+#include "api/async_resolver_factory.h"
#include "api/audio/audio_mixer.h"
#include "api/audio_codecs/audio_decoder_factory.h"
#include "api/audio_codecs/audio_encoder_factory.h"
#include "api/audio_options.h"
-#include "api/call/callfactoryinterface.h"
-#include "api/crypto/cryptooptions.h"
-#include "api/datachannelinterface.h"
+#include "api/call/call_factory_interface.h"
+#include "api/crypto/crypto_options.h"
+#include "api/data_channel_interface.h"
#include "api/fec_controller.h"
#include "api/jsep.h"
+#include "api/media_stream_interface.h"
#include "api/media_transport_interface.h"
-#include "api/mediastreaminterface.h"
-#include "api/rtcerror.h"
-#include "api/rtceventlogoutput.h"
-#include "api/rtpreceiverinterface.h"
-#include "api/rtpsenderinterface.h"
-#include "api/rtptransceiverinterface.h"
-#include "api/setremotedescriptionobserverinterface.h"
-#include "api/stats/rtcstatscollectorcallback.h"
-#include "api/statstypes.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/set_remote_description_observer_interface.h"
+#include "api/stats/rtc_stats_collector_callback.h"
+#include "api/stats_types.h"
#include "api/transport/bitrate_settings.h"
#include "api/transport/network_control.h"
-#include "api/turncustomizer.h"
+#include "api/turn_customizer.h"
#include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
-#include "media/base/mediaconfig.h"
+#include "media/base/media_config.h"
// TODO(bugs.webrtc.org/6353): cricket::VideoCapturer is deprecated and should
// be deleted from the PeerConnection api.
-#include "media/base/videocapturer.h" // nogncheck
+#include "media/base/video_capturer.h" // nogncheck
// TODO(bugs.webrtc.org/7447): We plan to provide a way to let applications
// inject a PacketSocketFactory and/or NetworkManager, and not expose
// PortAllocator in the PeerConnection api.
-#include "media/base/mediaengine.h" // nogncheck
-#include "p2p/base/portallocator.h" // nogncheck
+#include "media/base/media_engine.h" // nogncheck
+#include "p2p/base/port_allocator.h" // nogncheck
// TODO(nisse): The interface for bitrate allocation strategy belongs in api/.
-#include "rtc_base/bitrateallocationstrategy.h"
+#include "rtc_base/bitrate_allocation_strategy.h"
#include "rtc_base/network.h"
#include "rtc_base/platform_file.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/rtccertificategenerator.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/rtc_certificate_generator.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_stream_adapter.h"
#include "rtc_base/system/rtc_export.h"
namespace rtc {
@@ -1462,4 +1462,4 @@
} // namespace webrtc
-#endif // API_PEERCONNECTIONINTERFACE_H_
+#endif // API_PEER_CONNECTION_INTERFACE_H_
diff --git a/api/peer_connection_proxy.h b/api/peer_connection_proxy.h
index e69efc0..8bd4d71 100644
--- a/api/peer_connection_proxy.h
+++ b/api/peer_connection_proxy.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_PEERCONNECTIONPROXY_H_
-#define API_PEERCONNECTIONPROXY_H_
+#ifndef API_PEER_CONNECTION_PROXY_H_
+#define API_PEER_CONNECTION_PROXY_H_
#include <memory>
#include <string>
#include <vector>
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
#include "api/proxy.h"
namespace webrtc {
@@ -141,4 +141,4 @@
} // namespace webrtc
-#endif // API_PEERCONNECTIONPROXY_H_
+#endif // API_PEER_CONNECTION_PROXY_H_
diff --git a/api/proxy.h b/api/proxy.h
index 3c30995..b1d9d50 100644
--- a/api/proxy.h
+++ b/api/proxy.h
@@ -57,9 +57,9 @@
#include <utility>
#include "rtc_base/event.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/thread.h"
diff --git a/api/ref_counted_base.h b/api/ref_counted_base.h
index 8c26efd..a1761db 100644
--- a/api/ref_counted_base.h
+++ b/api/ref_counted_base.h
@@ -7,12 +7,12 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_REFCOUNTEDBASE_H_
-#define API_REFCOUNTEDBASE_H_
+#ifndef API_REF_COUNTED_BASE_H_
+#define API_REF_COUNTED_BASE_H_
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcounter.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counter.h"
namespace rtc {
@@ -40,4 +40,4 @@
} // namespace rtc
-#endif // API_REFCOUNTEDBASE_H_
+#endif // API_REF_COUNTED_BASE_H_
diff --git a/api/rtc_error.cc b/api/rtc_error.cc
index 039e7f3..eccc891 100644
--- a/api/rtc_error.cc
+++ b/api/rtc_error.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/rtcerror.h"
+#include "api/rtc_error.h"
#include "rtc_base/arraysize.h"
diff --git a/api/rtc_error.h b/api/rtc_error.h
index 4910682..d8db1f2 100644
--- a/api/rtc_error.h
+++ b/api/rtc_error.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_RTCERROR_H_
-#define API_RTCERROR_H_
+#ifndef API_RTC_ERROR_H_
+#define API_RTC_ERROR_H_
#ifdef UNIT_TEST
#include <ostream>
@@ -291,4 +291,4 @@
} // namespace webrtc
-#endif // API_RTCERROR_H_
+#endif // API_RTC_ERROR_H_
diff --git a/api/rtc_error_unittest.cc b/api/rtc_error_unittest.cc
index a1ea83f..e9beb00 100644
--- a/api/rtc_error_unittest.cc
+++ b/api/rtc_error_unittest.cc
@@ -10,7 +10,7 @@
#include <utility>
-#include "api/rtcerror.h"
+#include "api/rtc_error.h"
#include "test/gtest.h"
namespace {
diff --git a/api/rtc_event_log_output.h b/api/rtc_event_log_output.h
index 67e408d..4a46324 100644
--- a/api/rtc_event_log_output.h
+++ b/api/rtc_event_log_output.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_RTCEVENTLOGOUTPUT_H_
-#define API_RTCEVENTLOGOUTPUT_H_
+#ifndef API_RTC_EVENT_LOG_OUTPUT_H_
+#define API_RTC_EVENT_LOG_OUTPUT_H_
#include <string>
@@ -36,4 +36,4 @@
} // namespace webrtc
-#endif // API_RTCEVENTLOGOUTPUT_H_
+#endif // API_RTC_EVENT_LOG_OUTPUT_H_
diff --git a/api/rtp_parameters.cc b/api/rtp_parameters.cc
index 6b253dc..c4fd112 100644
--- a/api/rtp_parameters.cc
+++ b/api/rtp_parameters.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 "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
#include <algorithm>
#include <string>
diff --git a/api/rtp_parameters.h b/api/rtp_parameters.h
index bb599ce..a2c566a 100644
--- a/api/rtp_parameters.h
+++ b/api/rtp_parameters.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_RTPPARAMETERS_H_
-#define API_RTPPARAMETERS_H_
+#ifndef API_RTP_PARAMETERS_H_
+#define API_RTP_PARAMETERS_H_
#include <stdint.h>
#include <string>
@@ -17,7 +17,7 @@
#include <vector>
#include "absl/types/optional.h"
-#include "api/mediatypes.h"
+#include "api/media_types.h"
#include "rtc_base/system/rtc_export.h"
namespace webrtc {
@@ -673,4 +673,4 @@
} // namespace webrtc
-#endif // API_RTPPARAMETERS_H_
+#endif // API_RTP_PARAMETERS_H_
diff --git a/api/rtp_parameters_unittest.cc b/api/rtp_parameters_unittest.cc
index 9d17d25..b6f2482 100644
--- a/api/rtp_parameters_unittest.cc
+++ b/api/rtp_parameters_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/api/rtp_receiver_interface.cc b/api/rtp_receiver_interface.cc
index 216ed2e..d8bb3d3 100644
--- a/api/rtp_receiver_interface.cc
+++ b/api/rtp_receiver_interface.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/rtpreceiverinterface.h"
+#include "api/rtp_receiver_interface.h"
namespace webrtc {
diff --git a/api/rtp_receiver_interface.h b/api/rtp_receiver_interface.h
index 2619735..12c9d95 100644
--- a/api/rtp_receiver_interface.h
+++ b/api/rtp_receiver_interface.h
@@ -11,18 +11,18 @@
// This file contains interfaces for RtpReceivers
// http://w3c.github.io/webrtc-pc/#rtcrtpreceiver-interface
-#ifndef API_RTPRECEIVERINTERFACE_H_
-#define API_RTPRECEIVERINTERFACE_H_
+#ifndef API_RTP_RECEIVER_INTERFACE_H_
+#define API_RTP_RECEIVER_INTERFACE_H_
#include <string>
#include <vector>
-#include "api/crypto/framedecryptorinterface.h"
-#include "api/mediastreaminterface.h"
-#include "api/mediatypes.h"
+#include "api/crypto/frame_decryptor_interface.h"
+#include "api/media_stream_interface.h"
+#include "api/media_types.h"
#include "api/proxy.h"
-#include "api/rtpparameters.h"
-#include "rtc_base/refcount.h"
+#include "api/rtp_parameters.h"
+#include "rtc_base/ref_count.h"
#include "rtc_base/scoped_ref_ptr.h"
namespace webrtc {
@@ -164,4 +164,4 @@
} // namespace webrtc
-#endif // API_RTPRECEIVERINTERFACE_H_
+#endif // API_RTP_RECEIVER_INTERFACE_H_
diff --git a/api/rtp_sender_interface.cc b/api/rtp_sender_interface.cc
index 11c0a69..68747ea 100644
--- a/api/rtp_sender_interface.cc
+++ b/api/rtp_sender_interface.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/rtpsenderinterface.h"
+#include "api/rtp_sender_interface.h"
namespace webrtc {
diff --git a/api/rtp_sender_interface.h b/api/rtp_sender_interface.h
index 7c94c21..c1dc716 100644
--- a/api/rtp_sender_interface.h
+++ b/api/rtp_sender_interface.h
@@ -11,20 +11,20 @@
// This file contains interfaces for RtpSenders
// http://w3c.github.io/webrtc-pc/#rtcrtpsender-interface
-#ifndef API_RTPSENDERINTERFACE_H_
-#define API_RTPSENDERINTERFACE_H_
+#ifndef API_RTP_SENDER_INTERFACE_H_
+#define API_RTP_SENDER_INTERFACE_H_
#include <string>
#include <vector>
-#include "api/crypto/frameencryptorinterface.h"
-#include "api/dtmfsenderinterface.h"
-#include "api/mediastreaminterface.h"
-#include "api/mediatypes.h"
+#include "api/crypto/frame_encryptor_interface.h"
+#include "api/dtmf_sender_interface.h"
+#include "api/media_stream_interface.h"
+#include "api/media_types.h"
#include "api/proxy.h"
-#include "api/rtcerror.h"
-#include "api/rtpparameters.h"
-#include "rtc_base/refcount.h"
+#include "api/rtc_error.h"
+#include "api/rtp_parameters.h"
+#include "rtc_base/ref_count.h"
#include "rtc_base/scoped_ref_ptr.h"
namespace webrtc {
@@ -108,4 +108,4 @@
} // namespace webrtc
-#endif // API_RTPSENDERINTERFACE_H_
+#endif // API_RTP_SENDER_INTERFACE_H_
diff --git a/api/rtp_transceiver_interface.cc b/api/rtp_transceiver_interface.cc
index e62b014..0504331 100644
--- a/api/rtp_transceiver_interface.cc
+++ b/api/rtp_transceiver_interface.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/rtptransceiverinterface.h"
+#include "api/rtp_transceiver_interface.h"
#include "rtc_base/checks.h"
diff --git a/api/rtp_transceiver_interface.h b/api/rtp_transceiver_interface.h
index c01fdaf..c62df49 100644
--- a/api/rtp_transceiver_interface.h
+++ b/api/rtp_transceiver_interface.h
@@ -8,19 +8,19 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_RTPTRANSCEIVERINTERFACE_H_
-#define API_RTPTRANSCEIVERINTERFACE_H_
+#ifndef API_RTP_TRANSCEIVER_INTERFACE_H_
+#define API_RTP_TRANSCEIVER_INTERFACE_H_
#include <string>
#include <vector>
#include "absl/types/optional.h"
#include "api/array_view.h"
-#include "api/mediatypes.h"
-#include "api/rtpparameters.h"
-#include "api/rtpreceiverinterface.h"
-#include "api/rtpsenderinterface.h"
-#include "rtc_base/refcount.h"
+#include "api/media_types.h"
+#include "api/rtp_parameters.h"
+#include "api/rtp_receiver_interface.h"
+#include "api/rtp_sender_interface.h"
+#include "rtc_base/ref_count.h"
#include "rtc_base/scoped_ref_ptr.h"
namespace webrtc {
@@ -137,4 +137,4 @@
} // namespace webrtc
-#endif // API_RTPTRANSCEIVERINTERFACE_H_
+#endif // API_RTP_TRANSCEIVER_INTERFACE_H_
diff --git a/api/set_remote_description_observer_interface.h b/api/set_remote_description_observer_interface.h
index bea8b82..1782555 100644
--- a/api/set_remote_description_observer_interface.h
+++ b/api/set_remote_description_observer_interface.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_SETREMOTEDESCRIPTIONOBSERVERINTERFACE_H_
-#define API_SETREMOTEDESCRIPTIONOBSERVERINTERFACE_H_
+#ifndef API_SET_REMOTE_DESCRIPTION_OBSERVER_INTERFACE_H_
+#define API_SET_REMOTE_DESCRIPTION_OBSERVER_INTERFACE_H_
-#include "api/rtcerror.h"
-#include "rtc_base/refcount.h"
+#include "api/rtc_error.h"
+#include "rtc_base/ref_count.h"
namespace webrtc {
@@ -28,4 +28,4 @@
} // namespace webrtc
-#endif // API_SETREMOTEDESCRIPTIONOBSERVERINTERFACE_H_
+#endif // API_SET_REMOTE_DESCRIPTION_OBSERVER_INTERFACE_H_
diff --git a/api/stats/rtc_stats.h b/api/stats/rtc_stats.h
index 3e96b0a..049b74f 100644
--- a/api/stats/rtc_stats.h
+++ b/api/stats/rtc_stats.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_STATS_RTCSTATS_H_
-#define API_STATS_RTCSTATS_H_
+#ifndef API_STATS_RTC_STATS_H_
+#define API_STATS_RTC_STATS_H_
#include <stddef.h>
#include <stdint.h>
@@ -348,4 +348,4 @@
};
} // namespace webrtc
-#endif // API_STATS_RTCSTATS_H_
+#endif // API_STATS_RTC_STATS_H_
diff --git a/api/stats/rtc_stats_collector_callback.h b/api/stats/rtc_stats_collector_callback.h
index 9242217..0bc8217 100644
--- a/api/stats/rtc_stats_collector_callback.h
+++ b/api/stats/rtc_stats_collector_callback.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_STATS_RTCSTATSCOLLECTORCALLBACK_H_
-#define API_STATS_RTCSTATSCOLLECTORCALLBACK_H_
+#ifndef API_STATS_RTC_STATS_COLLECTOR_CALLBACK_H_
+#define API_STATS_RTC_STATS_COLLECTOR_CALLBACK_H_
-#include "api/stats/rtcstatsreport.h"
-#include "rtc_base/refcount.h"
+#include "api/stats/rtc_stats_report.h"
+#include "rtc_base/ref_count.h"
#include "rtc_base/scoped_ref_ptr.h"
namespace webrtc {
@@ -27,4 +27,4 @@
} // namespace webrtc
-#endif // API_STATS_RTCSTATSCOLLECTORCALLBACK_H_
+#endif // API_STATS_RTC_STATS_COLLECTOR_CALLBACK_H_
diff --git a/api/stats/rtc_stats_report.h b/api/stats/rtc_stats_report.h
index a70a9ff..ab4f8f0 100644
--- a/api/stats/rtc_stats_report.h
+++ b/api/stats/rtc_stats_report.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_STATS_RTCSTATSREPORT_H_
-#define API_STATS_RTCSTATSREPORT_H_
+#ifndef API_STATS_RTC_STATS_REPORT_H_
+#define API_STATS_RTC_STATS_REPORT_H_
#include <stddef.h>
#include <stdint.h>
@@ -18,9 +18,9 @@
#include <string>
#include <vector>
-#include "api/stats/rtcstats.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "api/stats/rtc_stats.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/system/rtc_export.h"
@@ -117,4 +117,4 @@
} // namespace webrtc
-#endif // API_STATS_RTCSTATSREPORT_H_
+#endif // API_STATS_RTC_STATS_REPORT_H_
diff --git a/api/stats/rtcstats_objects.h b/api/stats/rtcstats_objects.h
index 9727758..e69bc8e 100644
--- a/api/stats/rtcstats_objects.h
+++ b/api/stats/rtcstats_objects.h
@@ -16,7 +16,7 @@
#include <string>
#include <vector>
-#include "api/stats/rtcstats.h"
+#include "api/stats/rtc_stats.h"
#include "rtc_base/system/rtc_export.h"
namespace webrtc {
diff --git a/api/stats_types.cc b/api/stats_types.cc
index dc37abc..71b1f86 100644
--- a/api/stats_types.cc
+++ b/api/stats_types.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "api/statstypes.h"
+#include "api/stats_types.h"
#include <string.h>
#include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
// TODO(tommi): Could we have a static map of value name -> expected type
// and use this to RTC_DCHECK on correct usage (somewhat strongly typed values)?
diff --git a/api/stats_types.h b/api/stats_types.h
index e653d15..7f1160f 100644
--- a/api/stats_types.h
+++ b/api/stats_types.h
@@ -11,8 +11,8 @@
// This file contains structures used for retrieving statistics from an ongoing
// libjingle session.
-#ifndef API_STATSTYPES_H_
-#define API_STATSTYPES_H_
+#ifndef API_STATS_TYPES_H_
+#define API_STATS_TYPES_H_
#include <algorithm>
#include <list>
@@ -20,10 +20,10 @@
#include <string>
#include <vector>
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ref_count.h"
#include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
#include "rtc_base/thread_checker.h"
namespace webrtc {
@@ -449,4 +449,4 @@
} // namespace webrtc
-#endif // API_STATSTYPES_H_
+#endif // API_STATS_TYPES_H_
diff --git a/api/test/DEPS b/api/test/DEPS
index 6c1ab93..ed944b4 100644
--- a/api/test/DEPS
+++ b/api/test/DEPS
@@ -5,12 +5,12 @@
".*": [
"+video"
],
- "fakeconstraints\.h": [
- "+rtc_base/stringencode.h",
+ "fake_constraints\.h": [
+ "+rtc_base/string_encode.h",
],
"loopback_media_transport\.h": [
- "+rtc_base/asyncinvoker.h",
- "+rtc_base/criticalsection.h",
+ "+rtc_base/async_invoker.h",
+ "+rtc_base/critical_section.h",
"+rtc_base/thread.h",
"+rtc_base/thread_checker.h",
],
diff --git a/api/test/fake_constraints.h b/api/test/fake_constraints.h
index d9c767d..e2b26d1 100644
--- a/api/test/fake_constraints.h
+++ b/api/test/fake_constraints.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_TEST_FAKECONSTRAINTS_H_
-#define API_TEST_FAKECONSTRAINTS_H_
+#ifndef API_TEST_FAKE_CONSTRAINTS_H_
+#define API_TEST_FAKE_CONSTRAINTS_H_
#include <string>
#include <vector>
-#include "api/mediaconstraintsinterface.h"
-#include "rtc_base/stringencode.h"
+#include "api/media_constraints_interface.h"
+#include "rtc_base/string_encode.h"
namespace webrtc {
@@ -109,4 +109,4 @@
} // namespace webrtc
-#endif // API_TEST_FAKECONSTRAINTS_H_
+#endif // API_TEST_FAKE_CONSTRAINTS_H_
diff --git a/api/test/fake_frame_decryptor.h b/api/test/fake_frame_decryptor.h
index e2bcf68..cb370b9 100644
--- a/api/test/fake_frame_decryptor.h
+++ b/api/test/fake_frame_decryptor.h
@@ -16,9 +16,9 @@
#include <vector>
#include "api/array_view.h"
-#include "api/crypto/framedecryptorinterface.h"
-#include "api/mediatypes.h"
-#include "rtc_base/refcountedobject.h"
+#include "api/crypto/frame_decryptor_interface.h"
+#include "api/media_types.h"
+#include "rtc_base/ref_counted_object.h"
namespace webrtc {
diff --git a/api/test/fake_frame_encryptor.h b/api/test/fake_frame_encryptor.h
index 47597ee..074981b 100644
--- a/api/test/fake_frame_encryptor.h
+++ b/api/test/fake_frame_encryptor.h
@@ -15,9 +15,9 @@
#include <stdint.h>
#include "api/array_view.h"
-#include "api/crypto/frameencryptorinterface.h"
-#include "api/mediatypes.h"
-#include "rtc_base/refcountedobject.h"
+#include "api/crypto/frame_encryptor_interface.h"
+#include "api/media_types.h"
+#include "rtc_base/ref_counted_object.h"
namespace webrtc {
diff --git a/api/test/loopback_media_transport.cc b/api/test/loopback_media_transport.cc
index 40415e2..57cc36d 100644
--- a/api/test/loopback_media_transport.cc
+++ b/api/test/loopback_media_transport.cc
@@ -11,7 +11,7 @@
#include "api/test/loopback_media_transport.h"
#include "absl/memory/memory.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace webrtc {
diff --git a/api/test/loopback_media_transport.h b/api/test/loopback_media_transport.h
index bd26305..64b8ced 100644
--- a/api/test/loopback_media_transport.h
+++ b/api/test/loopback_media_transport.h
@@ -17,8 +17,8 @@
#include "absl/memory/memory.h"
#include "api/media_transport_interface.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_checker.h"
diff --git a/api/test/mock_frame_decryptor.h b/api/test/mock_frame_decryptor.h
index e803965..feac9b3 100644
--- a/api/test/mock_frame_decryptor.h
+++ b/api/test/mock_frame_decryptor.h
@@ -13,7 +13,7 @@
#include <vector>
-#include "api/crypto/framedecryptorinterface.h"
+#include "api/crypto/frame_decryptor_interface.h"
#include "test/gmock.h"
namespace webrtc {
diff --git a/api/test/mock_frame_encryptor.h b/api/test/mock_frame_encryptor.h
index c4fb1fd..44b5e34 100644
--- a/api/test/mock_frame_encryptor.h
+++ b/api/test/mock_frame_encryptor.h
@@ -11,7 +11,7 @@
#ifndef API_TEST_MOCK_FRAME_ENCRYPTOR_H_
#define API_TEST_MOCK_FRAME_ENCRYPTOR_H_
-#include "api/crypto/frameencryptorinterface.h"
+#include "api/crypto/frame_encryptor_interface.h"
#include "test/gmock.h"
namespace webrtc {
diff --git a/api/test/mock_peerconnectioninterface.h b/api/test/mock_peerconnectioninterface.h
index 2e040de..86abad5 100644
--- a/api/test/mock_peerconnectioninterface.h
+++ b/api/test/mock_peerconnectioninterface.h
@@ -16,7 +16,7 @@
#include <utility>
#include <vector>
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
#include "test/gmock.h"
namespace webrtc {
diff --git a/api/test/mock_rtpreceiver.h b/api/test/mock_rtpreceiver.h
index de69cea..c585cbf 100644
--- a/api/test/mock_rtpreceiver.h
+++ b/api/test/mock_rtpreceiver.h
@@ -14,7 +14,7 @@
#include <string>
#include <vector>
-#include "api/rtpreceiverinterface.h"
+#include "api/rtp_receiver_interface.h"
#include "test/gmock.h"
namespace webrtc {
diff --git a/api/test/mock_rtpsender.h b/api/test/mock_rtpsender.h
index 37d6e0c..dca718f 100644
--- a/api/test/mock_rtpsender.h
+++ b/api/test/mock_rtpsender.h
@@ -14,7 +14,7 @@
#include <string>
#include <vector>
-#include "api/rtpsenderinterface.h"
+#include "api/rtp_sender_interface.h"
#include "test/gmock.h"
namespace webrtc {
diff --git a/api/test/simulated_network.h b/api/test/simulated_network.h
index c03b4ca..404f016 100644
--- a/api/test/simulated_network.h
+++ b/api/test/simulated_network.h
@@ -18,7 +18,7 @@
#include <vector>
#include "absl/types/optional.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/random.h"
#include "rtc_base/thread_annotations.h"
diff --git a/api/test/video_quality_test_fixture.h b/api/test/video_quality_test_fixture.h
index 1c82a0d..79b6d67 100644
--- a/api/test/video_quality_test_fixture.h
+++ b/api/test/video_quality_test_fixture.h
@@ -18,7 +18,7 @@
#include "api/bitrate_constraints.h"
#include "api/fec_controller.h"
-#include "api/mediatypes.h"
+#include "api/media_types.h"
#include "api/test/simulated_network.h"
#include "api/video_codecs/video_encoder_config.h"
diff --git a/api/turn_customizer.h b/api/turn_customizer.h
index 85c4e77..f0bf0d9 100644
--- a/api/turn_customizer.h
+++ b/api/turn_customizer.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_TURNCUSTOMIZER_H_
-#define API_TURNCUSTOMIZER_H_
+#ifndef API_TURN_CUSTOMIZER_H_
+#define API_TURN_CUSTOMIZER_H_
#include <stdlib.h>
@@ -42,4 +42,4 @@
} // namespace webrtc
-#endif // API_TURNCUSTOMIZER_H_
+#endif // API_TURN_CUSTOMIZER_H_
diff --git a/api/uma_metrics.h b/api/uma_metrics.h
index 239eff3..4336c1e 100644
--- a/api/uma_metrics.h
+++ b/api/uma_metrics.h
@@ -10,10 +10,10 @@
// This file contains enums related to IPv4/IPv6 metrics.
-#ifndef API_UMAMETRICS_H_
-#define API_UMAMETRICS_H_
+#ifndef API_UMA_METRICS_H_
+#define API_UMA_METRICS_H_
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
namespace webrtc {
@@ -157,4 +157,4 @@
} // namespace webrtc
-#endif // API_UMAMETRICS_H_
+#endif // API_UMA_METRICS_H_
diff --git a/api/video/DEPS b/api/video/DEPS
index a76b554..3dfec07 100644
--- a/api/video/DEPS
+++ b/api/video/DEPS
@@ -21,7 +21,7 @@
],
"video_frame_buffer\.h": [
- "+rtc_base/refcount.h",
+ "+rtc_base/ref_count.h",
"+rtc_base/scoped_ref_ptr.h",
],
diff --git a/api/video/i010_buffer.cc b/api/video/i010_buffer.cc
index 557a769..8f4541f 100644
--- a/api/video/i010_buffer.cc
+++ b/api/video/i010_buffer.cc
@@ -13,7 +13,7 @@
#include "api/video/i420_buffer.h"
#include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
#include "third_party/libyuv/include/libyuv/convert.h"
#include "third_party/libyuv/include/libyuv/scale.h"
diff --git a/api/video/i420_buffer.cc b/api/video/i420_buffer.cc
index c468f51..ed45b98 100644
--- a/api/video/i420_buffer.cc
+++ b/api/video/i420_buffer.cc
@@ -14,7 +14,7 @@
#include <utility>
#include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
#include "third_party/libyuv/include/libyuv/convert.h"
#include "third_party/libyuv/include/libyuv/planar_functions.h"
#include "third_party/libyuv/include/libyuv/scale.h"
diff --git a/api/video/video_frame.cc b/api/video/video_frame.cc
index c80ee8b..75a30b2 100644
--- a/api/video/video_frame.cc
+++ b/api/video/video_frame.cc
@@ -11,7 +11,7 @@
#include "api/video/video_frame.h"
#include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace webrtc {
diff --git a/api/video/video_frame_buffer.h b/api/video/video_frame_buffer.h
index 1e8169a..cdc87ac 100644
--- a/api/video/video_frame_buffer.h
+++ b/api/video/video_frame_buffer.h
@@ -13,7 +13,7 @@
#include <stdint.h>
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
#include "rtc_base/scoped_ref_ptr.h"
namespace webrtc {
diff --git a/api/video/video_stream_encoder_interface.h b/api/video/video_stream_encoder_interface.h
index 2f95e58..6a0adde 100644
--- a/api/video/video_stream_encoder_interface.h
+++ b/api/video/video_stream_encoder_interface.h
@@ -13,7 +13,7 @@
#include <vector>
-#include "api/rtpparameters.h" // For DegradationPreference.
+#include "api/rtp_parameters.h" // For DegradationPreference.
#include "api/video/video_sink_interface.h"
#include "api/video/video_source_interface.h"
#include "api/video_codecs/video_encoder.h"
diff --git a/api/video_codecs/builtin_video_decoder_factory.cc b/api/video_codecs/builtin_video_decoder_factory.cc
index 883c1eb..e71e069 100644
--- a/api/video_codecs/builtin_video_decoder_factory.cc
+++ b/api/video_codecs/builtin_video_decoder_factory.cc
@@ -11,7 +11,7 @@
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "absl/memory/memory.h"
-#include "media/engine/internaldecoderfactory.h"
+#include "media/engine/internal_decoder_factory.h"
namespace webrtc {
diff --git a/api/video_codecs/builtin_video_encoder_factory.cc b/api/video_codecs/builtin_video_encoder_factory.cc
index 1778c21..0df97cc 100644
--- a/api/video_codecs/builtin_video_encoder_factory.cc
+++ b/api/video_codecs/builtin_video_encoder_factory.cc
@@ -17,9 +17,9 @@
#include "api/video_codecs/sdp_video_format.h"
#include "api/video_codecs/video_encoder.h"
#include "media/base/codec.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
#include "media/engine/encoder_simulcast_proxy.h"
-#include "media/engine/internalencoderfactory.h"
+#include "media/engine/internal_encoder_factory.h"
#include "rtc_base/checks.h"
namespace webrtc {
diff --git a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
index 9fd5aed..bf08d1c 100644
--- a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
+++ b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
@@ -32,7 +32,7 @@
#include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/include/video_error_codes.h"
#include "modules/video_coding/utility/simulcast_rate_allocator.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "test/field_trial.h"
#include "test/gmock.h"
diff --git a/api/video_codecs/video_encoder_config.h b/api/video_codecs/video_encoder_config.h
index 9dd8e4f..3a35380 100644
--- a/api/video_codecs/video_encoder_config.h
+++ b/api/video_codecs/video_encoder_config.h
@@ -18,7 +18,7 @@
#include "absl/types/optional.h"
#include "api/video_codecs/sdp_video_format.h"
#include "api/video_codecs/video_codec.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
#include "rtc_base/scoped_ref_ptr.h"
namespace webrtc {
diff --git a/api/video_track_source_proxy.h b/api/video_track_source_proxy.h
index dbd9045..820cdcb 100644
--- a/api/video_track_source_proxy.h
+++ b/api/video_track_source_proxy.h
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef API_VIDEOSOURCEPROXY_H_
-#define API_VIDEOSOURCEPROXY_H_
+#ifndef API_VIDEO_TRACK_SOURCE_PROXY_H_
+#define API_VIDEO_TRACK_SOURCE_PROXY_H_
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "api/proxy.h"
namespace webrtc {
@@ -38,4 +38,4 @@
} // namespace webrtc
-#endif // API_VIDEOSOURCEPROXY_H_
+#endif // API_VIDEO_TRACK_SOURCE_PROXY_H_
