(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/sdk/objc/api/RTCVideoRendererAdapter+Private.h b/sdk/objc/api/RTCVideoRendererAdapter+Private.h
index 7cedba4..d983ae6 100644
--- a/sdk/objc/api/RTCVideoRendererAdapter+Private.h
+++ b/sdk/objc/api/RTCVideoRendererAdapter+Private.h
@@ -12,7 +12,7 @@
#import "base/RTCVideoRenderer.h"
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/logging/RTCCallbackLogger.mm b/sdk/objc/api/logging/RTCCallbackLogger.mm
index 8d415b9..e58b03b 100644
--- a/sdk/objc/api/logging/RTCCallbackLogger.mm
+++ b/sdk/objc/api/logging/RTCCallbackLogger.mm
@@ -13,8 +13,8 @@
#include <memory>
#include "rtc_base/checks.h"
+#include "rtc_base/log_sinks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/logsinks.h"
class CallbackLogSink : public rtc::LogSink {
public:
diff --git a/sdk/objc/api/peerconnection/RTCAudioTrack+Private.h b/sdk/objc/api/peerconnection/RTCAudioTrack+Private.h
index fe30d65..88dd971 100644
--- a/sdk/objc/api/peerconnection/RTCAudioTrack+Private.h
+++ b/sdk/objc/api/peerconnection/RTCAudioTrack+Private.h
@@ -10,7 +10,7 @@
#import "RTCAudioTrack.h"
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCCertificate.mm b/sdk/objc/api/peerconnection/RTCCertificate.mm
index bce4c3b..250cfc4 100644
--- a/sdk/objc/api/peerconnection/RTCCertificate.mm
+++ b/sdk/objc/api/peerconnection/RTCCertificate.mm
@@ -13,8 +13,8 @@
#import "base/RTCLogging.h"
#include "rtc_base/logging.h"
-#include "rtc_base/rtccertificategenerator.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/rtc_certificate_generator.h"
+#include "rtc_base/ssl_identity.h"
@implementation RTCCertificate
diff --git a/sdk/objc/api/peerconnection/RTCConfiguration+Native.h b/sdk/objc/api/peerconnection/RTCConfiguration+Native.h
index e14e6d4..54783f0 100644
--- a/sdk/objc/api/peerconnection/RTCConfiguration+Native.h
+++ b/sdk/objc/api/peerconnection/RTCConfiguration+Native.h
@@ -10,7 +10,7 @@
#import "RTCConfiguration.h"
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCConfiguration+Private.h b/sdk/objc/api/peerconnection/RTCConfiguration+Private.h
index cb45441..845f779 100644
--- a/sdk/objc/api/peerconnection/RTCConfiguration+Private.h
+++ b/sdk/objc/api/peerconnection/RTCConfiguration+Private.h
@@ -10,7 +10,7 @@
#import "RTCConfiguration.h"
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCConfiguration.mm b/sdk/objc/api/peerconnection/RTCConfiguration.mm
index 4041f83..83ae575 100644
--- a/sdk/objc/api/peerconnection/RTCConfiguration.mm
+++ b/sdk/objc/api/peerconnection/RTCConfiguration.mm
@@ -18,8 +18,8 @@
#import "RTCIntervalRange+Private.h"
#import "base/RTCLogging.h"
-#include "rtc_base/rtccertificategenerator.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/rtc_certificate_generator.h"
+#include "rtc_base/ssl_identity.h"
@implementation RTCConfiguration
diff --git a/sdk/objc/api/peerconnection/RTCDataChannel+Private.h b/sdk/objc/api/peerconnection/RTCDataChannel+Private.h
index a88a316..74d0455 100644
--- a/sdk/objc/api/peerconnection/RTCDataChannel+Private.h
+++ b/sdk/objc/api/peerconnection/RTCDataChannel+Private.h
@@ -10,7 +10,7 @@
#import "RTCDataChannel.h"
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
#include "rtc_base/scoped_ref_ptr.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCDataChannelConfiguration+Private.h b/sdk/objc/api/peerconnection/RTCDataChannelConfiguration+Private.h
index 11be5a6..244f742 100644
--- a/sdk/objc/api/peerconnection/RTCDataChannelConfiguration+Private.h
+++ b/sdk/objc/api/peerconnection/RTCDataChannelConfiguration+Private.h
@@ -10,7 +10,7 @@
#import "RTCDataChannelConfiguration.h"
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h b/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h
index cdcf62c..ec05481 100644
--- a/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h
+++ b/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h
@@ -10,7 +10,7 @@
#import "RTCDtmfSender.h"
-#include "api/dtmfsenderinterface.h"
+#include "api/dtmf_sender_interface.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCDtmfSender.mm b/sdk/objc/api/peerconnection/RTCDtmfSender.mm
index 1513840..77d0678 100644
--- a/sdk/objc/api/peerconnection/RTCDtmfSender.mm
+++ b/sdk/objc/api/peerconnection/RTCDtmfSender.mm
@@ -13,7 +13,7 @@
#import "base/RTCLogging.h"
#import "helpers/NSString+StdString.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
@implementation RTCDtmfSender {
rtc::scoped_refptr<webrtc::DtmfSenderInterface> _nativeDtmfSender;
diff --git a/sdk/objc/api/peerconnection/RTCFileLogger.mm b/sdk/objc/api/peerconnection/RTCFileLogger.mm
index 9515cfb..ef13023 100644
--- a/sdk/objc/api/peerconnection/RTCFileLogger.mm
+++ b/sdk/objc/api/peerconnection/RTCFileLogger.mm
@@ -13,9 +13,9 @@
#include <memory>
#include "rtc_base/checks.h"
-#include "rtc_base/filerotatingstream.h"
+#include "rtc_base/file_rotating_stream.h"
+#include "rtc_base/log_sinks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/logsinks.h"
NSString *const kDefaultLogDirName = @"webrtc_logs";
NSUInteger const kDefaultMaxFileSize = 10 * 1024 * 1024; // 10MB.
diff --git a/sdk/objc/api/peerconnection/RTCIceServer+Private.h b/sdk/objc/api/peerconnection/RTCIceServer+Private.h
index 8d16dfd..53fbb45 100644
--- a/sdk/objc/api/peerconnection/RTCIceServer+Private.h
+++ b/sdk/objc/api/peerconnection/RTCIceServer+Private.h
@@ -10,7 +10,7 @@
#import "RTCIceServer.h"
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCIntervalRange+Private.h b/sdk/objc/api/peerconnection/RTCIntervalRange+Private.h
index a4e59cd..afa7509 100644
--- a/sdk/objc/api/peerconnection/RTCIntervalRange+Private.h
+++ b/sdk/objc/api/peerconnection/RTCIntervalRange+Private.h
@@ -10,7 +10,7 @@
#import "RTCIntervalRange.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCLegacyStatsReport+Private.h b/sdk/objc/api/peerconnection/RTCLegacyStatsReport+Private.h
index 51888b6..d87659d 100644
--- a/sdk/objc/api/peerconnection/RTCLegacyStatsReport+Private.h
+++ b/sdk/objc/api/peerconnection/RTCLegacyStatsReport+Private.h
@@ -10,7 +10,7 @@
#import "RTCLegacyStatsReport.h"
-#include "api/statstypes.h"
+#include "api/stats_types.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCMediaConstraints+Private.h b/sdk/objc/api/peerconnection/RTCMediaConstraints+Private.h
index 68a9436..335b029 100644
--- a/sdk/objc/api/peerconnection/RTCMediaConstraints+Private.h
+++ b/sdk/objc/api/peerconnection/RTCMediaConstraints+Private.h
@@ -12,7 +12,7 @@
#include <memory>
-#include "api/mediaconstraintsinterface.h"
+#include "api/media_constraints_interface.h"
namespace webrtc {
diff --git a/sdk/objc/api/peerconnection/RTCMediaSource+Private.h b/sdk/objc/api/peerconnection/RTCMediaSource+Private.h
index a34cbbd..7d69aaa 100644
--- a/sdk/objc/api/peerconnection/RTCMediaSource+Private.h
+++ b/sdk/objc/api/peerconnection/RTCMediaSource+Private.h
@@ -10,7 +10,7 @@
#import "RTCMediaSource.h"
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCMediaStream+Private.h b/sdk/objc/api/peerconnection/RTCMediaStream+Private.h
index 21d64ec..23149ce 100644
--- a/sdk/objc/api/peerconnection/RTCMediaStream+Private.h
+++ b/sdk/objc/api/peerconnection/RTCMediaStream+Private.h
@@ -10,7 +10,7 @@
#import "RTCMediaStream.h"
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCMediaStreamTrack+Private.h b/sdk/objc/api/peerconnection/RTCMediaStreamTrack+Private.h
index 7f8810c..176bb73 100644
--- a/sdk/objc/api/peerconnection/RTCMediaStreamTrack+Private.h
+++ b/sdk/objc/api/peerconnection/RTCMediaStreamTrack+Private.h
@@ -10,7 +10,7 @@
#import "RTCMediaStreamTrack.h"
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
typedef NS_ENUM(NSInteger, RTCMediaStreamTrackType) {
RTCMediaStreamTrackTypeAudio,
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnection+Private.h b/sdk/objc/api/peerconnection/RTCPeerConnection+Private.h
index d26eb2e..3de6a9b 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnection+Private.h
+++ b/sdk/objc/api/peerconnection/RTCPeerConnection+Private.h
@@ -10,7 +10,7 @@
#import "RTCPeerConnection.h"
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnection.mm b/sdk/objc/api/peerconnection/RTCPeerConnection.mm
index b59dafe..fde71a2 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnection.mm
+++ b/sdk/objc/api/peerconnection/RTCPeerConnection.mm
@@ -28,7 +28,7 @@
#include <memory>
-#include "api/jsepicecandidate.h"
+#include "api/jsep_ice_candidate.h"
#include "api/media_transport_interface.h"
#include "rtc_base/checks.h"
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory+Private.h b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory+Private.h
index 4dc03cf..a82c445 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory+Private.h
+++ b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory+Private.h
@@ -10,7 +10,7 @@
#import "RTCPeerConnectionFactory.h"
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
#include "rtc_base/scoped_ref_ptr.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm
index 7262884..dfcb637 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm
+++ b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm
@@ -52,7 +52,7 @@
// API layer.
#include "absl/memory/memory.h"
#include "api/media_transport_interface.h"
-#include "media/engine/webrtcmediaengine.h" // nogncheck
+#include "media/engine/webrtc_media_engine.h" // nogncheck
@implementation RTCPeerConnectionFactory {
std::unique_ptr<rtc::Thread> _networkThread;
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions+Private.h b/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions+Private.h
index 2ccbd1c..986b0e6 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions+Private.h
+++ b/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions+Private.h
@@ -10,7 +10,7 @@
#import "RTCPeerConnectionFactoryOptions.h"
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCRtcpParameters+Private.h b/sdk/objc/api/peerconnection/RTCRtcpParameters+Private.h
index 540601b..5471bf4 100644
--- a/sdk/objc/api/peerconnection/RTCRtcpParameters+Private.h
+++ b/sdk/objc/api/peerconnection/RTCRtcpParameters+Private.h
@@ -10,7 +10,7 @@
#import "RTCRtcpParameters.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCRtpCodecParameters+Private.h b/sdk/objc/api/peerconnection/RTCRtpCodecParameters+Private.h
index 3759a27..1b297ed 100644
--- a/sdk/objc/api/peerconnection/RTCRtpCodecParameters+Private.h
+++ b/sdk/objc/api/peerconnection/RTCRtpCodecParameters+Private.h
@@ -10,7 +10,7 @@
#import "RTCRtpCodecParameters.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm b/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm
index d555bea..f25679e 100644
--- a/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm
+++ b/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm
@@ -13,7 +13,7 @@
#import "RTCMediaStreamTrack.h"
#import "helpers/NSString+StdString.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
#include "rtc_base/checks.h"
const NSString * const kRTCRtxCodecName = @(cricket::kRtxCodecName);
diff --git a/sdk/objc/api/peerconnection/RTCRtpEncodingParameters+Private.h b/sdk/objc/api/peerconnection/RTCRtpEncodingParameters+Private.h
index fe60948..e3684d3 100644
--- a/sdk/objc/api/peerconnection/RTCRtpEncodingParameters+Private.h
+++ b/sdk/objc/api/peerconnection/RTCRtpEncodingParameters+Private.h
@@ -10,7 +10,7 @@
#import "RTCRtpEncodingParameters.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCRtpHeaderExtension+Private.h b/sdk/objc/api/peerconnection/RTCRtpHeaderExtension+Private.h
index 3f1f547..8a2a231 100644
--- a/sdk/objc/api/peerconnection/RTCRtpHeaderExtension+Private.h
+++ b/sdk/objc/api/peerconnection/RTCRtpHeaderExtension+Private.h
@@ -10,7 +10,7 @@
#import "RTCRtpHeaderExtension.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCRtpParameters+Private.h b/sdk/objc/api/peerconnection/RTCRtpParameters+Private.h
index 0b7aa20..a88ccfa 100644
--- a/sdk/objc/api/peerconnection/RTCRtpParameters+Private.h
+++ b/sdk/objc/api/peerconnection/RTCRtpParameters+Private.h
@@ -10,7 +10,7 @@
#import "RTCRtpParameters.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCRtpReceiver+Native.h b/sdk/objc/api/peerconnection/RTCRtpReceiver+Native.h
index 8013b69..419a347 100644
--- a/sdk/objc/api/peerconnection/RTCRtpReceiver+Native.h
+++ b/sdk/objc/api/peerconnection/RTCRtpReceiver+Native.h
@@ -10,7 +10,7 @@
#import "RTCRtpReceiver.h"
-#include "api/crypto/framedecryptorinterface.h"
+#include "api/crypto/frame_decryptor_interface.h"
#include "rtc_base/scoped_ref_ptr.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCRtpReceiver+Private.h b/sdk/objc/api/peerconnection/RTCRtpReceiver+Private.h
index 019b5764..6f56739 100644
--- a/sdk/objc/api/peerconnection/RTCRtpReceiver+Private.h
+++ b/sdk/objc/api/peerconnection/RTCRtpReceiver+Private.h
@@ -10,7 +10,7 @@
#import "RTCRtpReceiver.h"
-#include "api/rtpreceiverinterface.h"
+#include "api/rtp_receiver_interface.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCRtpReceiver.mm b/sdk/objc/api/peerconnection/RTCRtpReceiver.mm
index 4d240be..5d44478 100644
--- a/sdk/objc/api/peerconnection/RTCRtpReceiver.mm
+++ b/sdk/objc/api/peerconnection/RTCRtpReceiver.mm
@@ -16,7 +16,7 @@
#import "base/RTCLogging.h"
#import "helpers/NSString+StdString.h"
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
namespace webrtc {
diff --git a/sdk/objc/api/peerconnection/RTCRtpSender+Native.h b/sdk/objc/api/peerconnection/RTCRtpSender+Native.h
index 612c5e0..daef7ee 100644
--- a/sdk/objc/api/peerconnection/RTCRtpSender+Native.h
+++ b/sdk/objc/api/peerconnection/RTCRtpSender+Native.h
@@ -10,7 +10,7 @@
#import "RTCRtpSender.h"
-#include "api/crypto/frameencryptorinterface.h"
+#include "api/crypto/frame_encryptor_interface.h"
#include "rtc_base/scoped_ref_ptr.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCRtpSender+Private.h b/sdk/objc/api/peerconnection/RTCRtpSender+Private.h
index d0dcb2b..389b833 100644
--- a/sdk/objc/api/peerconnection/RTCRtpSender+Private.h
+++ b/sdk/objc/api/peerconnection/RTCRtpSender+Private.h
@@ -10,7 +10,7 @@
#import "RTCRtpSender.h"
-#include "api/rtpsenderinterface.h"
+#include "api/rtp_sender_interface.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCRtpSender.mm b/sdk/objc/api/peerconnection/RTCRtpSender.mm
index 30e1bde..b227025 100644
--- a/sdk/objc/api/peerconnection/RTCRtpSender.mm
+++ b/sdk/objc/api/peerconnection/RTCRtpSender.mm
@@ -17,7 +17,7 @@
#import "base/RTCLogging.h"
#import "helpers/NSString+StdString.h"
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
@implementation RTCRtpSender {
RTCPeerConnectionFactory *_factory;
diff --git a/sdk/objc/api/peerconnection/RTCRtpTransceiver+Private.h b/sdk/objc/api/peerconnection/RTCRtpTransceiver+Private.h
index 61cbcb3..d7f6b58 100644
--- a/sdk/objc/api/peerconnection/RTCRtpTransceiver+Private.h
+++ b/sdk/objc/api/peerconnection/RTCRtpTransceiver+Private.h
@@ -10,7 +10,7 @@
#import "RTCRtpTransceiver.h"
-#include "api/rtptransceiverinterface.h"
+#include "api/rtp_transceiver_interface.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCSSLAdapter.mm b/sdk/objc/api/peerconnection/RTCSSLAdapter.mm
index 18388f9..4302495 100644
--- a/sdk/objc/api/peerconnection/RTCSSLAdapter.mm
+++ b/sdk/objc/api/peerconnection/RTCSSLAdapter.mm
@@ -11,7 +11,7 @@
#import "RTCSSLAdapter.h"
#include "rtc_base/checks.h"
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/ssl_adapter.h"
BOOL RTCInitializeSSL(void) {
BOOL initialized = rtc::InitializeSSL();
diff --git a/sdk/objc/api/peerconnection/RTCVideoSource+Private.h b/sdk/objc/api/peerconnection/RTCVideoSource+Private.h
index 828aad8..1827e6b 100644
--- a/sdk/objc/api/peerconnection/RTCVideoSource+Private.h
+++ b/sdk/objc/api/peerconnection/RTCVideoSource+Private.h
@@ -12,7 +12,7 @@
#import "RTCMediaSource+Private.h"
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "rtc_base/thread.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCVideoSource.mm b/sdk/objc/api/peerconnection/RTCVideoSource.mm
index 1cbeb0b..789c843 100644
--- a/sdk/objc/api/peerconnection/RTCVideoSource.mm
+++ b/sdk/objc/api/peerconnection/RTCVideoSource.mm
@@ -10,7 +10,7 @@
#import "RTCVideoSource+Private.h"
-#include "api/videosourceproxy.h"
+#include "api/video_track_source_proxy.h"
#include "rtc_base/checks.h"
#include "sdk/objc/native/src/objc_video_track_source.h"
diff --git a/sdk/objc/api/peerconnection/RTCVideoTrack+Private.h b/sdk/objc/api/peerconnection/RTCVideoTrack+Private.h
index 176366a..dd3d172 100644
--- a/sdk/objc/api/peerconnection/RTCVideoTrack+Private.h
+++ b/sdk/objc/api/peerconnection/RTCVideoTrack+Private.h
@@ -10,7 +10,7 @@
#import "RTCVideoTrack.h"
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/video_codec/RTCVideoCodecConstants.mm b/sdk/objc/api/video_codec/RTCVideoCodecConstants.mm
index acbf126..3de6e22 100644
--- a/sdk/objc/api/video_codec/RTCVideoCodecConstants.mm
+++ b/sdk/objc/api/video_codec/RTCVideoCodecConstants.mm
@@ -11,7 +11,7 @@
#import "RTCVideoCodecConstants.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
NSString *const kRTCVideoCodecVp8Name = @(cricket::kVp8CodecName);
NSString *const kRTCVideoCodecVp9Name = @(cricket::kVp9CodecName);
diff --git a/sdk/objc/components/audio/RTCAudioSession.mm b/sdk/objc/components/audio/RTCAudioSession.mm
index b4d759b..1b2b487 100644
--- a/sdk/objc/components/audio/RTCAudioSession.mm
+++ b/sdk/objc/components/audio/RTCAudioSession.mm
@@ -12,9 +12,9 @@
#import <UIKit/UIKit.h>
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
#include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
#import "RTCAudioSessionConfiguration.h"
#import "base/RTCLogging.h"
diff --git a/sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm b/sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm
index 359656c..afd9fcb 100644
--- a/sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm
+++ b/sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm
@@ -17,7 +17,7 @@
#endif
#include "media/base/h264_profile_level_id.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
namespace {
diff --git a/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm b/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm
index 3bfb918..69ccc90 100644
--- a/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm
+++ b/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm
@@ -26,7 +26,7 @@
#include "modules/video_coding/include/video_error_codes.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "sdk/objc/components/video_codec/nalu_rewriter.h"
// Struct that we pass to the decoder per frame to decode. We receive it again
diff --git a/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm b/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm
index f6690b6..51fa51e 100644
--- a/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm
+++ b/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm
@@ -36,7 +36,7 @@
#include "modules/video_coding/include/video_error_codes.h"
#include "rtc_base/buffer.h"
#include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "sdk/objc/components/video_codec/nalu_rewriter.h"
#include "third_party/libyuv/include/libyuv/convert_from.h"
diff --git a/sdk/objc/native/api/audio_device_module.mm b/sdk/objc/native/api/audio_device_module.mm
index 893aaec..e8f2b9a 100644
--- a/sdk/objc/native/api/audio_device_module.mm
+++ b/sdk/objc/native/api/audio_device_module.mm
@@ -11,7 +11,7 @@
#include "audio_device_module.h"
#include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
#include "sdk/objc/native/src/audio/audio_device_module_ios.h"
diff --git a/sdk/objc/native/api/video_capturer.h b/sdk/objc/native/api/video_capturer.h
index d6f396b..c0a7760 100644
--- a/sdk/objc/native/api/video_capturer.h
+++ b/sdk/objc/native/api/video_capturer.h
@@ -13,7 +13,7 @@
#import "base/RTCVideoCapturer.h"
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/thread.h"
diff --git a/sdk/objc/native/api/video_capturer.mm b/sdk/objc/native/api/video_capturer.mm
index 3bad998..2618550 100644
--- a/sdk/objc/native/api/video_capturer.mm
+++ b/sdk/objc/native/api/video_capturer.mm
@@ -11,7 +11,7 @@
#include "sdk/objc/native/api/video_capturer.h"
#include "absl/memory/memory.h"
-#include "api/videosourceproxy.h"
+#include "api/video_track_source_proxy.h"
#include "sdk/objc/native/src/objc_video_track_source.h"
namespace webrtc {
diff --git a/sdk/objc/native/src/audio/audio_device_ios.mm b/sdk/objc/native/src/audio/audio_device_ios.mm
index ec9a798..efbf463 100644
--- a/sdk/objc/native/src/audio/audio_device_ios.mm
+++ b/sdk/objc/native/src/audio/audio_device_ios.mm
@@ -18,14 +18,14 @@
#include "api/array_view.h"
#include "helpers.h"
#include "modules/audio_device/fine_audio_buffer.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
#include "rtc_base/bind.h"
#include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/logging.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_annotations.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "system_wrappers/include/metrics.h"
#import "base/RTCLogging.h"
diff --git a/sdk/objc/native/src/audio/audio_device_module_ios.h b/sdk/objc/native/src/audio/audio_device_module_ios.h
index 59730b6..3170313 100644
--- a/sdk/objc/native/src/audio/audio_device_module_ios.h
+++ b/sdk/objc/native/src/audio/audio_device_module_ios.h
@@ -18,7 +18,7 @@
#include "modules/audio_device/audio_device_buffer.h"
#include "modules/audio_device/include/audio_device.h"
#include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
namespace webrtc {
diff --git a/sdk/objc/native/src/audio/audio_device_module_ios.mm b/sdk/objc/native/src/audio/audio_device_module_ios.mm
index 814ab90..ff9da47 100644
--- a/sdk/objc/native/src/audio/audio_device_module_ios.mm
+++ b/sdk/objc/native/src/audio/audio_device_module_ios.mm
@@ -14,8 +14,8 @@
#include "modules/audio_device/audio_device_generic.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
#include "system_wrappers/include/metrics.h"
#if defined(WEBRTC_IOS)
diff --git a/sdk/objc/native/src/audio/audio_session_observer.h b/sdk/objc/native/src/audio/audio_session_observer.h
index 2f8bd0c..27b1b38 100644
--- a/sdk/objc/native/src/audio/audio_session_observer.h
+++ b/sdk/objc/native/src/audio/audio_session_observer.h
@@ -11,7 +11,7 @@
#ifndef SDK_OBJC_NATIVE_SRC_AUDIO_AUDIO_SESSION_OBSERVER_H_
#define SDK_OBJC_NATIVE_SRC_AUDIO_AUDIO_SESSION_OBSERVER_H_
-#include "rtc_base/asyncinvoker.h"
+#include "rtc_base/async_invoker.h"
#include "rtc_base/thread.h"
namespace webrtc {
diff --git a/sdk/objc/native/src/objc_video_decoder_factory.mm b/sdk/objc/native/src/objc_video_decoder_factory.mm
index 6e0ff27..f5c53b0 100644
--- a/sdk/objc/native/src/objc_video_decoder_factory.mm
+++ b/sdk/objc/native/src/objc_video_decoder_factory.mm
@@ -26,7 +26,7 @@
#include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/include/video_error_codes.h"
#include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "sdk/objc/native/src/objc_frame_buffer.h"
namespace webrtc {
diff --git a/sdk/objc/native/src/objc_video_frame.mm b/sdk/objc/native/src/objc_video_frame.mm
index bf60824..76f7add 100644
--- a/sdk/objc/native/src/objc_video_frame.mm
+++ b/sdk/objc/native/src/objc_video_frame.mm
@@ -10,7 +10,7 @@
#include "sdk/objc/native/src/objc_video_frame.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "sdk/objc/native/src/objc_frame_buffer.h"
namespace webrtc {
diff --git a/sdk/objc/native/src/objc_video_track_source.h b/sdk/objc/native/src/objc_video_track_source.h
index 7956014..93e7d15 100644
--- a/sdk/objc/native/src/objc_video_track_source.h
+++ b/sdk/objc/native/src/objc_video_track_source.h
@@ -14,8 +14,8 @@
#import "base/RTCVideoCapturer.h"
#include "base/RTCMacros.h"
-#include "media/base/adaptedvideotracksource.h"
-#include "rtc_base/timestampaligner.h"
+#include "media/base/adapted_video_track_source.h"
+#include "rtc_base/timestamp_aligner.h"
RTC_FWD_DECL_OBJC_CLASS(RTCVideoFrame);
diff --git a/sdk/objc/unittests/ObjCVideoTrackSource_xctest.mm b/sdk/objc/unittests/ObjCVideoTrackSource_xctest.mm
index fa864a2..291c9f0 100644
--- a/sdk/objc/unittests/ObjCVideoTrackSource_xctest.mm
+++ b/sdk/objc/unittests/ObjCVideoTrackSource_xctest.mm
@@ -20,8 +20,8 @@
#import "frame_buffer_helpers.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "media/base/fakevideorenderer.h"
-#include "rtc_base/refcountedobject.h"
+#include "media/base/fake_video_renderer.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "sdk/objc/native/api/video_frame.h"