(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/examples/BUILD.gn b/examples/BUILD.gn
index ace85fe..5fd3041 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -492,8 +492,8 @@
"objcnativeapi/objc/NADAppDelegate.m",
"objcnativeapi/objc/NADViewController.h",
"objcnativeapi/objc/NADViewController.mm",
- "objcnativeapi/objc/objccallclient.h",
- "objcnativeapi/objc/objccallclient.mm",
+ "objcnativeapi/objc/objc_call_client.h",
+ "objcnativeapi/objc/objc_call_client.mm",
]
if (!build_with_chromium && is_clang) {
@@ -706,7 +706,7 @@
]
if (is_win) {
sources += [
- "peerconnection/client/flagdefs.h",
+ "peerconnection/client/flag_defs.h",
"peerconnection/client/main.cc",
"peerconnection/client/main_wnd.cc",
"peerconnection/client/main_wnd.h",
@@ -842,8 +842,8 @@
if (is_android) {
sources += [
- "unityplugin/classreferenceholder.cc",
- "unityplugin/classreferenceholder.h",
+ "unityplugin/class_reference_holder.cc",
+ "unityplugin/class_reference_holder.h",
"unityplugin/jni_onload.cc",
]
suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ]
diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn
index 6fdd36c..2d0438b 100644
--- a/examples/androidnativeapi/BUILD.gn
+++ b/examples/androidnativeapi/BUILD.gn
@@ -37,8 +37,8 @@
rtc_shared_library("examples_androidnativeapi_jni") {
testonly = true
sources = [
- "jni/androidcallclient.cc",
- "jni/androidcallclient.h",
+ "jni/android_call_client.cc",
+ "jni/android_call_client.h",
"jni/onload.cc",
]
diff --git a/examples/androidnativeapi/jni/android_call_client.cc b/examples/androidnativeapi/jni/android_call_client.cc
index e0dc8cc..119444b5 100644
--- a/examples/androidnativeapi/jni/android_call_client.cc
+++ b/examples/androidnativeapi/jni/android_call_client.cc
@@ -8,20 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "examples/androidnativeapi/jni/androidcallclient.h"
+#include "examples/androidnativeapi/jni/android_call_client.h"
#include <utility>
#include "absl/memory/memory.h"
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
#include "api/video/builtin_video_bitrate_allocator_factory.h"
#include "examples/androidnativeapi/generated_jni/jni/CallClient_jni.h"
#include "logging/rtc_event_log/rtc_event_log_factory.h"
-#include "media/engine/internaldecoderfactory.h"
-#include "media/engine/internalencoderfactory.h"
-#include "media/engine/webrtcmediaengine.h"
+#include "media/engine/internal_decoder_factory.h"
+#include "media/engine/internal_encoder_factory.h"
+#include "media/engine/webrtc_media_engine.h"
#include "modules/audio_processing/include/audio_processing.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/native_api/video/wrapper.h"
diff --git a/examples/androidnativeapi/jni/android_call_client.h b/examples/androidnativeapi/jni/android_call_client.h
index d456e9c..5ab61f4 100644
--- a/examples/androidnativeapi/jni/android_call_client.h
+++ b/examples/androidnativeapi/jni/android_call_client.h
@@ -8,20 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROIDCALLCLIENT_H_
-#define EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROIDCALLCLIENT_H_
+#ifndef EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROID_CALL_CLIENT_H_
+#define EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROID_CALL_CLIENT_H_
#include <jni.h>
#include <memory>
#include <string>
-#include "api/peerconnectioninterface.h"
-#include "rtc_base/criticalsection.h"
+#include "api/peer_connection_interface.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/thread_checker.h"
#include "sdk/android/native_api/jni/scoped_java_ref.h"
-#include "sdk/android/native_api/video/videosource.h"
+#include "sdk/android/native_api/video/video_source.h"
namespace webrtc_examples {
@@ -76,4 +76,4 @@
} // namespace webrtc_examples
-#endif // EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROIDCALLCLIENT_H_
+#endif // EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROID_CALL_CLIENT_H_
diff --git a/examples/androidnativeapi/jni/onload.cc b/examples/androidnativeapi/jni/onload.cc
index 4b4b5d9..6ea5275 100644
--- a/examples/androidnativeapi/jni/onload.cc
+++ b/examples/androidnativeapi/jni/onload.cc
@@ -11,7 +11,7 @@
#include <jni.h>
#include "modules/utility/include/jvm_android.h"
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/ssl_adapter.h"
#include "sdk/android/native_api/base/init.h"
namespace webrtc_examples {
diff --git a/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm b/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm
index 0fc0113..c58a731 100644
--- a/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm
+++ b/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm
@@ -13,7 +13,7 @@
#import <QuartzCore/CoreAnimation.h>
#import <XCTest/XCTest.h>
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/ssl_adapter.h"
#import <WebRTC/RTCMediaConstraints.h>
#import <WebRTC/RTCPeerConnectionFactory.h>
diff --git a/examples/objcnativeapi/objc/NADViewController.mm b/examples/objcnativeapi/objc/NADViewController.mm
index f905600..d96f649 100644
--- a/examples/objcnativeapi/objc/NADViewController.mm
+++ b/examples/objcnativeapi/objc/NADViewController.mm
@@ -20,7 +20,7 @@
#include <memory>
-#include "examples/objcnativeapi/objc/objccallclient.h"
+#include "examples/objcnativeapi/objc/objc_call_client.h"
@interface NADViewController ()
diff --git a/examples/objcnativeapi/objc/objc_call_client.h b/examples/objcnativeapi/objc/objc_call_client.h
index e48aae4..43a48c5 100644
--- a/examples/objcnativeapi/objc/objc_call_client.h
+++ b/examples/objcnativeapi/objc/objc_call_client.h
@@ -14,8 +14,8 @@
#include <memory>
#include <string>
-#include "api/peerconnectioninterface.h"
-#include "rtc_base/criticalsection.h"
+#include "api/peer_connection_interface.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/thread_checker.h"
diff --git a/examples/objcnativeapi/objc/objc_call_client.mm b/examples/objcnativeapi/objc/objc_call_client.mm
index 54015b2..a30f7f6 100644
--- a/examples/objcnativeapi/objc/objc_call_client.mm
+++ b/examples/objcnativeapi/objc/objc_call_client.mm
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "examples/objcnativeapi/objc/objccallclient.h"
+#include "examples/objcnativeapi/objc/objc_call_client.h"
#include <utility>
@@ -20,10 +20,10 @@
#include "absl/memory/memory.h"
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
#include "api/video/builtin_video_bitrate_allocator_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_processing/include/audio_processing.h"
#include "sdk/objc/native/api/video_capturer.h"
#include "sdk/objc/native/api/video_decoder_factory.h"
diff --git a/examples/peerconnection/client/conductor.cc b/examples/peerconnection/client/conductor.cc
index 096ff58..03f820a 100644
--- a/examples/peerconnection/client/conductor.cc
+++ b/examples/peerconnection/client/conductor.cc
@@ -25,7 +25,7 @@
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
#include "api/audio_options.h"
#include "api/create_peerconnection_factory.h"
-#include "api/rtpsenderinterface.h"
+#include "api/rtp_sender_interface.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
#include "api/video_codecs/video_decoder_factory.h"
@@ -36,12 +36,12 @@
#include "modules/audio_processing/include/audio_processing.h"
#include "modules/video_capture/video_capture.h"
#include "modules/video_capture/video_capture_factory.h"
-#include "p2p/base/portallocator.h"
-#include "pc/videotracksource.h"
+#include "p2p/base/port_allocator.h"
+#include "pc/video_track_source.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/rtccertificategenerator.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/rtc_certificate_generator.h"
#include "rtc_base/strings/json.h"
#include "test/vcm_capturer.h"
diff --git a/examples/peerconnection/client/conductor.h b/examples/peerconnection/client/conductor.h
index 76c1dbe..58286b0 100644
--- a/examples/peerconnection/client/conductor.h
+++ b/examples/peerconnection/client/conductor.h
@@ -17,8 +17,8 @@
#include <string>
#include <vector>
-#include "api/mediastreaminterface.h"
-#include "api/peerconnectioninterface.h"
+#include "api/media_stream_interface.h"
+#include "api/peer_connection_interface.h"
#include "examples/peerconnection/client/main_wnd.h"
#include "examples/peerconnection/client/peer_connection_client.h"
diff --git a/examples/peerconnection/client/flag_defs.h b/examples/peerconnection/client/flag_defs.h
index 51f9c9a..6834de6 100644
--- a/examples/peerconnection/client/flag_defs.h
+++ b/examples/peerconnection/client/flag_defs.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_
-#define EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_
+#ifndef EXAMPLES_PEERCONNECTION_CLIENT_FLAG_DEFS_H_
+#define EXAMPLES_PEERCONNECTION_CLIENT_FLAG_DEFS_H_
#include "rtc_base/flags.h"
@@ -44,4 +44,4 @@
"will assign the group Enabled to field trial WebRTC-FooFeature. Multiple "
"trials are separated by \"/\"");
-#endif // EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_
+#endif // EXAMPLES_PEERCONNECTION_CLIENT_FLAG_DEFS_H_
diff --git a/examples/peerconnection/client/linux/main.cc b/examples/peerconnection/client/linux/main.cc
index b3978cf..74fc17a 100644
--- a/examples/peerconnection/client/linux/main.cc
+++ b/examples/peerconnection/client/linux/main.cc
@@ -13,15 +13,15 @@
#include <stdio.h>
#include "examples/peerconnection/client/conductor.h"
-#include "examples/peerconnection/client/flagdefs.h"
+#include "examples/peerconnection/client/flag_defs.h"
#include "examples/peerconnection/client/linux/main_wnd.h"
#include "examples/peerconnection/client/peer_connection_client.h"
#include "rtc_base/flags.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/physicalsocketserver.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/physical_socket_server.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/ssl_adapter.h"
#include "rtc_base/thread.h"
#include "system_wrappers/include/field_trial.h"
#include "test/field_trial.h"
diff --git a/examples/peerconnection/client/linux/main_wnd.h b/examples/peerconnection/client/linux/main_wnd.h
index b94d034..a30ec27 100644
--- a/examples/peerconnection/client/linux/main_wnd.h
+++ b/examples/peerconnection/client/linux/main_wnd.h
@@ -15,7 +15,7 @@
#include <memory>
#include <string>
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "api/video/video_frame.h"
#include "api/video/video_sink_interface.h"
#include "examples/peerconnection/client/main_wnd.h"
diff --git a/examples/peerconnection/client/main.cc b/examples/peerconnection/client/main.cc
index f92e606..dc6b5d5 100644
--- a/examples/peerconnection/client/main.cc
+++ b/examples/peerconnection/client/main.cc
@@ -9,13 +9,13 @@
*/
#include "examples/peerconnection/client/conductor.h"
-#include "examples/peerconnection/client/flagdefs.h"
+#include "examples/peerconnection/client/flag_defs.h"
#include "examples/peerconnection/client/main_wnd.h"
#include "examples/peerconnection/client/peer_connection_client.h"
#include "rtc_base/checks.h"
-#include "rtc_base/ssladapter.h"
-#include "rtc_base/win32socketinit.h"
-#include "rtc_base/win32socketserver.h"
+#include "rtc_base/ssl_adapter.h"
+#include "rtc_base/win32_socket_init.h"
+#include "rtc_base/win32_socket_server.h"
#include "system_wrappers/include/field_trial.h"
#include "test/field_trial.h"
diff --git a/examples/peerconnection/client/main_wnd.h b/examples/peerconnection/client/main_wnd.h
index 5700258..898fea9 100644
--- a/examples/peerconnection/client/main_wnd.h
+++ b/examples/peerconnection/client/main_wnd.h
@@ -15,11 +15,11 @@
#include <memory>
#include <string>
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "api/video/video_frame.h"
#include "examples/peerconnection/client/peer_connection_client.h"
-#include "media/base/mediachannel.h"
-#include "media/base/videocommon.h"
+#include "media/base/media_channel.h"
+#include "media/base/video_common.h"
#if defined(WEBRTC_WIN)
#include "rtc_base/win32.h"
#endif // WEBRTC_WIN
diff --git a/examples/peerconnection/client/peer_connection_client.cc b/examples/peerconnection/client/peer_connection_client.cc
index f173e42..3203941 100644
--- a/examples/peerconnection/client/peer_connection_client.cc
+++ b/examples/peerconnection/client/peer_connection_client.cc
@@ -13,10 +13,10 @@
#include "examples/peerconnection/client/defaults.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/net_helpers.h"
#ifdef WIN32
-#include "rtc_base/win32socketserver.h"
+#include "rtc_base/win32_socket_server.h"
#endif
namespace {
diff --git a/examples/peerconnection/client/peer_connection_client.h b/examples/peerconnection/client/peer_connection_client.h
index 8dd28f7..56c235a 100644
--- a/examples/peerconnection/client/peer_connection_client.h
+++ b/examples/peerconnection/client/peer_connection_client.h
@@ -15,9 +15,9 @@
#include <memory>
#include <string>
-#include "rtc_base/nethelpers.h"
-#include "rtc_base/physicalsocketserver.h"
-#include "rtc_base/signalthread.h"
+#include "rtc_base/net_helpers.h"
+#include "rtc_base/physical_socket_server.h"
+#include "rtc_base/signal_thread.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
typedef std::map<int, std::string> Peers;
diff --git a/examples/peerconnection/server/peer_channel.cc b/examples/peerconnection/server/peer_channel.cc
index 7710d6a..91f5ff7 100644
--- a/examples/peerconnection/server/peer_channel.cc
+++ b/examples/peerconnection/server/peer_channel.cc
@@ -17,7 +17,7 @@
#include "examples/peerconnection/server/data_socket.h"
#include "examples/peerconnection/server/utils.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
// Set to the peer id of the originator when messages are being
// exchanged between peers, but set to the id of the receiving peer
diff --git a/examples/peerconnection/server/utils.cc b/examples/peerconnection/server/utils.cc
index dcd1ef7..5e61e60 100644
--- a/examples/peerconnection/server/utils.cc
+++ b/examples/peerconnection/server/utils.cc
@@ -12,7 +12,7 @@
#include <stdio.h>
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
using rtc::ToString;
diff --git a/examples/relayserver/relayserver_main.cc b/examples/relayserver/relayserver_main.cc
index 7d7d977..2045cb4 100644
--- a/examples/relayserver/relayserver_main.cc
+++ b/examples/relayserver/relayserver_main.cc
@@ -11,10 +11,10 @@
#include <iostream> // NOLINT
#include <memory>
-#include "p2p/base/relayserver.h"
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/socketserver.h"
+#include "p2p/base/relay_server.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/socket_server.h"
#include "rtc_base/thread.h"
int main(int argc, char** argv) {
diff --git a/examples/stunprober/main.cc b/examples/stunprober/main.cc
index d7ea30b..72f05014 100644
--- a/examples/stunprober/main.cc
+++ b/examples/stunprober/main.cc
@@ -14,16 +14,16 @@
#include <string>
#include <vector>
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/stunprober/stunprober.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/stunprober/stun_prober.h"
#include "rtc_base/flags.h"
#include "rtc_base/helpers.h"
#include "rtc_base/logging.h"
#include "rtc_base/network.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_adapter.h"
#include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
using stunprober::StunProber;
using stunprober::AsyncCallback;
diff --git a/examples/stunserver/stunserver_main.cc b/examples/stunserver/stunserver_main.cc
index 741ddec..8180069 100644
--- a/examples/stunserver/stunserver_main.cc
+++ b/examples/stunserver/stunserver_main.cc
@@ -9,10 +9,10 @@
*/
#include <iostream>
-#include "p2p/base/stunserver.h"
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/socketserver.h"
+#include "p2p/base/stun_server.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/socket_server.h"
#include "rtc_base/thread.h"
using cricket::StunServer;
diff --git a/examples/turnserver/read_auth_file.cc b/examples/turnserver/read_auth_file.cc
index 0ae40cb..3ad5c2b 100644
--- a/examples/turnserver/read_auth_file.cc
+++ b/examples/turnserver/read_auth_file.cc
@@ -12,7 +12,7 @@
#include <stddef.h>
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
namespace webrtc_examples {
diff --git a/examples/turnserver/turnserver_main.cc b/examples/turnserver/turnserver_main.cc
index 3e3ea9c..5e2a747 100644
--- a/examples/turnserver/turnserver_main.cc
+++ b/examples/turnserver/turnserver_main.cc
@@ -15,13 +15,13 @@
#include <utility>
#include "examples/turnserver/read_auth_file.h"
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/base/portinterface.h"
-#include "p2p/base/turnserver.h"
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/ipaddress.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/socketserver.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/port_interface.h"
+#include "p2p/base/turn_server.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/socket_server.h"
#include "rtc_base/thread.h"
namespace {
diff --git a/examples/unityplugin/class_reference_holder.cc b/examples/unityplugin/class_reference_holder.cc
index 0ad96c5..00ca772 100644
--- a/examples/unityplugin/class_reference_holder.cc
+++ b/examples/unityplugin/class_reference_holder.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 "examples/unityplugin/classreferenceholder.h"
+#include "examples/unityplugin/class_reference_holder.h"
#include <utility>
diff --git a/examples/unityplugin/class_reference_holder.h b/examples/unityplugin/class_reference_holder.h
index 31d6efc..2b0eba4 100644
--- a/examples/unityplugin/class_reference_holder.h
+++ b/examples/unityplugin/class_reference_holder.h
@@ -13,8 +13,8 @@
// specific java class into JNI c++ side, so that our c++ code can
// call those java functions.
-#ifndef EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_
-#define EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_
+#ifndef EXAMPLES_UNITYPLUGIN_CLASS_REFERENCE_HOLDER_H_
+#define EXAMPLES_UNITYPLUGIN_CLASS_REFERENCE_HOLDER_H_
#include <jni.h>
#include <map>
@@ -34,4 +34,4 @@
} // namespace unity_plugin
-#endif // EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_
+#endif // EXAMPLES_UNITYPLUGIN_CLASS_REFERENCE_HOLDER_H_
diff --git a/examples/unityplugin/jni_onload.cc b/examples/unityplugin/jni_onload.cc
index ebb5bfa..089e9a2 100644
--- a/examples/unityplugin/jni_onload.cc
+++ b/examples/unityplugin/jni_onload.cc
@@ -12,9 +12,9 @@
#undef JNIEXPORT
#define JNIEXPORT __attribute__((visibility("default")))
-#include "examples/unityplugin/classreferenceholder.h"
-#include "rtc_base/ssladapter.h"
-#include "sdk/android/src/jni/classreferenceholder.h"
+#include "examples/unityplugin/class_reference_holder.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 {
diff --git a/examples/unityplugin/simple_peer_connection.cc b/examples/unityplugin/simple_peer_connection.cc
index e1a2552..0b0a810 100644
--- a/examples/unityplugin/simple_peer_connection.cc
+++ b/examples/unityplugin/simple_peer_connection.cc
@@ -16,22 +16,22 @@
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
#include "api/create_peerconnection_factory.h"
-#include "api/videosourceproxy.h"
-#include "media/engine/internaldecoderfactory.h"
-#include "media/engine/internalencoderfactory.h"
-#include "media/engine/multiplexcodecfactory.h"
-#include "media/engine/webrtcvideodecoderfactory.h"
-#include "media/engine/webrtcvideoencoderfactory.h"
+#include "api/video_track_source_proxy.h"
+#include "media/engine/internal_decoder_factory.h"
+#include "media/engine/internal_encoder_factory.h"
+#include "media/engine/multiplex_codec_factory.h"
+#include "media/engine/webrtc_video_decoder_factory.h"
+#include "media/engine/webrtc_video_encoder_factory.h"
#include "modules/audio_device/include/audio_device.h"
#include "modules/audio_processing/include/audio_processing.h"
#include "modules/video_capture/video_capture_factory.h"
-#include "pc/videotracksource.h"
+#include "pc/video_track_source.h"
#include "test/vcm_capturer.h"
#if defined(WEBRTC_ANDROID)
-#include "examples/unityplugin/classreferenceholder.h"
+#include "examples/unityplugin/class_reference_holder.h"
#include "modules/utility/include/helpers_android.h"
-#include "sdk/android/src/jni/androidvideotracksource.h"
+#include "sdk/android/src/jni/android_video_track_source.h"
#include "sdk/android/src/jni/jni_helpers.h"
#endif
diff --git a/examples/unityplugin/simple_peer_connection.h b/examples/unityplugin/simple_peer_connection.h
index e4d8a1b..b99bde9 100644
--- a/examples/unityplugin/simple_peer_connection.h
+++ b/examples/unityplugin/simple_peer_connection.h
@@ -16,9 +16,9 @@
#include <string>
#include <vector>
-#include "api/datachannelinterface.h"
-#include "api/mediastreaminterface.h"
-#include "api/peerconnectioninterface.h"
+#include "api/data_channel_interface.h"
+#include "api/media_stream_interface.h"
+#include "api/peer_connection_interface.h"
#include "examples/unityplugin/unity_plugin_apis.h"
#include "examples/unityplugin/video_observer.h"
diff --git a/examples/unityplugin/video_observer.h b/examples/unityplugin/video_observer.h
index 84c03d3..01ccd21 100644
--- a/examples/unityplugin/video_observer.h
+++ b/examples/unityplugin/video_observer.h
@@ -13,7 +13,7 @@
#include <mutex>
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
#include "api/video/video_sink_interface.h"
#include "examples/unityplugin/unity_plugin_apis.h"
