(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}

sdk/android/src/jni/android_media_codec_common.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
-#define SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
+#ifndef SDK_ANDROID_SRC_JNI_ANDROID_MEDIA_CODEC_COMMON_H_
+#define SDK_ANDROID_SRC_JNI_ANDROID_MEDIA_CODEC_COMMON_H_
 
 #include <string>
 
@@ -84,4 +84,4 @@ static inline bool CheckException(JNIEnv* jni) {
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
+#endif  // SDK_ANDROID_SRC_JNI_ANDROID_MEDIA_CODEC_COMMON_H_

sdk/android/src/jni/android_media_decoder.cc

@@ -16,7 +16,7 @@
 #include "api/video_codecs/sdp_video_format.h"
 #include "common_video/h264/h264_bitstream_parser.h"
 #include "common_video/include/i420_buffer_pool.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/utility/vp8_header_parser.h"
 #include "rtc_base/bind.h"
@@ -25,11 +25,11 @@
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/android/generated_video_jni/jni/MediaCodecVideoDecoder_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/androidmediacodeccommon.h"
-#include "sdk/android/src/jni/videoframe.h"
+#include "sdk/android/src/jni/android_media_codec_common.h"
+#include "sdk/android/src/jni/video_frame.h"
 #include "third_party/libyuv/include/libyuv/convert.h"
 #include "third_party/libyuv/include/libyuv/planar_functions.h"
 #include "third_party/libyuv/include/libyuv/video_common.h"

sdk/android/src/jni/android_media_encoder.cc

@@ -21,8 +21,8 @@
 #include "common_video/h264/h264_common.h"
 #include "common_video/h264/profile_level_id.h"
 #include "media/base/codec.h"
-#include "media/base/mediaconstants.h"
-#include "media/engine/internalencoderfactory.h"
+#include "media/base/media_constants.h"
+#include "media/engine/internal_encoder_factory.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/utility/quality_scaler.h"
 #include "modules/video_coding/utility/vp8_header_parser.h"
@@ -33,14 +33,14 @@
 #include "rtc_base/sequenced_task_checker.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/weak_ptr.h"
 #include "sdk/android/generated_video_jni/jni/MediaCodecVideoEncoder_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/androidmediacodeccommon.h"
+#include "sdk/android/src/jni/android_media_codec_common.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/videocodecinfo.h"
-#include "sdk/android/src/jni/videoframe.h"
+#include "sdk/android/src/jni/video_codec_info.h"
+#include "sdk/android/src/jni/video_frame.h"
 #include "system_wrappers/include/field_trial.h"
 #include "third_party/libyuv/include/libyuv/convert.h"
 #include "third_party/libyuv/include/libyuv/convert_from.h"

sdk/android/src/jni/android_network_monitor.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/androidnetworkmonitor.h"
+#include "sdk/android/src/jni/android_network_monitor.h"
 
 #include <dlfcn.h>
 #ifndef RTLD_NOLOAD
@@ -18,7 +18,7 @@
 
 #include "rtc_base/bind.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/strings/string_builder.h"
 #include "sdk/android/generated_base_jni/jni/NetworkMonitorAutoDetect_jni.h"

sdk/android/src/jni/android_network_monitor.h

@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_H_
-#define SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_H_
+#ifndef SDK_ANDROID_SRC_JNI_ANDROID_NETWORK_MONITOR_H_
+#define SDK_ANDROID_SRC_JNI_ANDROID_NETWORK_MONITOR_H_
 
 #include <stdint.h>
 #include <map>
 #include <string>
 #include <vector>
 
-#include "rtc_base/networkmonitor.h"
+#include "rtc_base/network_monitor.h"
 #include "rtc_base/thread_checker.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
@@ -136,4 +136,4 @@ using webrtc::jni::AndroidNetworkMonitorFactory;
 
 }  // namespace webrtc_jni
 
-#endif  // SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_H_
+#endif  // SDK_ANDROID_SRC_JNI_ANDROID_NETWORK_MONITOR_H_

sdk/android/src/jni/android_network_monitor_jni.h

@@ -11,4 +11,4 @@
 // TODO(deadbeef): Remove this file when clients are updated to new include
 // path.
 
-#include "sdk/android/src/jni/pc/androidnetworkmonitor.h"
+#include "sdk/android/src/jni/pc/android_network_monitor.h"

sdk/android/src/jni/android_video_track_source.cc

@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/androidvideotracksource.h"
+#include "sdk/android/src/jni/android_video_track_source.h"
 
 #include <utility>
 
-#include "api/videosourceproxy.h"
+#include "api/video_track_source_proxy.h"
 #include "rtc_base/logging.h"
 
 namespace webrtc {

sdk/android/src/jni/android_video_track_source.h

@@ -15,12 +15,12 @@
 
 #include "common_video/include/i420_buffer_pool.h"
 #include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "media/base/adaptedvideotracksource.h"
-#include "rtc_base/asyncinvoker.h"
+#include "media/base/adapted_video_track_source.h"
+#include "rtc_base/async_invoker.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/thread_checker.h"
-#include "rtc_base/timestampaligner.h"
-#include "sdk/android/src/jni/videoframe.h"
+#include "rtc_base/timestamp_aligner.h"
+#include "sdk/android/src/jni/video_frame.h"
 
 namespace webrtc {
 namespace jni {

sdk/android/src/jni/audio_device/aaudio_player.h

@@ -17,7 +17,7 @@
 #include "absl/types/optional.h"
 #include "modules/audio_device/audio_device_buffer.h"
 #include "modules/audio_device/include/audio_device_defines.h"
-#include "rtc_base/messagehandler.h"
+#include "rtc_base/message_handler.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"

sdk/android/src/jni/audio_device/aaudio_recorder.cc

@@ -15,7 +15,7 @@
 #include "modules/audio_device/fine_audio_buffer.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 #include "system_wrappers/include/sleep.h"
 

sdk/android/src/jni/audio_device/aaudio_recorder.h

@@ -16,7 +16,7 @@
 
 #include "modules/audio_device/audio_device_buffer.h"
 #include "modules/audio_device/include/audio_device_defines.h"
-#include "rtc_base/messagehandler.h"
+#include "rtc_base/message_handler.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/thread_checker.h"
 #include "sdk/android/src/jni/audio_device/aaudio_wrapper.h"

sdk/android/src/jni/audio_device/aaudio_wrapper.cc

@@ -12,7 +12,7 @@
 
 #include "rtc_base/logging.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 #define LOG_ON_ERROR(op)                                                      \
   do {                                                                        \

sdk/android/src/jni/audio_device/audio_device_module.cc

@@ -16,7 +16,7 @@
 #include "modules/audio_device/audio_device_buffer.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/thread_checker.h"
 #include "sdk/android/generated_audio_device_module_base_jni/jni/WebRtcAudioManager_jni.h"
 #include "system_wrappers/include/metrics.h"

sdk/android/src/jni/audio_device/audio_record_jni.cc

@@ -18,7 +18,7 @@
 #include "rtc_base/format_macros.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/android/generated_java_audio_device_module_native_jni/jni/WebRtcAudioRecord_jni.h"
 #include "sdk/android/src/jni/audio_device/audio_common.h"
 #include "sdk/android/src/jni/jni_helpers.h"

sdk/android/src/jni/audio_device/opensles_player.cc

@@ -19,7 +19,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/format_macros.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/android/src/jni/audio_device/audio_common.h"
 
 #define TAG "OpenSLESPlayer"

sdk/android/src/jni/audio_device/opensles_recorder.cc

@@ -19,7 +19,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/format_macros.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/android/src/jni/audio_device/audio_common.h"
 
 #define TAG "OpenSLESRecorder"

sdk/android/src/jni/class_reference_holder.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_
-#define SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_
+#ifndef SDK_ANDROID_SRC_JNI_CLASS_REFERENCE_HOLDER_H_
+#define SDK_ANDROID_SRC_JNI_CLASS_REFERENCE_HOLDER_H_
 
 // TODO(magjed): Update external clients to call webrtc::jni::InitClassLoader
 // immediately instead.
@@ -38,4 +38,4 @@ using webrtc::jni::FreeGlobalClassReferenceHolder;
 
 }  // namespace webrtc_jni
 
-#endif  // SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_
+#endif  // SDK_ANDROID_SRC_JNI_CLASS_REFERENCE_HOLDER_H_

sdk/android/src/jni/encoded_image.cc

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/encodedimage.h"
+#include "sdk/android/src/jni/encoded_image.h"
 
 #include "api/video/encoded_image.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/android/generated_video_jni/jni/EncodedImage_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"

sdk/android/src/jni/encoded_image.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_ENCODEDIMAGE_H_
-#define SDK_ANDROID_SRC_JNI_ENCODEDIMAGE_H_
+#ifndef SDK_ANDROID_SRC_JNI_ENCODED_IMAGE_H_
+#define SDK_ANDROID_SRC_JNI_ENCODED_IMAGE_H_
 
 #include <jni.h>
 #include "common_types.h"  // NOLINT(build/include)
@@ -33,4 +33,4 @@ ScopedJavaLocalRef<jobjectArray> NativeToJavaFrameTypeArray(
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_ENCODEDIMAGE_H_
+#endif  // SDK_ANDROID_SRC_JNI_ENCODED_IMAGE_H_

sdk/android/src/jni/h264_utils.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/videocodecinfo.h"
+#include "sdk/android/src/jni/video_codec_info.h"
 
 #include "common_video/h264/profile_level_id.h"
 #include "sdk/android/generated_video_jni/jni/H264Utils_jni.h"

sdk/android/src/jni/jni_common.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
 #include "sdk/android/generated_base_jni/jni/JniCommon_jni.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 

sdk/android/src/jni/jni_generator_helper.cc

@@ -10,7 +10,7 @@
 
 #include "sdk/android/src/jni/jni_generator_helper.h"
 
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "sdk/android/native_api/jni/class_loader.h"
 
 namespace webrtc {

sdk/android/src/jni/jni_onload.cc

@@ -12,8 +12,8 @@
 #undef JNIEXPORT
 #define JNIEXPORT __attribute__((visibility("default")))
 
-#include "rtc_base/ssladapter.h"
-#include "sdk/android/src/jni/classreferenceholder.h"
+#include "rtc_base/ssl_adapter.h"
+#include "sdk/android/src/jni/class_reference_holder.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
 namespace webrtc {

sdk/android/src/jni/logging/log_sink.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 "sdk/android/src/jni/logging/logsink.h"
+#include "sdk/android/src/jni/logging/log_sink.h"
 
 #include "sdk/android/generated_logging_jni/jni/JNILogging_jni.h"
 

sdk/android/src/jni/logging/log_sink.h

@@ -7,8 +7,8 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#ifndef SDK_ANDROID_SRC_JNI_LOGGING_LOGSINK_H_
-#define SDK_ANDROID_SRC_JNI_LOGGING_LOGSINK_H_
+#ifndef SDK_ANDROID_SRC_JNI_LOGGING_LOG_SINK_H_
+#define SDK_ANDROID_SRC_JNI_LOGGING_LOG_SINK_H_
 
 #include <string>
 
@@ -36,4 +36,4 @@ class JNILogSink : public rtc::LogSink {
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_LOGGING_LOGSINK_H_
+#endif  // SDK_ANDROID_SRC_JNI_LOGGING_LOG_SINK_H_

sdk/android/src/jni/native_capturer_observer.cc

@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/nativecapturerobserver.h"
+#include "sdk/android/src/jni/native_capturer_observer.h"
 
-#include "api/videosourceproxy.h"
+#include "api/video_track_source_proxy.h"
 #include "rtc_base/logging.h"
 #include "sdk/android/generated_video_jni/jni/NativeCapturerObserver_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/androidvideotracksource.h"
+#include "sdk/android/src/jni/android_video_track_source.h"
 
 namespace webrtc {
 namespace jni {

sdk/android/src/jni/native_capturer_observer.h

@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_NATIVECAPTUREROBSERVER_H_
-#define SDK_ANDROID_SRC_JNI_NATIVECAPTUREROBSERVER_H_
+#ifndef SDK_ANDROID_SRC_JNI_NATIVE_CAPTURER_OBSERVER_H_
+#define SDK_ANDROID_SRC_JNI_NATIVE_CAPTURER_OBSERVER_H_
 
 #include <jni.h>
 
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
-#include "sdk/android/src/jni/androidvideotracksource.h"
+#include "sdk/android/src/jni/android_video_track_source.h"
 
 namespace webrtc {
 namespace jni {
@@ -26,4 +26,4 @@ ScopedJavaLocalRef<jobject> CreateJavaNativeCapturerObserver(
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_NATIVECAPTUREROBSERVER_H_
+#endif  // SDK_ANDROID_SRC_JNI_NATIVE_CAPTURER_OBSERVER_H_

sdk/android/src/jni/pc/android_network_monitor.h

@@ -9,4 +9,4 @@
  */
 
 // TODO(sakal): Remove this file once clients have update to the native API.
-#include "sdk/android/src/jni/androidnetworkmonitor.h"
+#include "sdk/android/src/jni/android_network_monitor.h"

sdk/android/src/jni/pc/audio_track.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"
 #include "sdk/android/generated_peerconnection_jni/jni/AudioTrack_jni.h"
 
 namespace webrtc {

sdk/android/src/jni/pc/call_session_file_rotating_log_sink.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/logsinks.h"
+#include "rtc_base/log_sinks.h"
 #include "sdk/android/generated_peerconnection_jni/jni/CallSessionFileRotatingLogSink_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"

sdk/android/src/jni/pc/crypto_options.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/cryptooptions.h"
+#include "sdk/android/src/jni/pc/crypto_options.h"
 
 #include "sdk/android/generated_peerconnection_jni/jni/CryptoOptions_jni.h"
 

sdk/android/src/jni/pc/crypto_options.h

@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_CRYPTOOPTIONS_H_
-#define SDK_ANDROID_SRC_JNI_PC_CRYPTOOPTIONS_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_CRYPTO_OPTIONS_H_
+#define SDK_ANDROID_SRC_JNI_PC_CRYPTO_OPTIONS_H_
 
 #include <jni.h>
 
 #include "absl/types/optional.h"
-#include "api/crypto/cryptooptions.h"
+#include "api/crypto/crypto_options.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 
 namespace webrtc {
@@ -27,4 +27,4 @@ absl::optional<CryptoOptions> JavaToNativeOptionalCryptoOptions(
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_CRYPTOOPTIONS_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_CRYPTO_OPTIONS_H_

sdk/android/src/jni/pc/data_channel.cc

@@ -13,12 +13,12 @@
 #include <limits>
 
 #include "absl/memory/memory.h"
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
 #include "rtc_base/logging.h"
 #include "sdk/android/generated_peerconnection_jni/jni/DataChannel_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/datachannel.h"
+#include "sdk/android/src/jni/pc/data_channel.h"
 
 namespace webrtc {
 namespace jni {

sdk/android/src/jni/pc/data_channel.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_DATACHANNEL_H_
-#define SDK_ANDROID_SRC_JNI_PC_DATACHANNEL_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_DATA_CHANNEL_H_
+#define SDK_ANDROID_SRC_JNI_PC_DATA_CHANNEL_H_
 
 namespace webrtc {
 namespace jni {
@@ -24,4 +24,4 @@ ScopedJavaLocalRef<jobject> WrapNativeDataChannel(
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_DATACHANNEL_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_DATA_CHANNEL_H_

sdk/android/src/jni/pc/dtmf_sender.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/dtmfsenderinterface.h"
+#include "api/dtmf_sender_interface.h"
 #include "sdk/android/generated_peerconnection_jni/jni/DtmfSender_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"

sdk/android/src/jni/pc/ice_candidate.cc

@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/icecandidate.h"
+#include "sdk/android/src/jni/pc/ice_candidate.h"
 
 #include <string>
 
-#include "pc/webrtcsdp.h"
+#include "pc/webrtc_sdp.h"
 #include "sdk/android/generated_peerconnection_jni/jni/IceCandidate_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/pc/mediastreamtrack.h"
+#include "sdk/android/src/jni/pc/media_stream_track.h"
 
 namespace webrtc {
 namespace jni {

sdk/android/src/jni/pc/ice_candidate.h

@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_ICECANDIDATE_H_
-#define SDK_ANDROID_SRC_JNI_PC_ICECANDIDATE_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_ICE_CANDIDATE_H_
+#define SDK_ANDROID_SRC_JNI_PC_ICE_CANDIDATE_H_
 
 #include <vector>
 
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
 #include "api/jsep.h"
-#include "api/jsepicecandidate.h"
-#include "api/peerconnectioninterface.h"
-#include "api/rtpparameters.h"
-#include "rtc_base/sslidentity.h"
+#include "api/jsep_ice_candidate.h"
+#include "api/peer_connection_interface.h"
+#include "api/rtp_parameters.h"
+#include "rtc_base/ssl_identity.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
 namespace webrtc {
@@ -82,4 +82,4 @@ absl::optional<rtc::AdapterType> JavaToNativeNetworkPreference(
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_ICECANDIDATE_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_ICE_CANDIDATE_H_

sdk/android/src/jni/pc/media.cc

@@ -11,11 +11,11 @@
 
 #include <utility>
 
-#include "api/call/callfactoryinterface.h"
+#include "api/call/call_factory_interface.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 "media/engine/webrtcmediaengine.h"
+#include "media/engine/webrtc_media_engine.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_processing/include/audio_processing.h"
 

sdk/android/src/jni/pc/media_constraints.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/mediaconstraints.h"
+#include "sdk/android/src/jni/pc/media_constraints.h"
 
 #include "absl/memory/memory.h"
 #include "sdk/android/generated_peerconnection_jni/jni/MediaConstraints_jni.h"

sdk/android/src/jni/pc/media_constraints.h

@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_H_
-#define SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIA_CONSTRAINTS_H_
+#define SDK_ANDROID_SRC_JNI_PC_MEDIA_CONSTRAINTS_H_
 
 #include <jni.h>
 #include <memory>
 
-#include "api/mediaconstraintsinterface.h"
+#include "api/media_constraints_interface.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 
 namespace webrtc {
@@ -27,4 +27,4 @@ std::unique_ptr<MediaConstraintsInterface> JavaToNativeMediaConstraints(
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_MEDIA_CONSTRAINTS_H_

sdk/android/src/jni/pc/media_source.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"
 #include "sdk/android/generated_peerconnection_jni/jni/MediaSource_jni.h"
 
 namespace webrtc {

sdk/android/src/jni/pc/media_stream.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/mediastream.h"
+#include "sdk/android/src/jni/pc/media_stream.h"
 
 #include "absl/memory/memory.h"
 #include "sdk/android/generated_peerconnection_jni/jni/MediaStream_jni.h"

sdk/android/src/jni/pc/media_stream.h

@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIASTREAM_H_
-#define SDK_ANDROID_SRC_JNI_PC_MEDIASTREAM_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_H_
+#define SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_H_
 
 #include <jni.h>
 #include <memory>
 
-#include "api/mediastreaminterface.h"
-#include "pc/mediastreamobserver.h"
+#include "api/media_stream_interface.h"
+#include "pc/media_stream_observer.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
 namespace webrtc {
@@ -51,4 +51,4 @@ jclass GetMediaStreamClass(JNIEnv* env);
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_MEDIASTREAM_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_H_

sdk/android/src/jni/pc/media_stream_track.cc

@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/mediastreamtrack.h"
+#include "sdk/android/src/jni/pc/media_stream_track.h"
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "sdk/android/generated_peerconnection_jni/jni/MediaStreamTrack_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"

sdk/android/src/jni/pc/media_stream_track.h

@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIASTREAMTRACK_H_
-#define SDK_ANDROID_SRC_JNI_PC_MEDIASTREAMTRACK_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_TRACK_H_
+#define SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_TRACK_H_
 
 #include <jni.h>
 
-#include "api/mediatypes.h"
+#include "api/media_types.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 
 namespace webrtc {
@@ -28,4 +28,4 @@ cricket::MediaType JavaToNativeMediaType(JNIEnv* jni,
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_MEDIASTREAMTRACK_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_TRACK_H_

sdk/android/src/jni/pc/owned_factory_and_threads.cc

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/ownedfactoryandthreads.h"
+#include "sdk/android/src/jni/pc/owned_factory_and_threads.h"
 
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/peerconnectionfactory.h"
+#include "sdk/android/src/jni/pc/peer_connection_factory.h"
 
 namespace webrtc {
 namespace jni {

sdk/android/src/jni/pc/owned_factory_and_threads.h

@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_
-#define SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_OWNED_FACTORY_AND_THREADS_H_
+#define SDK_ANDROID_SRC_JNI_PC_OWNED_FACTORY_AND_THREADS_H_
 
 #include <jni.h>
 #include <memory>
 #include <utility>
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {
@@ -60,4 +60,4 @@ class OwnedFactoryAndThreads {
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_OWNED_FACTORY_AND_THREADS_H_

sdk/android/src/jni/pc/peer_connection.cc

@@ -25,7 +25,7 @@
 // return to the Java frame that called code in this file, at which point it's
 // impossible to tell which JNI call broke).
 
-#include "sdk/android/src/jni/pc/peerconnection.h"
+#include "sdk/android/src/jni/pc/peer_connection.h"
 
 #include <limits>
 #include <memory>
@@ -33,28 +33,28 @@
 #include <utility>
 
 #include "absl/memory/memory.h"
-#include "api/mediaconstraintsinterface.h"
-#include "api/peerconnectioninterface.h"
-#include "api/rtpreceiverinterface.h"
-#include "api/rtpsenderinterface.h"
-#include "api/rtptransceiverinterface.h"
+#include "api/media_constraints_interface.h"
+#include "api/peer_connection_interface.h"
+#include "api/rtp_receiver_interface.h"
+#include "api/rtp_sender_interface.h"
+#include "api/rtp_transceiver_interface.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "sdk/android/generated_peerconnection_jni/jni/PeerConnection_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/cryptooptions.h"
-#include "sdk/android/src/jni/pc/datachannel.h"
-#include "sdk/android/src/jni/pc/icecandidate.h"
-#include "sdk/android/src/jni/pc/mediaconstraints.h"
-#include "sdk/android/src/jni/pc/mediastreamtrack.h"
-#include "sdk/android/src/jni/pc/rtccertificate.h"
-#include "sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h"
-#include "sdk/android/src/jni/pc/rtpsender.h"
-#include "sdk/android/src/jni/pc/sdpobserver.h"
-#include "sdk/android/src/jni/pc/sessiondescription.h"
-#include "sdk/android/src/jni/pc/statsobserver.h"
-#include "sdk/android/src/jni/pc/turncustomizer.h"
+#include "sdk/android/src/jni/pc/crypto_options.h"
+#include "sdk/android/src/jni/pc/data_channel.h"
+#include "sdk/android/src/jni/pc/ice_candidate.h"
+#include "sdk/android/src/jni/pc/media_constraints.h"
+#include "sdk/android/src/jni/pc/media_stream_track.h"
+#include "sdk/android/src/jni/pc/rtc_certificate.h"
+#include "sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.h"
+#include "sdk/android/src/jni/pc/rtp_sender.h"
+#include "sdk/android/src/jni/pc/sdp_observer.h"
+#include "sdk/android/src/jni/pc/session_description.h"
+#include "sdk/android/src/jni/pc/stats_observer.h"
+#include "sdk/android/src/jni/pc/turn_customizer.h"
 
 namespace webrtc {
 namespace jni {

sdk/android/src/jni/pc/peer_connection.h

@@ -8,20 +8,20 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_PEERCONNECTION_H_
-#define SDK_ANDROID_SRC_JNI_PC_PEERCONNECTION_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_PEER_CONNECTION_H_
+#define SDK_ANDROID_SRC_JNI_PC_PEER_CONNECTION_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
-#include "api/peerconnectioninterface.h"
-#include "pc/mediastreamobserver.h"
+#include "api/peer_connection_interface.h"
+#include "pc/media_stream_observer.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/mediaconstraints.h"
-#include "sdk/android/src/jni/pc/mediastream.h"
-#include "sdk/android/src/jni/pc/rtpreceiver.h"
-#include "sdk/android/src/jni/pc/rtptransceiver.h"
+#include "sdk/android/src/jni/pc/media_constraints.h"
+#include "sdk/android/src/jni/pc/media_stream.h"
+#include "sdk/android/src/jni/pc/rtp_receiver.h"
+#include "sdk/android/src/jni/pc/rtp_transceiver.h"
 
 namespace webrtc {
 namespace jni {
@@ -125,4 +125,4 @@ class OwnedPeerConnection {
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_PEERCONNECTION_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_PEER_CONNECTION_H_

sdk/android/src/jni/pc/peer_connection_factory.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/peerconnectionfactory.h"
+#include "sdk/android/src/jni/pc/peer_connection_factory.h"
 
 #include <memory>
 #include <utility>
@@ -16,7 +16,7 @@
 #include "absl/memory/memory.h"
 #include "api/video_codecs/video_decoder_factory.h"
 #include "api/video_codecs/video_encoder_factory.h"
-#include "media/base/mediaengine.h"
+#include "media/base/media_engine.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/utility/include/jvm_android.h"
 // We don't depend on the audio processing module implementation.
@@ -27,14 +27,14 @@
 #include "sdk/android/generated_peerconnection_jni/jni/PeerConnectionFactory_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/logging/logsink.h"
-#include "sdk/android/src/jni/pc/androidnetworkmonitor.h"
+#include "sdk/android/src/jni/logging/log_sink.h"
+#include "sdk/android/src/jni/pc/android_network_monitor.h"
 #include "sdk/android/src/jni/pc/audio.h"
-#include "sdk/android/src/jni/pc/icecandidate.h"
+#include "sdk/android/src/jni/pc/ice_candidate.h"
 #include "sdk/android/src/jni/pc/media.h"
-#include "sdk/android/src/jni/pc/ownedfactoryandthreads.h"
-#include "sdk/android/src/jni/pc/peerconnection.h"
-#include "sdk/android/src/jni/pc/sslcertificateverifierwrapper.h"
+#include "sdk/android/src/jni/pc/owned_factory_and_threads.h"
+#include "sdk/android/src/jni/pc/peer_connection.h"
+#include "sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h"
 #include "sdk/android/src/jni/pc/video.h"
 #include "system_wrappers/include/field_trial.h"
 

sdk/android/src/jni/pc/peer_connection_factory.h

@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONFACTORY_H_
-#define SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONFACTORY_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_PEER_CONNECTION_FACTORY_H_
+#define SDK_ANDROID_SRC_JNI_PC_PEER_CONNECTION_FACTORY_H_
 
 #include <jni.h>
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {
@@ -34,4 +34,4 @@ jobject NativeToJavaPeerConnectionFactory(
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONFACTORY_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_PEER_CONNECTION_FACTORY_H_

sdk/android/src/jni/pc/rtc_certificate.cc

@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/rtccertificate.h"
-#include "sdk/android/src/jni/pc/icecandidate.h"
+#include "sdk/android/src/jni/pc/rtc_certificate.h"
+#include "sdk/android/src/jni/pc/ice_candidate.h"
 
-#include "rtc_base/refcount.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/rtccertificategenerator.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/rtc_certificate_generator.h"
 #include "sdk/android/generated_peerconnection_jni/jni/RtcCertificatePem_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"

sdk/android/src/jni/pc/rtc_certificate.h

@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_RTCCERTIFICATE_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTCCERTIFICATE_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTC_CERTIFICATE_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTC_CERTIFICATE_H_
 
-#include "rtc_base/refcount.h"
-#include "rtc_base/rtccertificate.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/rtc_certificate.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
@@ -30,4 +30,4 @@ ScopedJavaLocalRef<jobject> NativeToJavaRTCCertificatePEM(
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_RTCCERTIFICATE_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_RTC_CERTIFICATE_H_

sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.cc

@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h"
+#include "sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.h"
 
 #include <string>
 #include <vector>
 
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 #include "sdk/android/generated_external_classes_jni/jni/BigInteger_jni.h"
 #include "sdk/android/generated_peerconnection_jni/jni/RTCStatsCollectorCallback_jni.h"
 #include "sdk/android/generated_peerconnection_jni/jni/RTCStatsReport_jni.h"

sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.h

@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTC_STATS_COLLECTOR_CALLBACK_WRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTC_STATS_COLLECTOR_CALLBACK_WRAPPER_H_
 
 #include <jni.h>
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
 namespace webrtc {
@@ -38,4 +38,4 @@ class RTCStatsCollectorCallbackWrapper : public RTCStatsCollectorCallback {
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_RTC_STATS_COLLECTOR_CALLBACK_WRAPPER_H_

sdk/android/src/jni/pc/rtp_parameters.cc

@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/rtpparameters.h"
+#include "sdk/android/src/jni/pc/rtp_parameters.h"
 
 #include "sdk/android/generated_peerconnection_jni/jni/RtpParameters_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/mediastreamtrack.h"
+#include "sdk/android/src/jni/pc/media_stream_track.h"
 
 namespace webrtc {
 namespace jni {

sdk/android/src/jni/pc/rtp_parameters.h

@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_RTPPARAMETERS_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTPPARAMETERS_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTP_PARAMETERS_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTP_PARAMETERS_H_
 
 #include <jni.h>
 
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 
 namespace webrtc {
@@ -32,4 +32,4 @@ ScopedJavaLocalRef<jobject> NativeToJavaRtpParameters(
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_RTPPARAMETERS_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_RTP_PARAMETERS_H_

sdk/android/src/jni/pc/rtp_receiver.cc

@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/rtpreceiver.h"
+#include "sdk/android/src/jni/pc/rtp_receiver.h"
 
 #include "sdk/android/generated_peerconnection_jni/jni/RtpReceiver_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/mediastreamtrack.h"
-#include "sdk/android/src/jni/pc/rtpparameters.h"
+#include "sdk/android/src/jni/pc/media_stream_track.h"
+#include "sdk/android/src/jni/pc/rtp_parameters.h"
 
 namespace webrtc {
 namespace jni {

sdk/android/src/jni/pc/rtp_receiver.h

@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_RTPRECEIVER_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTPRECEIVER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTP_RECEIVER_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTP_RECEIVER_H_
 
 #include <jni.h>
 
-#include "api/rtpreceiverinterface.h"
+#include "api/rtp_receiver_interface.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 
 namespace webrtc {
@@ -38,4 +38,4 @@ class JavaRtpReceiverGlobalOwner {
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_RTPRECEIVER_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_RTP_RECEIVER_H_

sdk/android/src/jni/pc/rtp_sender.cc

@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/rtpsender.h"
+#include "sdk/android/src/jni/pc/rtp_sender.h"
 
 #include "sdk/android/generated_peerconnection_jni/jni/RtpSender_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/rtpparameters.h"
+#include "sdk/android/src/jni/pc/rtp_parameters.h"
 
 namespace webrtc {
 namespace jni {

sdk/android/src/jni/pc/rtp_sender.h

@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_RTPSENDER_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTPSENDER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTP_SENDER_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTP_SENDER_H_
 
 #include <jni.h>
 
-#include "api/rtpsenderinterface.h"
+#include "api/rtp_sender_interface.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 
 namespace webrtc {
@@ -26,4 +26,4 @@ ScopedJavaLocalRef<jobject> NativeToJavaRtpSender(
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_RTPSENDER_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_RTP_SENDER_H_

sdk/android/src/jni/pc/rtp_transceiver.cc

@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/rtptransceiver.h"
+#include "sdk/android/src/jni/pc/rtp_transceiver.h"
 
 #include <string>
 
 #include "sdk/android/generated_peerconnection_jni/jni/RtpTransceiver_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/mediastreamtrack.h"
-#include "sdk/android/src/jni/pc/rtpparameters.h"
-#include "sdk/android/src/jni/pc/rtpreceiver.h"
-#include "sdk/android/src/jni/pc/rtpsender.h"
+#include "sdk/android/src/jni/pc/media_stream_track.h"
+#include "sdk/android/src/jni/pc/rtp_parameters.h"
+#include "sdk/android/src/jni/pc/rtp_receiver.h"
+#include "sdk/android/src/jni/pc/rtp_sender.h"
 
 namespace webrtc {
 namespace jni {

sdk/android/src/jni/pc/rtp_transceiver.h

@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_RTPTRANSCEIVER_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTPTRANSCEIVER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTP_TRANSCEIVER_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTP_TRANSCEIVER_H_
 
 #include <jni.h>
 
-#include "api/rtptransceiverinterface.h"
+#include "api/rtp_transceiver_interface.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 
 namespace webrtc {
@@ -43,4 +43,4 @@ class JavaRtpTransceiverGlobalOwner {
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_RTPTRANSCEIVER_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_RTP_TRANSCEIVER_H_

sdk/android/src/jni/pc/sdp_observer.cc

@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/sdpobserver.h"
+#include "sdk/android/src/jni/pc/sdp_observer.h"
 
 #include <utility>
 
-#include "api/mediaconstraintsinterface.h"
+#include "api/media_constraints_interface.h"
 #include "sdk/android/generated_peerconnection_jni/jni/SdpObserver_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"

sdk/android/src/jni/pc/sdp_observer.h

@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_H_
-#define SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_SDP_OBSERVER_H_
+#define SDK_ANDROID_SRC_JNI_PC_SDP_OBSERVER_H_
 
 #include <memory>
 #include <string>
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/sessiondescription.h"
+#include "sdk/android/src/jni/pc/session_description.h"
 
 namespace webrtc {
 namespace jni {
@@ -58,4 +58,4 @@ class SetSdpObserverJni : public SetSessionDescriptionObserver {
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_SDP_OBSERVER_H_

sdk/android/src/jni/pc/session_description.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/sessiondescription.h"
+#include "sdk/android/src/jni/pc/session_description.h"
 
 #include <string>
 

sdk/android/src/jni/pc/session_description.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_SESSIONDESCRIPTION_H_
-#define SDK_ANDROID_SRC_JNI_PC_SESSIONDESCRIPTION_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_SESSION_DESCRIPTION_H_
+#define SDK_ANDROID_SRC_JNI_PC_SESSION_DESCRIPTION_H_
 
 #include <jni.h>
 #include <memory>
@@ -31,4 +31,4 @@ ScopedJavaLocalRef<jobject> NativeToJavaSessionDescription(
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_SESSIONDESCRIPTION_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_SESSION_DESCRIPTION_H_

sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/sslcertificateverifierwrapper.h"
+#include "sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h"
 #include "sdk/android/generated_peerconnection_jni/jni/SSLCertificateVerifier_jni.h"
 #include "sdk/android/native_api/jni/class_loader.h"
 #include "sdk/android/native_api/jni/java_types.h"

sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h

@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_SSLCERTIFICATEVERIFIERWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_PC_SSLCERTIFICATEVERIFIERWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_SSL_CERTIFICATE_VERIFIER_WRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_PC_SSL_CERTIFICATE_VERIFIER_WRAPPER_H_
 
 #include <jni.h>
 #include <vector>
 
-#include "rtc_base/sslcertificate.h"
+#include "rtc_base/ssl_certificate.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
 namespace webrtc {
@@ -38,4 +38,4 @@ class SSLCertificateVerifierWrapper : public rtc::SSLCertificateVerifier {
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_SSLCERTIFICATEVERIFIERWRAPPER_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_SSL_CERTIFICATE_VERIFIER_WRAPPER_H_

sdk/android/src/jni/pc/stats_observer.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/statsobserver.h"
+#include "sdk/android/src/jni/pc/stats_observer.h"
 
 #include <vector>
 

sdk/android/src/jni/pc/stats_observer.h

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_H_
-#define SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_STATS_OBSERVER_H_
+#define SDK_ANDROID_SRC_JNI_PC_STATS_OBSERVER_H_
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
 namespace webrtc {
@@ -33,4 +33,4 @@ class StatsObserverJni : public StatsObserver {
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_STATS_OBSERVER_H_

sdk/android/src/jni/pc/turn_customizer.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/turncustomizer.h"
+#include "api/turn_customizer.h"
 #include "sdk/android/generated_peerconnection_jni/jni/TurnCustomizer_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"

sdk/android/src/jni/pc/turn_customizer.h

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_TURNCUSTOMIZER_H_
-#define SDK_ANDROID_SRC_JNI_PC_TURNCUSTOMIZER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_TURN_CUSTOMIZER_H_
+#define SDK_ANDROID_SRC_JNI_PC_TURN_CUSTOMIZER_H_
 
-#include "api/turncustomizer.h"
+#include "api/turn_customizer.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 
 namespace webrtc {
@@ -24,4 +24,4 @@ TurnCustomizer* GetNativeTurnCustomizer(
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_TURNCUSTOMIZER_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_TURN_CUSTOMIZER_H_

sdk/android/src/jni/pc/video.cc

@@ -15,12 +15,12 @@
 
 #include "api/video_codecs/video_decoder_factory.h"
 #include "api/video_codecs/video_encoder_factory.h"
-#include "api/videosourceproxy.h"
+#include "api/video_track_source_proxy.h"
 #include "rtc_base/logging.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/androidvideotracksource.h"
-#include "sdk/android/src/jni/videodecoderfactorywrapper.h"
-#include "sdk/android/src/jni/videoencoderfactorywrapper.h"
+#include "sdk/android/src/jni/android_video_track_source.h"
+#include "sdk/android/src/jni/video_decoder_factory_wrapper.h"
+#include "sdk/android/src/jni/video_encoder_factory_wrapper.h"
 
 namespace webrtc {
 namespace jni {

sdk/android/src/jni/timestamp_aligner.cc

@@ -10,8 +10,8 @@
 
 #include <jni.h>
 
-#include "rtc_base/timestampaligner.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
+#include "rtc_base/timestamp_aligner.h"
 #include "sdk/android/generated_video_jni/jni/TimestampAligner_jni.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 

sdk/android/src/jni/video_codec_info.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/videocodecinfo.h"
+#include "sdk/android/src/jni/video_codec_info.h"
 
 #include "sdk/android/generated_video_jni/jni/VideoCodecInfo_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"

sdk/android/src/jni/video_codec_info.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_VIDEOCODECINFO_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOCODECINFO_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_CODEC_INFO_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_CODEC_INFO_H_
 
 #include <jni.h>
 
@@ -28,4 +28,4 @@ ScopedJavaLocalRef<jobject> SdpVideoFormatToVideoCodecInfo(
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_VIDEOCODECINFO_H_
+#endif  // SDK_ANDROID_SRC_JNI_VIDEO_CODEC_INFO_H_

sdk/android/src/jni/video_codec_status.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/videocodecstatus.h"
+#include "sdk/android/src/jni/video_codec_status.h"
 
 #include "sdk/android/generated_video_jni/jni/VideoCodecStatus_jni.h"
 

sdk/android/src/jni/video_codec_status.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_VIDEOCODECSTATUS_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOCODECSTATUS_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_CODEC_STATUS_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_CODEC_STATUS_H_
 
 #include <jni.h>
 #include <stdint.h>
@@ -24,4 +24,4 @@ int32_t JavaToNativeVideoCodecStatus(
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_VIDEOCODECSTATUS_H_
+#endif  // SDK_ANDROID_SRC_JNI_VIDEO_CODEC_STATUS_H_

sdk/android/src/jni/video_decoder_factory_wrapper.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/videodecoderfactorywrapper.h"
+#include "sdk/android/src/jni/video_decoder_factory_wrapper.h"
 
 #include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_decoder.h"
@@ -16,8 +16,8 @@
 #include "rtc_base/logging.h"
 #include "sdk/android/generated_video_jni/jni/VideoDecoderFactory_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/videocodecinfo.h"
-#include "sdk/android/src/jni/videodecoderwrapper.h"
+#include "sdk/android/src/jni/video_codec_info.h"
+#include "sdk/android/src/jni/video_decoder_wrapper.h"
 
 namespace webrtc {
 namespace jni {

sdk/android/src/jni/video_decoder_factory_wrapper.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_DECODER_FACTORY_WRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_DECODER_FACTORY_WRAPPER_H_
 
 #include <jni.h>
 
@@ -38,4 +38,4 @@ class VideoDecoderFactoryWrapper : public VideoDecoderFactory {
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_
+#endif  // SDK_ANDROID_SRC_JNI_VIDEO_DECODER_FACTORY_WRAPPER_H_

sdk/android/src/jni/video_decoder_fallback.cc

@@ -13,7 +13,7 @@
 #include "api/video_codecs/video_decoder_software_fallback_wrapper.h"
 #include "sdk/android/generated_video_jni/jni/VideoDecoderFallback_jni.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/videodecoderwrapper.h"
+#include "sdk/android/src/jni/video_decoder_wrapper.h"
 
 namespace webrtc {
 namespace jni {

sdk/android/src/jni/video_decoder_wrapper.cc

@@ -8,20 +8,20 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/videodecoderwrapper.h"
+#include "sdk/android/src/jni/video_decoder_wrapper.h"
 
 #include "api/video/video_frame.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/utility/vp8_header_parser.h"
 #include "modules/video_coding/utility/vp9_uncompressed_header_parser.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/android/generated_video_jni/jni/VideoDecoderWrapper_jni.h"
 #include "sdk/android/generated_video_jni/jni/VideoDecoder_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/encodedimage.h"
-#include "sdk/android/src/jni/videocodecstatus.h"
-#include "sdk/android/src/jni/videoframe.h"
+#include "sdk/android/src/jni/encoded_image.h"
+#include "sdk/android/src/jni/video_codec_status.h"
+#include "sdk/android/src/jni/video_frame.h"
 
 namespace webrtc {
 namespace jni {

sdk/android/src/jni/video_decoder_wrapper.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_DECODER_WRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_DECODER_WRAPPER_H_
 
 #include <jni.h>
 #include <atomic>
@@ -120,4 +120,4 @@ std::unique_ptr<VideoDecoder> JavaToNativeVideoDecoder(
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
+#endif  // SDK_ANDROID_SRC_JNI_VIDEO_DECODER_WRAPPER_H_

sdk/android/src/jni/video_encoder_factory_wrapper.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/videoencoderfactorywrapper.h"
+#include "sdk/android/src/jni/video_encoder_factory_wrapper.h"
 
 #include "api/video_codecs/video_encoder.h"
 #include "common_types.h"  // NOLINT(build/include)
@@ -16,8 +16,8 @@
 #include "sdk/android/generated_video_jni/jni/VideoEncoderFactory_jni.h"
 #include "sdk/android/native_api/jni/class_loader.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/videocodecinfo.h"
-#include "sdk/android/src/jni/videoencoderwrapper.h"
+#include "sdk/android/src/jni/video_codec_info.h"
+#include "sdk/android/src/jni/video_encoder_wrapper.h"
 
 namespace webrtc {
 namespace jni {

sdk/android/src/jni/video_encoder_factory_wrapper.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_ENCODER_FACTORY_WRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_ENCODER_FACTORY_WRAPPER_H_
 
 #include <jni.h>
 #include <vector>
@@ -45,4 +45,4 @@ class VideoEncoderFactoryWrapper : public VideoEncoderFactory {
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_
+#endif  // SDK_ANDROID_SRC_JNI_VIDEO_ENCODER_FACTORY_WRAPPER_H_

sdk/android/src/jni/video_encoder_fallback.cc

@@ -13,7 +13,7 @@
 #include "api/video_codecs/video_encoder_software_fallback_wrapper.h"
 #include "sdk/android/generated_video_jni/jni/VideoEncoderFallback_jni.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/videoencoderwrapper.h"
+#include "sdk/android/src/jni/video_encoder_wrapper.h"
 
 namespace webrtc {
 namespace jni {

sdk/android/src/jni/video_encoder_wrapper.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/videoencoderwrapper.h"
+#include "sdk/android/src/jni/video_encoder_wrapper.h"
 
 #include <utility>
 
@@ -18,13 +18,13 @@
 #include "modules/video_coding/utility/vp8_header_parser.h"
 #include "modules/video_coding/utility/vp9_uncompressed_header_parser.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/android/generated_video_jni/jni/VideoEncoderWrapper_jni.h"
 #include "sdk/android/generated_video_jni/jni/VideoEncoder_jni.h"
 #include "sdk/android/native_api/jni/class_loader.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/encodedimage.h"
-#include "sdk/android/src/jni/videocodecstatus.h"
+#include "sdk/android/src/jni/encoded_image.h"
+#include "sdk/android/src/jni/video_codec_status.h"
 
 namespace webrtc {
 namespace jni {

sdk/android/src/jni/video_encoder_wrapper.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_ENCODER_WRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_ENCODER_WRAPPER_H_
 
 #include <jni.h>
 #include <deque>
@@ -21,7 +21,7 @@
 #include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
 #include "rtc_base/task_queue.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/videoframe.h"
+#include "sdk/android/src/jni/video_frame.h"
 
 namespace webrtc {
 namespace jni {
@@ -119,4 +119,4 @@ bool IsHardwareVideoEncoder(JNIEnv* jni, const JavaRef<jobject>& j_encoder);
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_
+#endif  // SDK_ANDROID_SRC_JNI_VIDEO_ENCODER_WRAPPER_H_

sdk/android/src/jni/video_frame.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/videoframe.h"
+#include "sdk/android/src/jni/video_frame.h"
 
 #include <memory>
 
@@ -18,7 +18,7 @@
 #include "rtc_base/keep_ref_until_done.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/android/generated_video_jni/jni/VideoFrame_jni.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 #include "sdk/android/src/jni/wrapped_native_i420_buffer.h"

sdk/android/src/jni/video_frame.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_VIDEOFRAME_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOFRAME_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_FRAME_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_FRAME_H_
 
 #include <jni.h>
 
@@ -84,4 +84,4 @@ int64_t GetJavaVideoFrameTimestampNs(JNIEnv* jni,
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_VIDEOFRAME_H_
+#endif  // SDK_ANDROID_SRC_JNI_VIDEO_FRAME_H_

sdk/android/src/jni/video_sink.cc

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/videosink.h"
+#include "sdk/android/src/jni/video_sink.h"
 
 #include "sdk/android/generated_video_jni/jni/VideoSink_jni.h"
-#include "sdk/android/src/jni/videoframe.h"
+#include "sdk/android/src/jni/video_frame.h"
 
 namespace webrtc {
 namespace jni {

sdk/android/src/jni/video_sink.h

@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_VIDEOSINK_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOSINK_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_SINK_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_SINK_H_
 
 #include <jni.h>
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
 namespace webrtc {
@@ -33,4 +33,4 @@ class VideoSinkWrapper : public rtc::VideoSinkInterface<VideoFrame> {
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_VIDEOSINK_H_
+#endif  // SDK_ANDROID_SRC_JNI_VIDEO_SINK_H_

sdk/android/src/jni/video_source.cc

@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/videosourceproxy.h"
+#include "api/video_track_source_proxy.h"
 #include "rtc_base/logging.h"
 #include "sdk/android/generated_video_jni/jni/VideoSource_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/androidvideotracksource.h"
+#include "sdk/android/src/jni/android_video_track_source.h"
 
 namespace webrtc {
 namespace jni {

sdk/android/src/jni/video_track.cc

@@ -10,10 +10,10 @@
 
 #include <jni.h>
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "sdk/android/generated_video_jni/jni/VideoTrack_jni.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/videosink.h"
+#include "sdk/android/src/jni/video_sink.h"
 
 namespace webrtc {
 namespace jni {