(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/p2p/BUILD.gn b/p2p/BUILD.gn
index 6695458..acbb8fc 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -18,69 +18,69 @@
rtc_static_library("rtc_p2p") {
visibility = [ "*" ]
sources = [
- "base/asyncstuntcpsocket.cc",
- "base/asyncstuntcpsocket.h",
- "base/basicasyncresolverfactory.cc",
- "base/basicasyncresolverfactory.h",
- "base/basicpacketsocketfactory.cc",
- "base/basicpacketsocketfactory.h",
- "base/candidatepairinterface.h",
- "base/dtlstransport.cc",
- "base/dtlstransport.h",
- "base/dtlstransportinternal.cc",
- "base/dtlstransportinternal.h",
- "base/icecredentialsiterator.cc",
- "base/icecredentialsiterator.h",
- "base/icetransportinternal.cc",
- "base/icetransportinternal.h",
+ "base/async_stun_tcp_socket.cc",
+ "base/async_stun_tcp_socket.h",
+ "base/basic_async_resolver_factory.cc",
+ "base/basic_async_resolver_factory.h",
+ "base/basic_packet_socket_factory.cc",
+ "base/basic_packet_socket_factory.h",
+ "base/candidate_pair_interface.h",
+ "base/dtls_transport.cc",
+ "base/dtls_transport.h",
+ "base/dtls_transport_internal.cc",
+ "base/dtls_transport_internal.h",
+ "base/ice_credentials_iterator.cc",
+ "base/ice_credentials_iterator.h",
+ "base/ice_transport_internal.cc",
+ "base/ice_transport_internal.h",
"base/mdns_message.cc",
"base/mdns_message.h",
- "base/p2pconstants.cc",
- "base/p2pconstants.h",
- "base/p2ptransportchannel.cc",
- "base/p2ptransportchannel.h",
- "base/packetlossestimator.cc",
- "base/packetlossestimator.h",
- "base/packetsocketfactory.cc",
- "base/packetsocketfactory.h",
- "base/packettransportinterface.h",
- "base/packettransportinternal.cc",
- "base/packettransportinternal.h",
+ "base/p2p_constants.cc",
+ "base/p2p_constants.h",
+ "base/p2p_transport_channel.cc",
+ "base/p2p_transport_channel.h",
+ "base/packet_loss_estimator.cc",
+ "base/packet_loss_estimator.h",
+ "base/packet_socket_factory.cc",
+ "base/packet_socket_factory.h",
+ "base/packet_transport_interface.h",
+ "base/packet_transport_internal.cc",
+ "base/packet_transport_internal.h",
"base/port.cc",
"base/port.h",
- "base/portallocator.cc",
- "base/portallocator.h",
- "base/portinterface.cc",
- "base/portinterface.h",
- "base/pseudotcp.cc",
- "base/pseudotcp.h",
- "base/regatheringcontroller.cc",
- "base/regatheringcontroller.h",
- "base/relayport.cc",
- "base/relayport.h",
+ "base/port_allocator.cc",
+ "base/port_allocator.h",
+ "base/port_interface.cc",
+ "base/port_interface.h",
+ "base/pseudo_tcp.cc",
+ "base/pseudo_tcp.h",
+ "base/regathering_controller.cc",
+ "base/regathering_controller.h",
+ "base/relay_port.cc",
+ "base/relay_port.h",
"base/stun.cc",
"base/stun.h",
- "base/stunport.cc",
- "base/stunport.h",
- "base/stunrequest.cc",
- "base/stunrequest.h",
- "base/tcpport.cc",
- "base/tcpport.h",
+ "base/stun_port.cc",
+ "base/stun_port.h",
+ "base/stun_request.cc",
+ "base/stun_request.h",
+ "base/tcp_port.cc",
+ "base/tcp_port.h",
"base/transport.h",
- "base/transportdescription.cc",
- "base/transportdescription.h",
- "base/transportdescriptionfactory.cc",
- "base/transportdescriptionfactory.h",
- "base/transportfactoryinterface.h",
- "base/transportinfo.h",
- "base/turnport.cc",
- "base/turnport.h",
- "base/udpport.h",
- "client/basicportallocator.cc",
- "client/basicportallocator.h",
- "client/relayportfactoryinterface.h",
- "client/turnportfactory.cc",
- "client/turnportfactory.h",
+ "base/transport_description.cc",
+ "base/transport_description.h",
+ "base/transport_description_factory.cc",
+ "base/transport_description_factory.h",
+ "base/transport_factory_interface.h",
+ "base/transport_info.h",
+ "base/turn_port.cc",
+ "base/turn_port.h",
+ "base/udp_port.h",
+ "client/basic_port_allocator.cc",
+ "client/basic_port_allocator.h",
+ "client/relay_port_factory_interface.h",
+ "client/turn_port_factory.cc",
+ "client/turn_port_factory.h",
]
deps = [
@@ -115,18 +115,18 @@
rtc_source_set("p2p_test_utils") {
testonly = true
sources = [
- "base/fakecandidatepair.h",
- "base/fakedtlstransport.h",
- "base/fakeicetransport.h",
- "base/fakepackettransport.h",
- "base/fakeportallocator.h",
- "base/mockasyncresolver.h",
- "base/mockicetransport.h",
- "base/testrelayserver.h",
- "base/teststunserver.cc",
- "base/teststunserver.h",
- "base/testturncustomizer.h",
- "base/testturnserver.h",
+ "base/fake_candidate_pair.h",
+ "base/fake_dtls_transport.h",
+ "base/fake_ice_transport.h",
+ "base/fake_packet_transport.h",
+ "base/fake_port_allocator.h",
+ "base/mock_async_resolver.h",
+ "base/mock_ice_transport.h",
+ "base/test_relay_server.h",
+ "base/test_stun_server.cc",
+ "base/test_stun_server.h",
+ "base/test_turn_customizer.h",
+ "base/test_turn_server.h",
]
deps = [
":p2p_server_utils",
@@ -148,28 +148,28 @@
testonly = true
sources = [
- "base/asyncstuntcpsocket_unittest.cc",
- "base/basicasyncresolverfactory_unittest.cc",
- "base/dtlstransport_unittest.cc",
- "base/icecredentialsiterator_unittest.cc",
+ "base/async_stun_tcp_socket_unittest.cc",
+ "base/basic_async_resolver_factory_unittest.cc",
+ "base/dtls_transport_unittest.cc",
+ "base/ice_credentials_iterator_unittest.cc",
"base/mdns_message_unittest.cc",
- "base/p2ptransportchannel_unittest.cc",
- "base/packetlossestimator_unittest.cc",
+ "base/p2p_transport_channel_unittest.cc",
+ "base/packet_loss_estimator_unittest.cc",
+ "base/port_allocator_unittest.cc",
"base/port_unittest.cc",
- "base/portallocator_unittest.cc",
- "base/pseudotcp_unittest.cc",
- "base/regatheringcontroller_unittest.cc",
- "base/relayport_unittest.cc",
- "base/relayserver_unittest.cc",
+ "base/pseudo_tcp_unittest.cc",
+ "base/regathering_controller_unittest.cc",
+ "base/relay_port_unittest.cc",
+ "base/relay_server_unittest.cc",
+ "base/stun_port_unittest.cc",
+ "base/stun_request_unittest.cc",
+ "base/stun_server_unittest.cc",
"base/stun_unittest.cc",
- "base/stunport_unittest.cc",
- "base/stunrequest_unittest.cc",
- "base/stunserver_unittest.cc",
- "base/tcpport_unittest.cc",
- "base/transportdescriptionfactory_unittest.cc",
- "base/turnport_unittest.cc",
- "base/turnserver_unittest.cc",
- "client/basicportallocator_unittest.cc",
+ "base/tcp_port_unittest.cc",
+ "base/transport_description_factory_unittest.cc",
+ "base/turn_port_unittest.cc",
+ "base/turn_server_unittest.cc",
+ "client/basic_port_allocator_unittest.cc",
]
deps = [
":p2p_server_utils",
@@ -201,12 +201,12 @@
rtc_source_set("p2p_server_utils") {
testonly = true
sources = [
- "base/relayserver.cc",
- "base/relayserver.h",
- "base/stunserver.cc",
- "base/stunserver.h",
- "base/turnserver.cc",
- "base/turnserver.h",
+ "base/relay_server.cc",
+ "base/relay_server.h",
+ "base/stun_server.cc",
+ "base/stun_server.h",
+ "base/turn_server.cc",
+ "base/turn_server.h",
]
deps = [
":rtc_p2p",
@@ -221,8 +221,8 @@
rtc_static_library("libstunprober") {
visibility = [ "*" ]
sources = [
- "stunprober/stunprober.cc",
- "stunprober/stunprober.h",
+ "stunprober/stun_prober.cc",
+ "stunprober/stun_prober.h",
]
deps = [
@@ -239,7 +239,7 @@
testonly = true
sources = [
- "stunprober/stunprober_unittest.cc",
+ "stunprober/stun_prober_unittest.cc",
]
deps = [
":libstunprober",
diff --git a/p2p/base/async_stun_tcp_socket.cc b/p2p/base/async_stun_tcp_socket.cc
index e6f64ca..5ded8ae 100644
--- a/p2p/base/async_stun_tcp_socket.cc
+++ b/p2p/base/async_stun_tcp_socket.cc
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/asyncstuntcpsocket.h"
+#include "p2p/base/async_stun_tcp_socket.h"
#include <errno.h>
#include <stdint.h>
#include <string.h>
#include "p2p/base/stun.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
#include "rtc_base/checks.h"
#include "rtc_base/network/sent_packet.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace cricket {
diff --git a/p2p/base/async_stun_tcp_socket.h b/p2p/base/async_stun_tcp_socket.h
index 5540b93..0f190be 100644
--- a/p2p/base/async_stun_tcp_socket.h
+++ b/p2p/base/async_stun_tcp_socket.h
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_ASYNCSTUNTCPSOCKET_H_
-#define P2P_BASE_ASYNCSTUNTCPSOCKET_H_
+#ifndef P2P_BASE_ASYNC_STUN_TCP_SOCKET_H_
+#define P2P_BASE_ASYNC_STUN_TCP_SOCKET_H_
#include <stddef.h>
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/asynctcpsocket.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/async_tcp_socket.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/socket_address.h"
namespace cricket {
@@ -49,4 +49,4 @@
} // namespace cricket
-#endif // P2P_BASE_ASYNCSTUNTCPSOCKET_H_
+#endif // P2P_BASE_ASYNC_STUN_TCP_SOCKET_H_
diff --git a/p2p/base/async_stun_tcp_socket_unittest.cc b/p2p/base/async_stun_tcp_socket_unittest.cc
index 0203e48..70fddda 100644
--- a/p2p/base/async_stun_tcp_socket_unittest.cc
+++ b/p2p/base/async_stun_tcp_socket_unittest.cc
@@ -14,12 +14,12 @@
#include <memory>
#include <string>
-#include "p2p/base/asyncstuntcpsocket.h"
-#include "rtc_base/asyncsocket.h"
+#include "p2p/base/async_stun_tcp_socket.h"
+#include "rtc_base/async_socket.h"
#include "rtc_base/network/sent_packet.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
#include "test/gtest.h"
namespace cricket {
diff --git a/p2p/base/basic_async_resolver_factory.cc b/p2p/base/basic_async_resolver_factory.cc
index 22dac68..9d8266e 100644
--- a/p2p/base/basic_async_resolver_factory.cc
+++ b/p2p/base/basic_async_resolver_factory.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/basicasyncresolverfactory.h"
+#include "p2p/base/basic_async_resolver_factory.h"
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/net_helpers.h"
namespace webrtc {
diff --git a/p2p/base/basic_async_resolver_factory.h b/p2p/base/basic_async_resolver_factory.h
index 5bb8f55..c4661b4 100644
--- a/p2p/base/basic_async_resolver_factory.h
+++ b/p2p/base/basic_async_resolver_factory.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_BASICASYNCRESOLVERFACTORY_H_
-#define P2P_BASE_BASICASYNCRESOLVERFACTORY_H_
+#ifndef P2P_BASE_BASIC_ASYNC_RESOLVER_FACTORY_H_
+#define P2P_BASE_BASIC_ASYNC_RESOLVER_FACTORY_H_
-#include "api/asyncresolverfactory.h"
-#include "rtc_base/asyncresolverinterface.h"
+#include "api/async_resolver_factory.h"
+#include "rtc_base/async_resolver_interface.h"
namespace webrtc {
@@ -23,4 +23,4 @@
} // namespace webrtc
-#endif // P2P_BASE_BASICASYNCRESOLVERFACTORY_H_
+#endif // P2P_BASE_BASIC_ASYNC_RESOLVER_FACTORY_H_
diff --git a/p2p/base/basic_async_resolver_factory_unittest.cc b/p2p/base/basic_async_resolver_factory_unittest.cc
index cee37b5..020226f 100644
--- a/p2p/base/basic_async_resolver_factory_unittest.cc
+++ b/p2p/base/basic_async_resolver_factory_unittest.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/basicasyncresolverfactory.h"
+#include "p2p/base/basic_async_resolver_factory.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "test/gtest.h"
diff --git a/p2p/base/basic_packet_socket_factory.cc b/p2p/base/basic_packet_socket_factory.cc
index 8205442..2390e8a 100644
--- a/p2p/base/basic_packet_socket_factory.cc
+++ b/p2p/base/basic_packet_socket_factory.cc
@@ -8,21 +8,21 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/basicpacketsocketfactory.h"
+#include "p2p/base/basic_packet_socket_factory.h"
#include <stddef.h>
#include <string>
-#include "p2p/base/asyncstuntcpsocket.h"
-#include "rtc_base/asynctcpsocket.h"
-#include "rtc_base/asyncudpsocket.h"
+#include "p2p/base/async_stun_tcp_socket.h"
+#include "rtc_base/async_tcp_socket.h"
+#include "rtc_base/async_udp_socket.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/net_helpers.h"
#include "rtc_base/socket.h"
-#include "rtc_base/socketadapters.h"
-#include "rtc_base/socketserver.h"
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/socket_adapters.h"
+#include "rtc_base/socket_server.h"
+#include "rtc_base/ssl_adapter.h"
#include "rtc_base/thread.h"
namespace rtc {
diff --git a/p2p/base/basic_packet_socket_factory.h b/p2p/base/basic_packet_socket_factory.h
index 29f82db..266c638 100644
--- a/p2p/base/basic_packet_socket_factory.h
+++ b/p2p/base/basic_packet_socket_factory.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_BASICPACKETSOCKETFACTORY_H_
-#define P2P_BASE_BASICPACKETSOCKETFACTORY_H_
+#ifndef P2P_BASE_BASIC_PACKET_SOCKET_FACTORY_H_
+#define P2P_BASE_BASIC_PACKET_SOCKET_FACTORY_H_
#include <string>
-#include "p2p/base/packetsocketfactory.h"
+#include "p2p/base/packet_socket_factory.h"
namespace rtc {
@@ -63,4 +63,4 @@
} // namespace rtc
-#endif // P2P_BASE_BASICPACKETSOCKETFACTORY_H_
+#endif // P2P_BASE_BASIC_PACKET_SOCKET_FACTORY_H_
diff --git a/p2p/base/candidate_pair_interface.h b/p2p/base/candidate_pair_interface.h
index ff0bfcb..2b68fd7 100644
--- a/p2p/base/candidate_pair_interface.h
+++ b/p2p/base/candidate_pair_interface.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_CANDIDATEPAIRINTERFACE_H_
-#define P2P_BASE_CANDIDATEPAIRINTERFACE_H_
+#ifndef P2P_BASE_CANDIDATE_PAIR_INTERFACE_H_
+#define P2P_BASE_CANDIDATE_PAIR_INTERFACE_H_
namespace cricket {
@@ -25,4 +25,4 @@
} // namespace cricket
-#endif // P2P_BASE_CANDIDATEPAIRINTERFACE_H_
+#endif // P2P_BASE_CANDIDATE_PAIR_INTERFACE_H_
diff --git a/p2p/base/dtls_transport.cc b/p2p/base/dtls_transport.cc
index 75e0c1b..ba565ca 100644
--- a/p2p/base/dtls_transport.cc
+++ b/p2p/base/dtls_transport.cc
@@ -12,20 +12,20 @@
#include <memory>
#include <utility>
-#include "p2p/base/dtlstransport.h"
+#include "p2p/base/dtls_transport.h"
#include "absl/memory/memory.h"
#include "logging/rtc_event_log/events/rtc_event_dtls_transport_state.h"
#include "logging/rtc_event_log/events/rtc_event_dtls_writable_state.h"
#include "logging/rtc_event_log/rtc_event_log.h"
-#include "p2p/base/packettransportinternal.h"
+#include "p2p/base/packet_transport_internal.h"
#include "rtc_base/buffer.h"
#include "rtc_base/checks.h"
#include "rtc_base/dscp.h"
#include "rtc_base/logging.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/ssl_stream_adapter.h"
#include "rtc_base/stream.h"
#include "rtc_base/thread.h"
diff --git a/p2p/base/dtls_transport.h b/p2p/base/dtls_transport.h
index 6fb5d6c..ceef1dc 100644
--- a/p2p/base/dtls_transport.h
+++ b/p2p/base/dtls_transport.h
@@ -8,20 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_DTLSTRANSPORT_H_
-#define P2P_BASE_DTLSTRANSPORT_H_
+#ifndef P2P_BASE_DTLS_TRANSPORT_H_
+#define P2P_BASE_DTLS_TRANSPORT_H_
#include <memory>
#include <string>
#include <vector>
-#include "api/crypto/cryptooptions.h"
-#include "p2p/base/dtlstransportinternal.h"
-#include "p2p/base/icetransportinternal.h"
+#include "api/crypto/crypto_options.h"
+#include "p2p/base/dtls_transport_internal.h"
+#include "p2p/base/ice_transport_internal.h"
#include "rtc_base/buffer.h"
-#include "rtc_base/bufferqueue.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/buffer_queue.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ssl_stream_adapter.h"
#include "rtc_base/stream.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/thread_checker.h"
@@ -251,4 +251,4 @@
} // namespace cricket
-#endif // P2P_BASE_DTLSTRANSPORT_H_
+#endif // P2P_BASE_DTLS_TRANSPORT_H_
diff --git a/p2p/base/dtls_transport_internal.cc b/p2p/base/dtls_transport_internal.cc
index a294ccb..6997dbc 100644
--- a/p2p/base/dtls_transport_internal.cc
+++ b/p2p/base/dtls_transport_internal.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/dtlstransportinternal.h"
+#include "p2p/base/dtls_transport_internal.h"
namespace cricket {
diff --git a/p2p/base/dtls_transport_internal.h b/p2p/base/dtls_transport_internal.h
index 6aa4b38..3054169 100644
--- a/p2p/base/dtls_transport_internal.h
+++ b/p2p/base/dtls_transport_internal.h
@@ -8,22 +8,22 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_DTLSTRANSPORTINTERNAL_H_
-#define P2P_BASE_DTLSTRANSPORTINTERNAL_H_
+#ifndef P2P_BASE_DTLS_TRANSPORT_INTERNAL_H_
+#define P2P_BASE_DTLS_TRANSPORT_INTERNAL_H_
#include <stddef.h>
#include <stdint.h>
#include <memory>
#include <string>
-#include "api/crypto/cryptooptions.h"
-#include "p2p/base/icetransportinternal.h"
-#include "p2p/base/packettransportinternal.h"
-#include "rtc_base/constructormagic.h"
+#include "api/crypto/crypto_options.h"
+#include "p2p/base/ice_transport_internal.h"
+#include "p2p/base/packet_transport_internal.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslfingerprint.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_fingerprint.h"
+#include "rtc_base/ssl_stream_adapter.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
namespace cricket {
@@ -119,4 +119,4 @@
} // namespace cricket
-#endif // P2P_BASE_DTLSTRANSPORTINTERNAL_H_
+#endif // P2P_BASE_DTLS_TRANSPORT_INTERNAL_H_
diff --git a/p2p/base/dtls_transport_unittest.cc b/p2p/base/dtls_transport_unittest.cc
index dad4ddd..f1ee1e0 100644
--- a/p2p/base/dtls_transport_unittest.cc
+++ b/p2p/base/dtls_transport_unittest.cc
@@ -14,17 +14,17 @@
#include <utility>
#include "absl/memory/memory.h"
-#include "p2p/base/dtlstransport.h"
-#include "p2p/base/fakeicetransport.h"
-#include "p2p/base/packettransportinternal.h"
+#include "p2p/base/dtls_transport.h"
+#include "p2p/base/fake_ice_transport.h"
+#include "p2p/base/packet_transport_internal.h"
#include "rtc_base/checks.h"
#include "rtc_base/dscp.h"
#include "rtc_base/gunit.h"
#include "rtc_base/helpers.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/ssladapter.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/ssl_adapter.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/ssl_stream_adapter.h"
#define MAYBE_SKIP_TEST(feature) \
if (!(rtc::SSLStreamAdapter::feature())) { \
diff --git a/p2p/base/fake_candidate_pair.h b/p2p/base/fake_candidate_pair.h
index c49ac47..c31b69f 100644
--- a/p2p/base/fake_candidate_pair.h
+++ b/p2p/base/fake_candidate_pair.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_FAKECANDIDATEPAIR_H_
-#define P2P_BASE_FAKECANDIDATEPAIR_H_
+#ifndef P2P_BASE_FAKE_CANDIDATE_PAIR_H_
+#define P2P_BASE_FAKE_CANDIDATE_PAIR_H_
#include <memory>
#include "api/candidate.h"
-#include "p2p/base/candidatepairinterface.h"
+#include "p2p/base/candidate_pair_interface.h"
namespace cricket {
@@ -51,4 +51,4 @@
} // namespace cricket
-#endif // P2P_BASE_FAKECANDIDATEPAIR_H_
+#endif // P2P_BASE_FAKE_CANDIDATE_PAIR_H_
diff --git a/p2p/base/fake_dtls_transport.h b/p2p/base/fake_dtls_transport.h
index daef5c7..c362618 100644
--- a/p2p/base/fake_dtls_transport.h
+++ b/p2p/base/fake_dtls_transport.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_FAKEDTLSTRANSPORT_H_
-#define P2P_BASE_FAKEDTLSTRANSPORT_H_
+#ifndef P2P_BASE_FAKE_DTLS_TRANSPORT_H_
+#define P2P_BASE_FAKE_DTLS_TRANSPORT_H_
#include <memory>
#include <string>
@@ -17,11 +17,11 @@
#include <vector>
#include "absl/memory/memory.h"
-#include "api/crypto/cryptooptions.h"
-#include "p2p/base/dtlstransportinternal.h"
-#include "p2p/base/fakeicetransport.h"
-#include "rtc_base/fakesslidentity.h"
-#include "rtc_base/rtccertificate.h"
+#include "api/crypto/crypto_options.h"
+#include "p2p/base/dtls_transport_internal.h"
+#include "p2p/base/fake_ice_transport.h"
+#include "rtc_base/fake_ssl_identity.h"
+#include "rtc_base/rtc_certificate.h"
namespace cricket {
@@ -288,4 +288,4 @@
} // namespace cricket
-#endif // P2P_BASE_FAKEDTLSTRANSPORT_H_
+#endif // P2P_BASE_FAKE_DTLS_TRANSPORT_H_
diff --git a/p2p/base/fake_ice_transport.h b/p2p/base/fake_ice_transport.h
index c36dd7f..8bcd723 100644
--- a/p2p/base/fake_ice_transport.h
+++ b/p2p/base/fake_ice_transport.h
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_FAKEICETRANSPORT_H_
-#define P2P_BASE_FAKEICETRANSPORT_H_
+#ifndef P2P_BASE_FAKE_ICE_TRANSPORT_H_
+#define P2P_BASE_FAKE_ICE_TRANSPORT_H_
#include <map>
#include <string>
#include <utility>
#include "absl/types/optional.h"
-#include "p2p/base/icetransportinternal.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "p2p/base/ice_transport_internal.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/copy_on_write_buffer.h"
namespace cricket {
@@ -325,4 +325,4 @@
} // namespace cricket
-#endif // P2P_BASE_FAKEICETRANSPORT_H_
+#endif // P2P_BASE_FAKE_ICE_TRANSPORT_H_
diff --git a/p2p/base/fake_packet_transport.h b/p2p/base/fake_packet_transport.h
index 52b3921..6f79aad 100644
--- a/p2p/base/fake_packet_transport.h
+++ b/p2p/base/fake_packet_transport.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_FAKEPACKETTRANSPORT_H_
-#define P2P_BASE_FAKEPACKETTRANSPORT_H_
+#ifndef P2P_BASE_FAKE_PACKET_TRANSPORT_H_
+#define P2P_BASE_FAKE_PACKET_TRANSPORT_H_
#include <string>
-#include "api/ortc/packettransportinterface.h"
-#include "p2p/base/packettransportinternal.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "api/ortc/packet_transport_interface.h"
+#include "p2p/base/packet_transport_internal.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/copy_on_write_buffer.h"
namespace rtc {
@@ -137,4 +137,4 @@
} // namespace rtc
-#endif // P2P_BASE_FAKEPACKETTRANSPORT_H_
+#endif // P2P_BASE_FAKE_PACKET_TRANSPORT_H_
diff --git a/p2p/base/fake_port_allocator.h b/p2p/base/fake_port_allocator.h
index fc5f237..ab61c80 100644
--- a/p2p/base/fake_port_allocator.h
+++ b/p2p/base/fake_port_allocator.h
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_FAKEPORTALLOCATOR_H_
-#define P2P_BASE_FAKEPORTALLOCATOR_H_
+#ifndef P2P_BASE_FAKE_PORT_ALLOCATOR_H_
+#define P2P_BASE_FAKE_PORT_ALLOCATOR_H_
#include <memory>
#include <string>
#include <vector>
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/base/portallocator.h"
-#include "p2p/base/udpport.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/port_allocator.h"
+#include "p2p/base/udp_port.h"
#include "rtc_base/bind.h"
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/net_helpers.h"
#include "rtc_base/thread.h"
namespace rtc {
@@ -264,4 +264,4 @@
} // namespace cricket
-#endif // P2P_BASE_FAKEPORTALLOCATOR_H_
+#endif // P2P_BASE_FAKE_PORT_ALLOCATOR_H_
diff --git a/p2p/base/ice_credentials_iterator.cc b/p2p/base/ice_credentials_iterator.cc
index e51111f..373c851 100644
--- a/p2p/base/ice_credentials_iterator.cc
+++ b/p2p/base/ice_credentials_iterator.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/icecredentialsiterator.h"
+#include "p2p/base/ice_credentials_iterator.h"
-#include "p2p/base/p2pconstants.h"
+#include "p2p/base/p2p_constants.h"
#include "rtc_base/helpers.h"
namespace cricket {
diff --git a/p2p/base/ice_credentials_iterator.h b/p2p/base/ice_credentials_iterator.h
index 33e1d64..fa331cc 100644
--- a/p2p/base/ice_credentials_iterator.h
+++ b/p2p/base/ice_credentials_iterator.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_ICECREDENTIALSITERATOR_H_
-#define P2P_BASE_ICECREDENTIALSITERATOR_H_
+#ifndef P2P_BASE_ICE_CREDENTIALS_ITERATOR_H_
+#define P2P_BASE_ICE_CREDENTIALS_ITERATOR_H_
#include <vector>
-#include "p2p/base/transportdescription.h"
+#include "p2p/base/transport_description.h"
namespace cricket {
@@ -34,4 +34,4 @@
} // namespace cricket
-#endif // P2P_BASE_ICECREDENTIALSITERATOR_H_
+#endif // P2P_BASE_ICE_CREDENTIALS_ITERATOR_H_
diff --git a/p2p/base/ice_credentials_iterator_unittest.cc b/p2p/base/ice_credentials_iterator_unittest.cc
index b84925e..92b65f3 100644
--- a/p2p/base/ice_credentials_iterator_unittest.cc
+++ b/p2p/base/ice_credentials_iterator_unittest.cc
@@ -10,7 +10,7 @@
#include <vector>
-#include "p2p/base/icecredentialsiterator.h"
+#include "p2p/base/ice_credentials_iterator.h"
#include "test/gtest.h"
using cricket::IceParameters;
diff --git a/p2p/base/ice_transport_internal.cc b/p2p/base/ice_transport_internal.cc
index 62bfb56..1d5b6e7 100644
--- a/p2p/base/ice_transport_internal.cc
+++ b/p2p/base/ice_transport_internal.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/icetransportinternal.h"
+#include "p2p/base/ice_transport_internal.h"
-#include "p2p/base/p2pconstants.h"
+#include "p2p/base/p2p_constants.h"
namespace cricket {
diff --git a/p2p/base/ice_transport_internal.h b/p2p/base/ice_transport_internal.h
index acc7169..f3da45a 100644
--- a/p2p/base/ice_transport_internal.h
+++ b/p2p/base/ice_transport_internal.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_ICETRANSPORTINTERNAL_H_
-#define P2P_BASE_ICETRANSPORTINTERNAL_H_
+#ifndef P2P_BASE_ICE_TRANSPORT_INTERNAL_H_
+#define P2P_BASE_ICE_TRANSPORT_INTERNAL_H_
#include <stdint.h>
#include <string>
@@ -18,13 +18,13 @@
#include "absl/types/optional.h"
#include "api/candidate.h"
#include "api/transport/enums.h"
-#include "p2p/base/packettransportinternal.h"
+#include "p2p/base/packet_transport_internal.h"
#include "p2p/base/port.h"
-#include "p2p/base/transportdescription.h"
+#include "p2p/base/transport_description.h"
#include "rtc_base/network_constants.h"
#include "rtc_base/system/rtc_export.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace cricket {
@@ -287,4 +287,4 @@
} // namespace cricket
-#endif // P2P_BASE_ICETRANSPORTINTERNAL_H_
+#endif // P2P_BASE_ICE_TRANSPORT_INTERNAL_H_
diff --git a/p2p/base/mdns_message.cc b/p2p/base/mdns_message.cc
index f14a0d1..52ba70c 100644
--- a/p2p/base/mdns_message.cc
+++ b/p2p/base/mdns_message.cc
@@ -10,8 +10,8 @@
#include "p2p/base/mdns_message.h"
#include "rtc_base/logging.h"
-#include "rtc_base/nethelpers.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/net_helpers.h"
+#include "rtc_base/string_encode.h"
namespace webrtc {
diff --git a/p2p/base/mdns_message.h b/p2p/base/mdns_message.h
index a172444..303c6bb 100644
--- a/p2p/base/mdns_message.h
+++ b/p2p/base/mdns_message.h
@@ -25,8 +25,8 @@
#include <string>
#include <vector>
-#include "rtc_base/bytebuffer.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/byte_buffer.h"
+#include "rtc_base/ip_address.h"
#include "rtc_base/message_buffer_reader.h"
namespace webrtc {
diff --git a/p2p/base/mdns_message_unittest.cc b/p2p/base/mdns_message_unittest.cc
index 7f816f7..a742ccb 100644
--- a/p2p/base/mdns_message_unittest.cc
+++ b/p2p/base/mdns_message_unittest.cc
@@ -13,10 +13,10 @@
#include <string>
#include "p2p/base/mdns_message.h"
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/ipaddress.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/socket_address.h"
#include "test/gmock.h"
#define ReadMdnsMessage(X, Y) ReadMdnsMessageTestCase(X, Y, sizeof(Y))
diff --git a/p2p/base/mock_async_resolver.h b/p2p/base/mock_async_resolver.h
index 0ca6e8b..7d3be5b 100644
--- a/p2p/base/mock_async_resolver.h
+++ b/p2p/base/mock_async_resolver.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_MOCKASYNCRESOLVER_H_
-#define P2P_BASE_MOCKASYNCRESOLVER_H_
+#ifndef P2P_BASE_MOCK_ASYNC_RESOLVER_H_
+#define P2P_BASE_MOCK_ASYNC_RESOLVER_H_
-#include "api/asyncresolverfactory.h"
-#include "rtc_base/asyncresolverinterface.h"
+#include "api/async_resolver_factory.h"
+#include "rtc_base/async_resolver_interface.h"
#include "test/gmock.h"
namespace rtc {
@@ -50,4 +50,4 @@
} // namespace webrtc
-#endif // P2P_BASE_MOCKASYNCRESOLVER_H_
+#endif // P2P_BASE_MOCK_ASYNC_RESOLVER_H_
diff --git a/p2p/base/mock_ice_transport.h b/p2p/base/mock_ice_transport.h
index b18ce3d..e0ad1e2 100644
--- a/p2p/base/mock_ice_transport.h
+++ b/p2p/base/mock_ice_transport.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_MOCKICETRANSPORT_H_
-#define P2P_BASE_MOCKICETRANSPORT_H_
+#ifndef P2P_BASE_MOCK_ICE_TRANSPORT_H_
+#define P2P_BASE_MOCK_ICE_TRANSPORT_H_
#include <memory>
#include <string>
#include <vector>
-#include "p2p/base/icetransportinternal.h"
+#include "p2p/base/ice_transport_internal.h"
#include "rtc_base/gunit.h"
#include "test/gmock.h"
@@ -78,4 +78,4 @@
} // namespace cricket
-#endif // P2P_BASE_MOCKICETRANSPORT_H_
+#endif // P2P_BASE_MOCK_ICE_TRANSPORT_H_
diff --git a/p2p/base/p2p_constants.cc b/p2p/base/p2p_constants.cc
index 41d02dd..619b739 100644
--- a/p2p/base/p2p_constants.cc
+++ b/p2p/base/p2p_constants.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/p2pconstants.h"
+#include "p2p/base/p2p_constants.h"
namespace cricket {
diff --git a/p2p/base/p2p_constants.h b/p2p/base/p2p_constants.h
index a27e90b..bdd1ebe 100644
--- a/p2p/base/p2p_constants.h
+++ b/p2p/base/p2p_constants.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_P2PCONSTANTS_H_
-#define P2P_BASE_P2PCONSTANTS_H_
+#ifndef P2P_BASE_P2P_CONSTANTS_H_
+#define P2P_BASE_P2P_CONSTANTS_H_
#include <stddef.h>
#include <stdint.h>
@@ -108,4 +108,4 @@
} // namespace cricket
-#endif // P2P_BASE_P2PCONSTANTS_H_
+#endif // P2P_BASE_P2P_CONSTANTS_H_
diff --git a/p2p/base/p2p_transport_channel.cc b/p2p/base/p2p_transport_channel.cc
index 6506b53..f1c8d1a 100644
--- a/p2p/base/p2p_transport_channel.cc
+++ b/p2p/base/p2p_transport_channel.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/p2ptransportchannel.h"
+#include "p2p/base/p2p_transport_channel.h"
#include <algorithm>
#include <iterator>
@@ -16,16 +16,16 @@
#include <utility>
#include "api/candidate.h"
-#include "logging/rtc_event_log/icelogger.h"
-#include "p2p/base/candidatepairinterface.h"
+#include "logging/rtc_event_log/ice_logger.h"
+#include "p2p/base/candidate_pair_interface.h"
#include "p2p/base/port.h"
#include "rtc_base/checks.h"
#include "rtc_base/crc32.h"
#include "rtc_base/logging.h"
-#include "rtc_base/nethelper.h"
-#include "rtc_base/nethelpers.h"
-#include "rtc_base/stringencode.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/net_helper.h"
+#include "rtc_base/net_helpers.h"
+#include "rtc_base/string_encode.h"
+#include "rtc_base/time_utils.h"
#include "system_wrappers/include/field_trial.h"
#include "system_wrappers/include/metrics.h"
diff --git a/p2p/base/p2p_transport_channel.h b/p2p/base/p2p_transport_channel.h
index abedd0b..5e15f76 100644
--- a/p2p/base/p2p_transport_channel.h
+++ b/p2p/base/p2p_transport_channel.h
@@ -17,8 +17,8 @@
// When all of the available connections become invalid (non-writable), we
// kick off a process of determining more candidates and more connections.
//
-#ifndef P2P_BASE_P2PTRANSPORTCHANNEL_H_
-#define P2P_BASE_P2PTRANSPORTCHANNEL_H_
+#ifndef P2P_BASE_P2P_TRANSPORT_CHANNEL_H_
+#define P2P_BASE_P2P_TRANSPORT_CHANNEL_H_
#include <algorithm>
#include <map>
@@ -27,20 +27,20 @@
#include <string>
#include <vector>
-#include "api/asyncresolverfactory.h"
+#include "api/async_resolver_factory.h"
#include "api/candidate.h"
-#include "api/rtcerror.h"
+#include "api/rtc_error.h"
#include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h"
-#include "logging/rtc_event_log/icelogger.h"
-#include "p2p/base/candidatepairinterface.h"
-#include "p2p/base/icetransportinternal.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/portallocator.h"
-#include "p2p/base/portinterface.h"
-#include "p2p/base/regatheringcontroller.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/constructormagic.h"
+#include "logging/rtc_event_log/ice_logger.h"
+#include "p2p/base/candidate_pair_interface.h"
+#include "p2p/base/ice_transport_internal.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/port_allocator.h"
+#include "p2p/base/port_interface.h"
+#include "p2p/base/regathering_controller.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/system/rtc_export.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
@@ -452,4 +452,4 @@
} // namespace cricket
-#endif // P2P_BASE_P2PTRANSPORTCHANNEL_H_
+#endif // P2P_BASE_P2P_TRANSPORT_CHANNEL_H_
diff --git a/p2p/base/p2p_transport_channel_unittest.cc b/p2p/base/p2p_transport_channel_unittest.cc
index bd767cd..9beb075 100644
--- a/p2p/base/p2p_transport_channel_unittest.cc
+++ b/p2p/base/p2p_transport_channel_unittest.cc
@@ -13,30 +13,30 @@
#include <memory>
#include "absl/memory/memory.h"
-#include "p2p/base/fakeportallocator.h"
-#include "p2p/base/icetransportinternal.h"
-#include "p2p/base/mockasyncresolver.h"
-#include "p2p/base/p2ptransportchannel.h"
-#include "p2p/base/packettransportinternal.h"
-#include "p2p/base/testrelayserver.h"
-#include "p2p/base/teststunserver.h"
-#include "p2p/base/testturnserver.h"
-#include "p2p/client/basicportallocator.h"
+#include "p2p/base/fake_port_allocator.h"
+#include "p2p/base/ice_transport_internal.h"
+#include "p2p/base/mock_async_resolver.h"
+#include "p2p/base/p2p_transport_channel.h"
+#include "p2p/base/packet_transport_internal.h"
+#include "p2p/base/test_relay_server.h"
+#include "p2p/base/test_stun_server.h"
+#include "p2p/base/test_turn_server.h"
+#include "p2p/client/basic_port_allocator.h"
#include "rtc_base/checks.h"
#include "rtc_base/dscp.h"
-#include "rtc_base/fakeclock.h"
-#include "rtc_base/fakenetwork.h"
-#include "rtc_base/firewallsocketserver.h"
+#include "rtc_base/fake_clock.h"
+#include "rtc_base/fake_network.h"
+#include "rtc_base/firewall_socket_server.h"
#include "rtc_base/gunit.h"
#include "rtc_base/helpers.h"
#include "rtc_base/logging.h"
-#include "rtc_base/natserver.h"
-#include "rtc_base/natsocketfactory.h"
-#include "rtc_base/proxyserver.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/nat_server.h"
+#include "rtc_base/nat_socket_factory.h"
+#include "rtc_base/proxy_server.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_adapter.h"
#include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
#include "system_wrappers/include/metrics.h"
namespace {
diff --git a/p2p/base/packet_loss_estimator.cc b/p2p/base/packet_loss_estimator.cc
index be326f4..435fbb0 100644
--- a/p2p/base/packet_loss_estimator.cc
+++ b/p2p/base/packet_loss_estimator.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/packetlossestimator.h"
+#include "p2p/base/packet_loss_estimator.h"
#include "rtc_base/checks.h"
diff --git a/p2p/base/packet_loss_estimator.h b/p2p/base/packet_loss_estimator.h
index a97c8b2..09a46fd 100644
--- a/p2p/base/packet_loss_estimator.h
+++ b/p2p/base/packet_loss_estimator.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_PACKETLOSSESTIMATOR_H_
-#define P2P_BASE_PACKETLOSSESTIMATOR_H_
+#ifndef P2P_BASE_PACKET_LOSS_ESTIMATOR_H_
+#define P2P_BASE_PACKET_LOSS_ESTIMATOR_H_
#include <stddef.h>
#include <stdint.h>
@@ -82,4 +82,4 @@
} // namespace cricket
-#endif // P2P_BASE_PACKETLOSSESTIMATOR_H_
+#endif // P2P_BASE_PACKET_LOSS_ESTIMATOR_H_
diff --git a/p2p/base/packet_loss_estimator_unittest.cc b/p2p/base/packet_loss_estimator_unittest.cc
index ac17fc5..f45d52e 100644
--- a/p2p/base/packet_loss_estimator_unittest.cc
+++ b/p2p/base/packet_loss_estimator_unittest.cc
@@ -11,7 +11,7 @@
#include <cstdint>
#include <utility>
-#include "p2p/base/packetlossestimator.h"
+#include "p2p/base/packet_loss_estimator.h"
#include "test/gtest.h"
using cricket::PacketLossEstimator;
diff --git a/p2p/base/packet_socket_factory.cc b/p2p/base/packet_socket_factory.cc
index d2f4c96..2739dbc 100644
--- a/p2p/base/packet_socket_factory.cc
+++ b/p2p/base/packet_socket_factory.cc
@@ -10,7 +10,7 @@
#include <string>
-#include "p2p/base/packetsocketfactory.h"
+#include "p2p/base/packet_socket_factory.h"
namespace rtc {
diff --git a/p2p/base/packet_socket_factory.h b/p2p/base/packet_socket_factory.h
index c903df0..a430d2e 100644
--- a/p2p/base/packet_socket_factory.h
+++ b/p2p/base/packet_socket_factory.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_PACKETSOCKETFACTORY_H_
-#define P2P_BASE_PACKETSOCKETFACTORY_H_
+#ifndef P2P_BASE_PACKET_SOCKET_FACTORY_H_
+#define P2P_BASE_PACKET_SOCKET_FACTORY_H_
#include <string>
#include <vector>
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/proxyinfo.h"
-#include "rtc_base/sslcertificate.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/proxy_info.h"
+#include "rtc_base/ssl_certificate.h"
#include "rtc_base/system/rtc_export.h"
namespace rtc {
@@ -91,4 +91,4 @@
} // namespace rtc
-#endif // P2P_BASE_PACKETSOCKETFACTORY_H_
+#endif // P2P_BASE_PACKET_SOCKET_FACTORY_H_
diff --git a/p2p/base/packet_transport_interface.h b/p2p/base/packet_transport_interface.h
index aa65ee0..7076c30 100644
--- a/p2p/base/packet_transport_interface.h
+++ b/p2p/base/packet_transport_interface.h
@@ -12,13 +12,13 @@
// uses it.
// TODO(deadbeef): Update chromium and remove this file.
-#ifndef P2P_BASE_PACKETTRANSPORTINTERFACE_H_
-#define P2P_BASE_PACKETTRANSPORTINTERFACE_H_
+#ifndef P2P_BASE_PACKET_TRANSPORT_INTERFACE_H_
+#define P2P_BASE_PACKET_TRANSPORT_INTERFACE_H_
-#include "p2p/base/packettransportinternal.h"
+#include "p2p/base/packet_transport_internal.h"
namespace rtc {
typedef PacketTransportInternal PacketTransportInterface;
}
-#endif // P2P_BASE_PACKETTRANSPORTINTERFACE_H_
+#endif // P2P_BASE_PACKET_TRANSPORT_INTERFACE_H_
diff --git a/p2p/base/packet_transport_internal.cc b/p2p/base/packet_transport_internal.cc
index ba5f1e9..8fda899 100644
--- a/p2p/base/packet_transport_internal.cc
+++ b/p2p/base/packet_transport_internal.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/packettransportinternal.h"
+#include "p2p/base/packet_transport_internal.h"
namespace rtc {
diff --git a/p2p/base/packet_transport_internal.h b/p2p/base/packet_transport_internal.h
index 7d50f9c..24723e9 100644
--- a/p2p/base/packet_transport_internal.h
+++ b/p2p/base/packet_transport_internal.h
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_PACKETTRANSPORTINTERNAL_H_
-#define P2P_BASE_PACKETTRANSPORTINTERNAL_H_
+#ifndef P2P_BASE_PACKET_TRANSPORT_INTERNAL_H_
+#define P2P_BASE_PACKET_TRANSPORT_INTERNAL_H_
#include <string>
#include <vector>
#include "absl/types/optional.h"
// This is included for PacketOptions.
-#include "api/ortc/packettransportinterface.h"
+#include "api/ortc/packet_transport_interface.h"
#include "p2p/base/port.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/networkroute.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/network_route.h"
#include "rtc_base/socket.h"
#include "rtc_base/system/rtc_export.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
@@ -108,4 +108,4 @@
} // namespace rtc
-#endif // P2P_BASE_PACKETTRANSPORTINTERNAL_H_
+#endif // P2P_BASE_PACKET_TRANSPORT_INTERNAL_H_
diff --git a/p2p/base/port.cc b/p2p/base/port.cc
index 24aed8e..dd8c0ec 100644
--- a/p2p/base/port.cc
+++ b/p2p/base/port.cc
@@ -18,16 +18,16 @@
#include "absl/memory/memory.h"
#include "absl/strings/match.h"
-#include "p2p/base/portallocator.h"
+#include "p2p/base/port_allocator.h"
#include "rtc_base/checks.h"
#include "rtc_base/crc32.h"
#include "rtc_base/helpers.h"
#include "rtc_base/logging.h"
#include "rtc_base/mdns_responder_interface.h"
-#include "rtc_base/messagedigest.h"
+#include "rtc_base/message_digest.h"
#include "rtc_base/network.h"
#include "rtc_base/numerics/safe_minmax.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
#include "rtc_base/third_party/base64/base64.h"
namespace {
diff --git a/p2p/base/port.h b/p2p/base/port.h
index 5037377..cd8b737 100644
--- a/p2p/base/port.h
+++ b/p2p/base/port.h
@@ -19,24 +19,24 @@
#include "absl/types/optional.h"
#include "api/candidate.h"
-#include "api/rtcerror.h"
+#include "api/rtc_error.h"
#include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h"
#include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h"
-#include "logging/rtc_event_log/icelogger.h"
-#include "p2p/base/candidatepairinterface.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/packetlossestimator.h"
-#include "p2p/base/packetsocketfactory.h"
-#include "p2p/base/portinterface.h"
+#include "logging/rtc_event_log/ice_logger.h"
+#include "p2p/base/candidate_pair_interface.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/packet_loss_estimator.h"
+#include "p2p/base/packet_socket_factory.h"
+#include "p2p/base/port_interface.h"
#include "p2p/base/stun.h"
-#include "p2p/base/stunrequest.h"
-#include "rtc_base/asyncpacketsocket.h"
+#include "p2p/base/stun_request.h"
+#include "rtc_base/async_packet_socket.h"
#include "rtc_base/checks.h"
-#include "rtc_base/nethelper.h"
+#include "rtc_base/net_helper.h"
#include "rtc_base/network.h"
-#include "rtc_base/proxyinfo.h"
-#include "rtc_base/ratetracker.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/proxy_info.h"
+#include "rtc_base/rate_tracker.h"
+#include "rtc_base/socket_address.h"
#include "rtc_base/system/rtc_export.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
diff --git a/p2p/base/port_allocator.cc b/p2p/base/port_allocator.cc
index 3861946..c6ea6fd 100644
--- a/p2p/base/port_allocator.cc
+++ b/p2p/base/port_allocator.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/portallocator.h"
+#include "p2p/base/port_allocator.h"
#include <iterator>
#include <set>
#include <utility>
-#include "p2p/base/icecredentialsiterator.h"
+#include "p2p/base/ice_credentials_iterator.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
diff --git a/p2p/base/port_allocator.h b/p2p/base/port_allocator.h
index 7026f2b..33745ea 100644
--- a/p2p/base/port_allocator.h
+++ b/p2p/base/port_allocator.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_PORTALLOCATOR_H_
-#define P2P_BASE_PORTALLOCATOR_H_
+#ifndef P2P_BASE_PORT_ALLOCATOR_H_
+#define P2P_BASE_PORT_ALLOCATOR_H_
#include <deque>
#include <memory>
@@ -17,10 +17,10 @@
#include <vector>
#include "p2p/base/port.h"
-#include "p2p/base/portinterface.h"
+#include "p2p/base/port_interface.h"
#include "rtc_base/helpers.h"
-#include "rtc_base/proxyinfo.h"
-#include "rtc_base/sslcertificate.h"
+#include "rtc_base/proxy_info.h"
+#include "rtc_base/ssl_certificate.h"
#include "rtc_base/system/rtc_export.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
@@ -626,4 +626,4 @@
} // namespace cricket
-#endif // P2P_BASE_PORTALLOCATOR_H_
+#endif // P2P_BASE_PORT_ALLOCATOR_H_
diff --git a/p2p/base/port_allocator_unittest.cc b/p2p/base/port_allocator_unittest.cc
index 9c1d307..c828102 100644
--- a/p2p/base/port_allocator_unittest.cc
+++ b/p2p/base/port_allocator_unittest.cc
@@ -10,10 +10,10 @@
#include <memory>
-#include "p2p/base/fakeportallocator.h"
-#include "p2p/base/portallocator.h"
+#include "p2p/base/fake_port_allocator.h"
+#include "p2p/base/port_allocator.h"
#include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
#include "test/gtest.h"
static const char kContentName[] = "test content";
diff --git a/p2p/base/port_interface.cc b/p2p/base/port_interface.cc
index 73fe296..9175ca5 100644
--- a/p2p/base/port_interface.cc
+++ b/p2p/base/port_interface.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/portinterface.h"
+#include "p2p/base/port_interface.h"
namespace cricket {
diff --git a/p2p/base/port_interface.h b/p2p/base/port_interface.h
index 60fa444..24f2e2a 100644
--- a/p2p/base/port_interface.h
+++ b/p2p/base/port_interface.h
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_PORTINTERFACE_H_
-#define P2P_BASE_PORTINTERFACE_H_
+#ifndef P2P_BASE_PORT_INTERFACE_H_
+#define P2P_BASE_PORT_INTERFACE_H_
#include <string>
#include <vector>
#include "absl/types/optional.h"
#include "api/candidate.h"
-#include "p2p/base/transportdescription.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/socketaddress.h"
+#include "p2p/base/transport_description.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/socket_address.h"
namespace rtc {
class Network;
@@ -142,4 +142,4 @@
} // namespace cricket
-#endif // P2P_BASE_PORTINTERFACE_H_
+#endif // P2P_BASE_PORT_INTERFACE_H_
diff --git a/p2p/base/port_unittest.cc b/p2p/base/port_unittest.cc
index ba7de19..8857a97 100644
--- a/p2p/base/port_unittest.cc
+++ b/p2p/base/port_unittest.cc
@@ -20,50 +20,50 @@
#include "absl/types/optional.h"
#include "api/candidate.h"
#include "api/units/time_delta.h"
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/packetsocketfactory.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/packet_socket_factory.h"
#include "p2p/base/port.h"
-#include "p2p/base/portallocator.h"
-#include "p2p/base/portinterface.h"
-#include "p2p/base/relayport.h"
+#include "p2p/base/port_allocator.h"
+#include "p2p/base/port_interface.h"
+#include "p2p/base/relay_port.h"
#include "p2p/base/stun.h"
-#include "p2p/base/stunport.h"
-#include "p2p/base/stunserver.h"
-#include "p2p/base/tcpport.h"
-#include "p2p/base/testrelayserver.h"
-#include "p2p/base/teststunserver.h"
-#include "p2p/base/testturnserver.h"
-#include "p2p/base/transportdescription.h"
-#include "p2p/base/turnport.h"
-#include "p2p/base/turnserver.h"
-#include "p2p/client/relayportfactoryinterface.h"
+#include "p2p/base/stun_port.h"
+#include "p2p/base/stun_server.h"
+#include "p2p/base/tcp_port.h"
+#include "p2p/base/test_relay_server.h"
+#include "p2p/base/test_stun_server.h"
+#include "p2p/base/test_turn_server.h"
+#include "p2p/base/transport_description.h"
+#include "p2p/base/turn_port.h"
+#include "p2p/base/turn_server.h"
+#include "p2p/client/relay_port_factory_interface.h"
#include "rtc_base/arraysize.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/asyncsocket.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/async_socket.h"
#include "rtc_base/buffer.h"
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
#include "rtc_base/checks.h"
#include "rtc_base/dscp.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
#include "rtc_base/gunit.h"
#include "rtc_base/helpers.h"
#include "rtc_base/logging.h"
-#include "rtc_base/natserver.h"
-#include "rtc_base/natsocketfactory.h"
-#include "rtc_base/nattypes.h"
-#include "rtc_base/nethelper.h"
+#include "rtc_base/nat_server.h"
+#include "rtc_base/nat_socket_factory.h"
+#include "rtc_base/nat_types.h"
+#include "rtc_base/net_helper.h"
#include "rtc_base/network.h"
#include "rtc_base/network/sent_packet.h"
#include "rtc_base/network_constants.h"
-#include "rtc_base/proxyinfo.h"
+#include "rtc_base/proxy_info.h"
#include "rtc_base/socket.h"
-#include "rtc_base/socketadapters.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_adapters.h"
+#include "rtc_base/socket_address.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/time_utils.h"
+#include "rtc_base/virtual_socket_server.h"
#include "test/gtest.h"
using rtc::AsyncPacketSocket;
diff --git a/p2p/base/pseudo_tcp.cc b/p2p/base/pseudo_tcp.cc
index cac0a92..44c59c5 100644
--- a/p2p/base/pseudo_tcp.cc
+++ b/p2p/base/pseudo_tcp.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/pseudotcp.h"
+#include "p2p/base/pseudo_tcp.h"
#include <errno.h>
#include <stdio.h>
@@ -17,13 +17,13 @@
#include <memory>
#include <set>
-#include "rtc_base/bytebuffer.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_buffer.h"
+#include "rtc_base/byte_order.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_minmax.h"
#include "rtc_base/socket.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
// The following logging is for detailed (packet-level) analysis only.
#define _DBG_NONE 0
diff --git a/p2p/base/pseudo_tcp.h b/p2p/base/pseudo_tcp.h
index 2522bdc..4849c2a 100644
--- a/p2p/base/pseudo_tcp.h
+++ b/p2p/base/pseudo_tcp.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_PSEUDOTCP_H_
-#define P2P_BASE_PSEUDOTCP_H_
+#ifndef P2P_BASE_PSEUDO_TCP_H_
+#define P2P_BASE_PSEUDO_TCP_H_
#include <stddef.h>
#include <stdint.h>
@@ -246,4 +246,4 @@
} // namespace cricket
-#endif // P2P_BASE_PSEUDOTCP_H_
+#endif // P2P_BASE_PSEUDO_TCP_H_
diff --git a/p2p/base/pseudo_tcp_unittest.cc b/p2p/base/pseudo_tcp_unittest.cc
index 104d31c..b542911 100644
--- a/p2p/base/pseudo_tcp_unittest.cc
+++ b/p2p/base/pseudo_tcp_unittest.cc
@@ -14,16 +14,16 @@
#include <string>
#include <vector>
-#include "p2p/base/pseudotcp.h"
+#include "p2p/base/pseudo_tcp.h"
#include "rtc_base/gunit.h"
#include "rtc_base/helpers.h"
#include "rtc_base/location.h"
#include "rtc_base/logging.h"
#include "rtc_base/memory_stream.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
#include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "test/gtest.h"
using cricket::PseudoTcp;
diff --git a/p2p/base/regathering_controller.cc b/p2p/base/regathering_controller.cc
index 6d4c4fd..a4d21eb 100644
--- a/p2p/base/regathering_controller.cc
+++ b/p2p/base/regathering_controller.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/regatheringcontroller.h"
+#include "p2p/base/regathering_controller.h"
namespace webrtc {
diff --git a/p2p/base/regathering_controller.h b/p2p/base/regathering_controller.h
index 891ec85..234aea3 100644
--- a/p2p/base/regathering_controller.h
+++ b/p2p/base/regathering_controller.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_REGATHERINGCONTROLLER_H_
-#define P2P_BASE_REGATHERINGCONTROLLER_H_
+#ifndef P2P_BASE_REGATHERING_CONTROLLER_H_
+#define P2P_BASE_REGATHERING_CONTROLLER_H_
-#include "p2p/base/icetransportinternal.h"
-#include "p2p/base/portallocator.h"
-#include "rtc_base/asyncinvoker.h"
+#include "p2p/base/ice_transport_internal.h"
+#include "p2p/base/port_allocator.h"
+#include "rtc_base/async_invoker.h"
#include "rtc_base/random.h"
#include "rtc_base/thread.h"
@@ -121,4 +121,4 @@
} // namespace webrtc
-#endif // P2P_BASE_REGATHERINGCONTROLLER_H_
+#endif // P2P_BASE_REGATHERING_CONTROLLER_H_
diff --git a/p2p/base/regathering_controller_unittest.cc b/p2p/base/regathering_controller_unittest.cc
index 6ae64e8..c90beb6 100644
--- a/p2p/base/regathering_controller_unittest.cc
+++ b/p2p/base/regathering_controller_unittest.cc
@@ -13,18 +13,18 @@
#include <string>
#include <vector>
-#include "p2p/base/fakeportallocator.h"
-#include "p2p/base/mockicetransport.h"
-#include "p2p/base/p2pconstants.h"
+#include "p2p/base/fake_port_allocator.h"
+#include "p2p/base/mock_ice_transport.h"
+#include "p2p/base/p2p_constants.h"
#include "p2p/base/port.h"
-#include "p2p/base/regatheringcontroller.h"
-#include "p2p/base/stunserver.h"
+#include "p2p/base/regathering_controller.h"
+#include "p2p/base/stun_server.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
#include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
namespace {
diff --git a/p2p/base/relay_port.cc b/p2p/base/relay_port.cc
index 211484e..ebaefa7 100644
--- a/p2p/base/relay_port.cc
+++ b/p2p/base/relay_port.cc
@@ -11,20 +11,20 @@
#include <string.h>
#include <algorithm>
-#include "p2p/base/relayport.h"
+#include "p2p/base/relay_port.h"
#include "p2p/base/stun.h"
-#include "p2p/base/stunrequest.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/bytebuffer.h"
+#include "p2p/base/stun_request.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/byte_buffer.h"
#include "rtc_base/checks.h"
#include "rtc_base/dscp.h"
#include "rtc_base/location.h"
#include "rtc_base/logging.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/nethelper.h"
-#include "rtc_base/proxyinfo.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/net_helper.h"
+#include "rtc_base/proxy_info.h"
+#include "rtc_base/time_utils.h"
namespace cricket {
diff --git a/p2p/base/relay_port.h b/p2p/base/relay_port.h
index 5989f76..f9121ad 100644
--- a/p2p/base/relay_port.h
+++ b/p2p/base/relay_port.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_RELAYPORT_H_
-#define P2P_BASE_RELAYPORT_H_
+#ifndef P2P_BASE_RELAY_PORT_H_
+#define P2P_BASE_RELAY_PORT_H_
#include <deque>
#include <memory>
@@ -19,7 +19,7 @@
#include "absl/memory/memory.h"
#include "p2p/base/port.h"
-#include "p2p/base/stunrequest.h"
+#include "p2p/base/stun_request.h"
namespace cricket {
@@ -115,4 +115,4 @@
} // namespace cricket
-#endif // P2P_BASE_RELAYPORT_H_
+#endif // P2P_BASE_RELAY_PORT_H_
diff --git a/p2p/base/relay_port_unittest.cc b/p2p/base/relay_port_unittest.cc
index 1ca69f4..5f410e6 100644
--- a/p2p/base/relay_port_unittest.cc
+++ b/p2p/base/relay_port_unittest.cc
@@ -11,17 +11,17 @@
#include <map>
#include <memory>
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/base/relayport.h"
-#include "p2p/base/relayserver.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/relay_port.h"
+#include "p2p/base/relay_server.h"
#include "rtc_base/gunit.h"
#include "rtc_base/helpers.h"
#include "rtc_base/logging.h"
-#include "rtc_base/socketadapters.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/socket_adapters.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_adapter.h"
#include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
using rtc::SocketAddress;
diff --git a/p2p/base/relay_server.cc b/p2p/base/relay_server.cc
index 0f712a9..80b51b2 100644
--- a/p2p/base/relay_server.cc
+++ b/p2p/base/relay_server.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/relayserver.h"
+#include "p2p/base/relay_server.h"
#ifdef WEBRTC_POSIX
#include <errno.h>
@@ -17,7 +17,7 @@
#include <algorithm>
#include <utility>
-#include "rtc_base/asynctcpsocket.h"
+#include "rtc_base/async_tcp_socket.h"
#include "rtc_base/checks.h"
#include "rtc_base/helpers.h"
#include "rtc_base/logging.h"
diff --git a/p2p/base/relay_server.h b/p2p/base/relay_server.h
index 5ba5e06..3b9e9be 100644
--- a/p2p/base/relay_server.h
+++ b/p2p/base/relay_server.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_RELAYSERVER_H_
-#define P2P_BASE_RELAYSERVER_H_
+#ifndef P2P_BASE_RELAY_SERVER_H_
+#define P2P_BASE_RELAY_SERVER_H_
#include <map>
#include <string>
@@ -17,11 +17,11 @@
#include "p2p/base/port.h"
#include "p2p/base/stun.h"
-#include "rtc_base/asyncudpsocket.h"
+#include "rtc_base/async_udp_socket.h"
#include "rtc_base/random.h"
-#include "rtc_base/socketaddresspair.h"
+#include "rtc_base/socket_address_pair.h"
#include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace cricket {
@@ -232,4 +232,4 @@
} // namespace cricket
-#endif // P2P_BASE_RELAYSERVER_H_
+#endif // P2P_BASE_RELAY_SERVER_H_
diff --git a/p2p/base/relay_server_unittest.cc b/p2p/base/relay_server_unittest.cc
index 5399cf1..a64cf4f 100644
--- a/p2p/base/relay_server_unittest.cc
+++ b/p2p/base/relay_server_unittest.cc
@@ -14,14 +14,14 @@
#include <utility>
#include "absl/memory/memory.h"
-#include "p2p/base/relayserver.h"
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/bytebuffer.h"
+#include "p2p/base/relay_server.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/byte_buffer.h"
#include "rtc_base/helpers.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/testclient.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/test_client.h"
#include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
#include "test/gtest.h"
using rtc::SocketAddress;
diff --git a/p2p/base/stun.cc b/p2p/base/stun.cc
index dd0fa62..66b5312 100644
--- a/p2p/base/stun.cc
+++ b/p2p/base/stun.cc
@@ -17,11 +17,11 @@
#include <utility>
#include "absl/memory/memory.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
#include "rtc_base/checks.h"
#include "rtc_base/crc32.h"
#include "rtc_base/logging.h"
-#include "rtc_base/messagedigest.h"
+#include "rtc_base/message_digest.h"
using rtc::ByteBufferReader;
using rtc::ByteBufferWriter;
diff --git a/p2p/base/stun.h b/p2p/base/stun.h
index ca664b0..e61b345 100644
--- a/p2p/base/stun.h
+++ b/p2p/base/stun.h
@@ -20,9 +20,9 @@
#include <string>
#include <vector>
-#include "rtc_base/bytebuffer.h"
-#include "rtc_base/ipaddress.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/byte_buffer.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/socket_address.h"
namespace cricket {
diff --git a/p2p/base/stun_port.cc b/p2p/base/stun_port.cc
index 7273123..f94ea65 100644
--- a/p2p/base/stun_port.cc
+++ b/p2p/base/stun_port.cc
@@ -8,19 +8,19 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/stunport.h"
+#include "p2p/base/stun_port.h"
#include <utility>
#include <vector>
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/portallocator.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/port_allocator.h"
#include "p2p/base/stun.h"
#include "rtc_base/checks.h"
#include "rtc_base/helpers.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
#include "rtc_base/logging.h"
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/net_helpers.h"
#include "rtc_base/strings/string_builder.h"
namespace cricket {
diff --git a/p2p/base/stun_port.h b/p2p/base/stun_port.h
index d7c9cb8..1ee0727 100644
--- a/p2p/base/stun_port.h
+++ b/p2p/base/stun_port.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_STUNPORT_H_
-#define P2P_BASE_STUNPORT_H_
+#ifndef P2P_BASE_STUN_PORT_H_
+#define P2P_BASE_STUN_PORT_H_
#include <map>
#include <memory>
@@ -17,8 +17,8 @@
#include "absl/memory/memory.h"
#include "p2p/base/port.h"
-#include "p2p/base/stunrequest.h"
-#include "rtc_base/asyncpacketsocket.h"
+#include "p2p/base/stun_request.h"
+#include "rtc_base/async_packet_socket.h"
// TODO(mallinath) - Rename stunport.cc|h to udpport.cc|h.
@@ -294,4 +294,4 @@
} // namespace cricket
-#endif // P2P_BASE_STUNPORT_H_
+#endif // P2P_BASE_STUN_PORT_H_
diff --git a/p2p/base/stun_port_unittest.cc b/p2p/base/stun_port_unittest.cc
index 01518a9..7e7e2de 100644
--- a/p2p/base/stun_port_unittest.cc
+++ b/p2p/base/stun_port_unittest.cc
@@ -10,14 +10,14 @@
#include <memory>
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/base/stunport.h"
-#include "p2p/base/teststunserver.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/stun_port.h"
+#include "p2p/base/test_stun_server.h"
#include "rtc_base/gunit.h"
#include "rtc_base/helpers.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/ssladapter.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_adapter.h"
+#include "rtc_base/virtual_socket_server.h"
#include "test/gmock.h"
using cricket::ServerAddresses;
diff --git a/p2p/base/stun_request.cc b/p2p/base/stun_request.cc
index edba4d6..f97ca86 100644
--- a/p2p/base/stun_request.cc
+++ b/p2p/base/stun_request.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/stunrequest.h"
+#include "p2p/base/stun_request.h"
#include <algorithm>
#include <memory>
@@ -18,7 +18,7 @@
#include "rtc_base/checks.h"
#include "rtc_base/helpers.h"
#include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h" // For TimeMillis
+#include "rtc_base/time_utils.h" // For TimeMillis
namespace cricket {
diff --git a/p2p/base/stun_request.h b/p2p/base/stun_request.h
index 4a9a9b4..7994fb6 100644
--- a/p2p/base/stun_request.h
+++ b/p2p/base/stun_request.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_STUNREQUEST_H_
-#define P2P_BASE_STUNREQUEST_H_
+#ifndef P2P_BASE_STUN_REQUEST_H_
+#define P2P_BASE_STUN_REQUEST_H_
#include <stddef.h>
#include <stdint.h>
@@ -17,8 +17,8 @@
#include <string>
#include "p2p/base/stun.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
@@ -154,4 +154,4 @@
} // namespace cricket
-#endif // P2P_BASE_STUNREQUEST_H_
+#endif // P2P_BASE_STUN_REQUEST_H_
diff --git a/p2p/base/stun_request_unittest.cc b/p2p/base/stun_request_unittest.cc
index 94ea1cd..e2ac57f 100644
--- a/p2p/base/stun_request_unittest.cc
+++ b/p2p/base/stun_request_unittest.cc
@@ -10,11 +10,11 @@
#include <vector>
-#include "p2p/base/stunrequest.h"
-#include "rtc_base/fakeclock.h"
+#include "p2p/base/stun_request.h"
+#include "rtc_base/fake_clock.h"
#include "rtc_base/gunit.h"
#include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "test/gtest.h"
namespace cricket {
diff --git a/p2p/base/stun_server.cc b/p2p/base/stun_server.cc
index 95f0ceb..38ccc3f 100644
--- a/p2p/base/stun_server.cc
+++ b/p2p/base/stun_server.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/stunserver.h"
+#include "p2p/base/stun_server.h"
#include <utility>
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
#include "rtc_base/logging.h"
namespace cricket {
diff --git a/p2p/base/stun_server.h b/p2p/base/stun_server.h
index b379513..7ddc5c1 100644
--- a/p2p/base/stun_server.h
+++ b/p2p/base/stun_server.h
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_STUNSERVER_H_
-#define P2P_BASE_STUNSERVER_H_
+#ifndef P2P_BASE_STUN_SERVER_H_
+#define P2P_BASE_STUN_SERVER_H_
#include <stddef.h>
#include <stdint.h>
#include <memory>
#include "p2p/base/stun.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/socket_address.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
namespace cricket {
@@ -67,4 +67,4 @@
} // namespace cricket
-#endif // P2P_BASE_STUNSERVER_H_
+#endif // P2P_BASE_STUN_SERVER_H_
diff --git a/p2p/base/stun_server_unittest.cc b/p2p/base/stun_server_unittest.cc
index 154d5b8..b5cc1df 100644
--- a/p2p/base/stun_server_unittest.cc
+++ b/p2p/base/stun_server_unittest.cc
@@ -13,13 +13,13 @@
#include <string>
#include "absl/memory/memory.h"
-#include "p2p/base/stunserver.h"
-#include "rtc_base/bytebuffer.h"
-#include "rtc_base/ipaddress.h"
+#include "p2p/base/stun_server.h"
+#include "rtc_base/byte_buffer.h"
+#include "rtc_base/ip_address.h"
#include "rtc_base/logging.h"
-#include "rtc_base/testclient.h"
+#include "rtc_base/test_client.h"
#include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
#include "test/gtest.h"
namespace cricket {
diff --git a/p2p/base/stun_unittest.cc b/p2p/base/stun_unittest.cc
index 4c57b2a..60a0f7e 100644
--- a/p2p/base/stun_unittest.cc
+++ b/p2p/base/stun_unittest.cc
@@ -15,9 +15,9 @@
#include "absl/memory/memory.h"
#include "p2p/base/stun.h"
#include "rtc_base/arraysize.h"
-#include "rtc_base/bytebuffer.h"
-#include "rtc_base/byteorder.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/byte_buffer.h"
+#include "rtc_base/byte_order.h"
+#include "rtc_base/socket_address.h"
#include "test/gtest.h"
namespace cricket {
diff --git a/p2p/base/tcp_port.cc b/p2p/base/tcp_port.cc
index 490db1a..af49389 100644
--- a/p2p/base/tcp_port.cc
+++ b/p2p/base/tcp_port.cc
@@ -64,19 +64,19 @@
*
*/
-#include "p2p/base/tcpport.h"
+#include "p2p/base/tcp_port.h"
#include <errno.h>
#include <algorithm>
#include <vector>
-#include "p2p/base/p2pconstants.h"
+#include "p2p/base/p2p_constants.h"
#include "rtc_base/checks.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
#include "rtc_base/location.h"
#include "rtc_base/logging.h"
-#include "rtc_base/nethelper.h"
-#include "rtc_base/ratetracker.h"
+#include "rtc_base/net_helper.h"
+#include "rtc_base/rate_tracker.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
namespace cricket {
diff --git a/p2p/base/tcp_port.h b/p2p/base/tcp_port.h
index 4d06a65..67716f7 100644
--- a/p2p/base/tcp_port.h
+++ b/p2p/base/tcp_port.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_TCPPORT_H_
-#define P2P_BASE_TCPPORT_H_
+#ifndef P2P_BASE_TCP_PORT_H_
+#define P2P_BASE_TCP_PORT_H_
#include <list>
#include <memory>
@@ -17,7 +17,7 @@
#include "absl/memory/memory.h"
#include "p2p/base/port.h"
-#include "rtc_base/asyncpacketsocket.h"
+#include "rtc_base/async_packet_socket.h"
namespace cricket {
@@ -188,4 +188,4 @@
} // namespace cricket
-#endif // P2P_BASE_TCPPORT_H_
+#endif // P2P_BASE_TCP_PORT_H_
diff --git a/p2p/base/tcp_port_unittest.cc b/p2p/base/tcp_port_unittest.cc
index 7899591..b5b1f64 100644
--- a/p2p/base/tcp_port_unittest.cc
+++ b/p2p/base/tcp_port_unittest.cc
@@ -12,17 +12,17 @@
#include <memory>
#include <vector>
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/tcpport.h"
-#include "p2p/base/transportdescription.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/tcp_port.h"
+#include "p2p/base/transport_description.h"
#include "rtc_base/gunit.h"
#include "rtc_base/helpers.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/time_utils.h"
+#include "rtc_base/virtual_socket_server.h"
#include "test/gtest.h"
using rtc::SocketAddress;
diff --git a/p2p/base/test_relay_server.h b/p2p/base/test_relay_server.h
index 9aca2f6..be58251 100644
--- a/p2p/base/test_relay_server.h
+++ b/p2p/base/test_relay_server.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_TESTRELAYSERVER_H_
-#define P2P_BASE_TESTRELAYSERVER_H_
+#ifndef P2P_BASE_TEST_RELAY_SERVER_H_
+#define P2P_BASE_TEST_RELAY_SERVER_H_
#include <memory>
-#include "p2p/base/relayserver.h"
-#include "rtc_base/asynctcpsocket.h"
+#include "p2p/base/relay_server.h"
+#include "rtc_base/async_tcp_socket.h"
#include "rtc_base/server_socket_adapters.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
@@ -98,4 +98,4 @@
} // namespace cricket
-#endif // P2P_BASE_TESTRELAYSERVER_H_
+#endif // P2P_BASE_TEST_RELAY_SERVER_H_
diff --git a/p2p/base/test_stun_server.cc b/p2p/base/test_stun_server.cc
index e299224..3c98cd8 100644
--- a/p2p/base/test_stun_server.cc
+++ b/p2p/base/test_stun_server.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/teststunserver.h"
+#include "p2p/base/test_stun_server.h"
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/socket_server.h"
namespace cricket {
diff --git a/p2p/base/test_stun_server.h b/p2p/base/test_stun_server.h
index e0d94b7..44e3927 100644
--- a/p2p/base/test_stun_server.h
+++ b/p2p/base/test_stun_server.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_TESTSTUNSERVER_H_
-#define P2P_BASE_TESTSTUNSERVER_H_
+#ifndef P2P_BASE_TEST_STUN_SERVER_H_
+#define P2P_BASE_TEST_STUN_SERVER_H_
#include "p2p/base/stun.h"
-#include "p2p/base/stunserver.h"
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/socketaddress.h"
+#include "p2p/base/stun_server.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/socket_address.h"
#include "rtc_base/thread.h"
namespace cricket {
@@ -42,4 +42,4 @@
} // namespace cricket
-#endif // P2P_BASE_TESTSTUNSERVER_H_
+#endif // P2P_BASE_TEST_STUN_SERVER_H_
diff --git a/p2p/base/test_turn_customizer.h b/p2p/base/test_turn_customizer.h
index 7ca4579..ae8864a 100644
--- a/p2p/base/test_turn_customizer.h
+++ b/p2p/base/test_turn_customizer.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_TESTTURNCUSTOMIZER_H_
-#define P2P_BASE_TESTTURNCUSTOMIZER_H_
+#ifndef P2P_BASE_TEST_TURN_CUSTOMIZER_H_
+#define P2P_BASE_TEST_TURN_CUSTOMIZER_H_
#include "absl/memory/memory.h"
-#include "api/turncustomizer.h"
+#include "api/turn_customizer.h"
#include "rtc_base/gunit.h"
namespace cricket {
@@ -55,4 +55,4 @@
} // namespace cricket
-#endif // P2P_BASE_TESTTURNCUSTOMIZER_H_
+#endif // P2P_BASE_TEST_TURN_CUSTOMIZER_H_
diff --git a/p2p/base/test_turn_server.h b/p2p/base/test_turn_server.h
index 734ca4d..2bbe573 100644
--- a/p2p/base/test_turn_server.h
+++ b/p2p/base/test_turn_server.h
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_TESTTURNSERVER_H_
-#define P2P_BASE_TESTTURNSERVER_H_
+#ifndef P2P_BASE_TEST_TURN_SERVER_H_
+#define P2P_BASE_TEST_TURN_SERVER_H_
#include <string>
#include <vector>
-#include "p2p/base/basicpacketsocketfactory.h"
+#include "p2p/base/basic_packet_socket_factory.h"
#include "p2p/base/stun.h"
-#include "p2p/base/turnserver.h"
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/ssladapter.h"
-#include "rtc_base/sslidentity.h"
+#include "p2p/base/turn_server.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/ssl_adapter.h"
+#include "rtc_base/ssl_identity.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_checker.h"
@@ -152,4 +152,4 @@
} // namespace cricket
-#endif // P2P_BASE_TESTTURNSERVER_H_
+#endif // P2P_BASE_TEST_TURN_SERVER_H_
diff --git a/p2p/base/transport_description.cc b/p2p/base/transport_description.cc
index 95d7e2f..1847eec 100644
--- a/p2p/base/transport_description.cc
+++ b/p2p/base/transport_description.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/transportdescription.h"
+#include "p2p/base/transport_description.h"
#include "absl/strings/match.h"
#include "rtc_base/arraysize.h"
diff --git a/p2p/base/transport_description.h b/p2p/base/transport_description.h
index 2ab9732..c3c14a6 100644
--- a/p2p/base/transport_description.h
+++ b/p2p/base/transport_description.h
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_TRANSPORTDESCRIPTION_H_
-#define P2P_BASE_TRANSPORTDESCRIPTION_H_
+#ifndef P2P_BASE_TRANSPORT_DESCRIPTION_H_
+#define P2P_BASE_TRANSPORT_DESCRIPTION_H_
#include <algorithm>
#include <memory>
#include <string>
#include <vector>
-#include "p2p/base/p2pconstants.h"
-#include "rtc_base/sslfingerprint.h"
+#include "p2p/base/p2p_constants.h"
+#include "rtc_base/ssl_fingerprint.h"
namespace cricket {
@@ -138,4 +138,4 @@
} // namespace cricket
-#endif // P2P_BASE_TRANSPORTDESCRIPTION_H_
+#endif // P2P_BASE_TRANSPORT_DESCRIPTION_H_
diff --git a/p2p/base/transport_description_factory.cc b/p2p/base/transport_description_factory.cc
index 4e4f724..d95328b 100644
--- a/p2p/base/transport_description_factory.cc
+++ b/p2p/base/transport_description_factory.cc
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/transportdescriptionfactory.h"
+#include "p2p/base/transport_description_factory.h"
#include <stddef.h>
#include <memory>
#include <string>
#include "absl/memory/memory.h"
-#include "p2p/base/transportdescription.h"
+#include "p2p/base/transport_description.h"
#include "rtc_base/logging.h"
-#include "rtc_base/sslfingerprint.h"
+#include "rtc_base/ssl_fingerprint.h"
namespace cricket {
diff --git a/p2p/base/transport_description_factory.h b/p2p/base/transport_description_factory.h
index 55e5b9a..c1656a0 100644
--- a/p2p/base/transport_description_factory.h
+++ b/p2p/base/transport_description_factory.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_
-#define P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_
+#ifndef P2P_BASE_TRANSPORT_DESCRIPTION_FACTORY_H_
+#define P2P_BASE_TRANSPORT_DESCRIPTION_FACTORY_H_
#include <memory>
-#include "p2p/base/icecredentialsiterator.h"
-#include "p2p/base/transportdescription.h"
-#include "rtc_base/rtccertificate.h"
+#include "p2p/base/ice_credentials_iterator.h"
+#include "p2p/base/transport_description.h"
+#include "rtc_base/rtc_certificate.h"
namespace rtc {
class SSLIdentity;
@@ -83,4 +83,4 @@
} // namespace cricket
-#endif // P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_
+#endif // P2P_BASE_TRANSPORT_DESCRIPTION_FACTORY_H_
diff --git a/p2p/base/transport_description_factory_unittest.cc b/p2p/base/transport_description_factory_unittest.cc
index e8f623a..af91a21 100644
--- a/p2p/base/transport_description_factory_unittest.cc
+++ b/p2p/base/transport_description_factory_unittest.cc
@@ -14,14 +14,14 @@
#include <string>
#include <vector>
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/transportdescription.h"
-#include "p2p/base/transportdescriptionfactory.h"
-#include "rtc_base/copyonwritebuffer.h"
-#include "rtc_base/fakesslidentity.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslfingerprint.h"
-#include "rtc_base/sslidentity.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/transport_description.h"
+#include "p2p/base/transport_description_factory.h"
+#include "rtc_base/copy_on_write_buffer.h"
+#include "rtc_base/fake_ssl_identity.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_fingerprint.h"
+#include "rtc_base/ssl_identity.h"
#include "test/gtest.h"
using cricket::TransportDescriptionFactory;
diff --git a/p2p/base/transport_factory_interface.h b/p2p/base/transport_factory_interface.h
index 9805db0..6da5534 100644
--- a/p2p/base/transport_factory_interface.h
+++ b/p2p/base/transport_factory_interface.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_TRANSPORTFACTORYINTERFACE_H_
-#define P2P_BASE_TRANSPORTFACTORYINTERFACE_H_
+#ifndef P2P_BASE_TRANSPORT_FACTORY_INTERFACE_H_
+#define P2P_BASE_TRANSPORT_FACTORY_INTERFACE_H_
#include <memory>
#include <string>
-#include "p2p/base/dtlstransportinternal.h"
-#include "p2p/base/icetransportinternal.h"
+#include "p2p/base/dtls_transport_internal.h"
+#include "p2p/base/ice_transport_internal.h"
namespace cricket {
@@ -39,4 +39,4 @@
} // namespace cricket
-#endif // P2P_BASE_TRANSPORTFACTORYINTERFACE_H_
+#endif // P2P_BASE_TRANSPORT_FACTORY_INTERFACE_H_
diff --git a/p2p/base/transport_info.h b/p2p/base/transport_info.h
index 627c0f7..1f60b64 100644
--- a/p2p/base/transport_info.h
+++ b/p2p/base/transport_info.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_TRANSPORTINFO_H_
-#define P2P_BASE_TRANSPORTINFO_H_
+#ifndef P2P_BASE_TRANSPORT_INFO_H_
+#define P2P_BASE_TRANSPORT_INFO_H_
#include <string>
#include <vector>
#include "api/candidate.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/transportdescription.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/transport_description.h"
#include "rtc_base/helpers.h"
namespace cricket {
@@ -39,4 +39,4 @@
} // namespace cricket
-#endif // P2P_BASE_TRANSPORTINFO_H_
+#endif // P2P_BASE_TRANSPORT_INFO_H_
diff --git a/p2p/base/turn_port.cc b/p2p/base/turn_port.cc
index eb0adfa..bfaf45b 100644
--- a/p2p/base/turn_port.cc
+++ b/p2p/base/turn_port.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/turnport.h"
+#include "p2p/base/turn_port.h"
#include <algorithm>
#include <functional>
@@ -18,12 +18,12 @@
#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "p2p/base/stun.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/byte_order.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/nethelpers.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/net_helpers.h"
+#include "rtc_base/socket_address.h"
#include "rtc_base/strings/string_builder.h"
namespace cricket {
diff --git a/p2p/base/turn_port.h b/p2p/base/turn_port.h
index e152e0a..3f2e95c 100644
--- a/p2p/base/turn_port.h
+++ b/p2p/base/turn_port.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_TURNPORT_H_
-#define P2P_BASE_TURNPORT_H_
+#ifndef P2P_BASE_TURN_PORT_H_
+#define P2P_BASE_TURN_PORT_H_
#include <stdio.h>
#include <list>
@@ -21,10 +21,10 @@
#include "absl/memory/memory.h"
#include "p2p/base/port.h"
-#include "p2p/client/basicportallocator.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/sslcertificate.h"
+#include "p2p/client/basic_port_allocator.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/ssl_certificate.h"
namespace webrtc {
class TurnCustomizer;
@@ -396,4 +396,4 @@
} // namespace cricket
-#endif // P2P_BASE_TURNPORT_H_
+#endif // P2P_BASE_TURN_PORT_H_
diff --git a/p2p/base/turn_port_unittest.cc b/p2p/base/turn_port_unittest.cc
index cee1a2d..931f908 100644
--- a/p2p/base/turn_port_unittest.cc
+++ b/p2p/base/turn_port_unittest.cc
@@ -18,28 +18,28 @@
#include "absl/types/optional.h"
#include "api/units/time_delta.h"
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/portallocator.h"
-#include "p2p/base/stunport.h"
-#include "p2p/base/testturncustomizer.h"
-#include "p2p/base/testturnserver.h"
-#include "p2p/base/transportdescription.h"
-#include "p2p/base/turnport.h"
-#include "p2p/base/turnserver.h"
-#include "rtc_base/asyncsocket.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/port_allocator.h"
+#include "p2p/base/stun_port.h"
+#include "p2p/base/test_turn_customizer.h"
+#include "p2p/base/test_turn_server.h"
+#include "p2p/base/transport_description.h"
+#include "p2p/base/turn_port.h"
+#include "p2p/base/turn_server.h"
+#include "rtc_base/async_socket.h"
#include "rtc_base/buffer.h"
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
#include "rtc_base/checks.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
#include "rtc_base/gunit.h"
#include "rtc_base/location.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/nethelper.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/net_helper.h"
+#include "rtc_base/socket_address.h"
#include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/time_utils.h"
+#include "rtc_base/virtual_socket_server.h"
#include "test/gtest.h"
using rtc::SocketAddress;
diff --git a/p2p/base/turn_server.cc b/p2p/base/turn_server.cc
index a8bb41c..62ef5d9 100644
--- a/p2p/base/turn_server.cc
+++ b/p2p/base/turn_server.cc
@@ -8,22 +8,22 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/turnserver.h"
+#include "p2p/base/turn_server.h"
#include <tuple> // for std::tie
#include <utility>
#include "absl/memory/memory.h"
-#include "p2p/base/asyncstuntcpsocket.h"
-#include "p2p/base/packetsocketfactory.h"
+#include "p2p/base/async_stun_tcp_socket.h"
+#include "p2p/base/packet_socket_factory.h"
#include "p2p/base/stun.h"
#include "rtc_base/bind.h"
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
#include "rtc_base/checks.h"
#include "rtc_base/helpers.h"
#include "rtc_base/logging.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/socketadapters.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/socket_adapters.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/thread.h"
diff --git a/p2p/base/turn_server.h b/p2p/base/turn_server.h
index af51251..690d6a9 100644
--- a/p2p/base/turn_server.h
+++ b/p2p/base/turn_server.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_TURNSERVER_H_
-#define P2P_BASE_TURNSERVER_H_
+#ifndef P2P_BASE_TURN_SERVER_H_
+#define P2P_BASE_TURN_SERVER_H_
#include <list>
#include <map>
@@ -19,11 +19,11 @@
#include <utility>
#include <vector>
-#include "p2p/base/portinterface.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/socketaddress.h"
+#include "p2p/base/port_interface.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/socket_address.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread_checker.h"
@@ -348,4 +348,4 @@
} // namespace cricket
-#endif // P2P_BASE_TURNSERVER_H_
+#endif // P2P_BASE_TURN_SERVER_H_
diff --git a/p2p/base/turn_server_unittest.cc b/p2p/base/turn_server_unittest.cc
index 279506a..4080cec 100644
--- a/p2p/base/turn_server_unittest.cc
+++ b/p2p/base/turn_server_unittest.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/base/turnserver.h"
+#include "p2p/base/turn_server.h"
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "rtc_base/virtual_socket_server.h"
#include "test/gtest.h"
// NOTE: This is a work in progress. Currently this file only has tests for
diff --git a/p2p/base/udp_port.h b/p2p/base/udp_port.h
index ce55101..2fd6868 100644
--- a/p2p/base/udp_port.h
+++ b/p2p/base/udp_port.h
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_BASE_UDPPORT_H_
-#define P2P_BASE_UDPPORT_H_
+#ifndef P2P_BASE_UDP_PORT_H_
+#define P2P_BASE_UDP_PORT_H_
// StunPort will be handling UDPPort functionality.
-#include "p2p/base/stunport.h"
+#include "p2p/base/stun_port.h"
-#endif // P2P_BASE_UDPPORT_H_
+#endif // P2P_BASE_UDP_PORT_H_
diff --git a/p2p/client/basic_port_allocator.cc b/p2p/client/basic_port_allocator.cc
index 5c3f63a..6dc5dfc 100644
--- a/p2p/client/basic_port_allocator.cc
+++ b/p2p/client/basic_port_allocator.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/client/basicportallocator.h"
+#include "p2p/client/basic_port_allocator.h"
#include <algorithm>
#include <functional>
@@ -16,13 +16,13 @@
#include <string>
#include <vector>
-#include "p2p/base/basicpacketsocketfactory.h"
+#include "p2p/base/basic_packet_socket_factory.h"
#include "p2p/base/port.h"
-#include "p2p/base/relayport.h"
-#include "p2p/base/stunport.h"
-#include "p2p/base/tcpport.h"
-#include "p2p/base/turnport.h"
-#include "p2p/base/udpport.h"
+#include "p2p/base/relay_port.h"
+#include "p2p/base/stun_port.h"
+#include "p2p/base/tcp_port.h"
+#include "p2p/base/turn_port.h"
+#include "p2p/base/udp_port.h"
#include "rtc_base/checks.h"
#include "rtc_base/helpers.h"
#include "rtc_base/logging.h"
diff --git a/p2p/client/basic_port_allocator.h b/p2p/client/basic_port_allocator.h
index 672f3dd..edc6b87 100644
--- a/p2p/client/basic_port_allocator.h
+++ b/p2p/client/basic_port_allocator.h
@@ -8,19 +8,19 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_CLIENT_BASICPORTALLOCATOR_H_
-#define P2P_CLIENT_BASICPORTALLOCATOR_H_
+#ifndef P2P_CLIENT_BASIC_PORT_ALLOCATOR_H_
+#define P2P_CLIENT_BASIC_PORT_ALLOCATOR_H_
#include <memory>
#include <string>
#include <vector>
-#include "api/turncustomizer.h"
-#include "p2p/base/portallocator.h"
-#include "p2p/client/relayportfactoryinterface.h"
-#include "p2p/client/turnportfactory.h"
+#include "api/turn_customizer.h"
+#include "p2p/base/port_allocator.h"
+#include "p2p/client/relay_port_factory_interface.h"
+#include "p2p/client/turn_port_factory.h"
#include "rtc_base/checks.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/message_queue.h"
#include "rtc_base/network.h"
#include "rtc_base/system/rtc_export.h"
#include "rtc_base/thread.h"
@@ -410,4 +410,4 @@
} // namespace cricket
-#endif // P2P_CLIENT_BASICPORTALLOCATOR_H_
+#endif // P2P_CLIENT_BASIC_PORT_ALLOCATOR_H_
diff --git a/p2p/client/basic_port_allocator_unittest.cc b/p2p/client/basic_port_allocator_unittest.cc
index 2b205e6..936ca2f 100644
--- a/p2p/client/basic_port_allocator_unittest.cc
+++ b/p2p/client/basic_port_allocator_unittest.cc
@@ -12,34 +12,34 @@
#include <memory>
#include <ostream> // no-presubmit-check TODO(webrtc:8982)
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/stunport.h"
-#include "p2p/base/stunrequest.h"
-#include "p2p/base/stunserver.h"
-#include "p2p/base/testrelayserver.h"
-#include "p2p/base/teststunserver.h"
-#include "p2p/base/testturnserver.h"
-#include "p2p/client/basicportallocator.h"
-#include "rtc_base/fakeclock.h"
-#include "rtc_base/fakenetwork.h"
-#include "rtc_base/firewallsocketserver.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/stun_port.h"
+#include "p2p/base/stun_request.h"
+#include "p2p/base/stun_server.h"
+#include "p2p/base/test_relay_server.h"
+#include "p2p/base/test_stun_server.h"
+#include "p2p/base/test_turn_server.h"
+#include "p2p/client/basic_port_allocator.h"
+#include "rtc_base/fake_clock.h"
+#include "rtc_base/fake_network.h"
+#include "rtc_base/firewall_socket_server.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
#include "rtc_base/logging.h"
-#include "rtc_base/natserver.h"
-#include "rtc_base/natsocketfactory.h"
-#include "rtc_base/nattypes.h"
-#include "rtc_base/nethelper.h"
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/nat_server.h"
+#include "rtc_base/nat_socket_factory.h"
+#include "rtc_base/nat_types.h"
+#include "rtc_base/net_helper.h"
+#include "rtc_base/net_helpers.h"
#include "rtc_base/network.h"
#include "rtc_base/network_constants.h"
-#include "rtc_base/networkmonitor.h"
+#include "rtc_base/network_monitor.h"
#include "rtc_base/socket.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/socketaddresspair.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/socket_address_pair.h"
#include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
#include "system_wrappers/include/metrics.h"
#include "test/gtest.h"
diff --git a/p2p/client/relay_port_factory_interface.h b/p2p/client/relay_port_factory_interface.h
index 2afe651..c1cf51e 100644
--- a/p2p/client/relay_port_factory_interface.h
+++ b/p2p/client/relay_port_factory_interface.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_CLIENT_RELAYPORTFACTORYINTERFACE_H_
-#define P2P_CLIENT_RELAYPORTFACTORYINTERFACE_H_
+#ifndef P2P_CLIENT_RELAY_PORT_FACTORY_INTERFACE_H_
+#define P2P_CLIENT_RELAY_PORT_FACTORY_INTERFACE_H_
#include <memory>
#include <string>
-#include "p2p/base/portinterface.h"
-#include "rtc_base/refcount.h"
+#include "p2p/base/port_interface.h"
+#include "rtc_base/ref_count.h"
namespace rtc {
class AsyncPacketSocket;
@@ -67,4 +67,4 @@
} // namespace cricket
-#endif // P2P_CLIENT_RELAYPORTFACTORYINTERFACE_H_
+#endif // P2P_CLIENT_RELAY_PORT_FACTORY_INTERFACE_H_
diff --git a/p2p/client/turn_port_factory.cc b/p2p/client/turn_port_factory.cc
index 5465c36..934c019 100644
--- a/p2p/client/turn_port_factory.cc
+++ b/p2p/client/turn_port_factory.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "p2p/client/turnportfactory.h"
+#include "p2p/client/turn_port_factory.h"
#include <memory>
#include <utility>
-#include "p2p/base/portallocator.h"
-#include "p2p/base/turnport.h"
+#include "p2p/base/port_allocator.h"
+#include "p2p/base/turn_port.h"
namespace cricket {
diff --git a/p2p/client/turn_port_factory.h b/p2p/client/turn_port_factory.h
index ea199f4..abb1f67 100644
--- a/p2p/client/turn_port_factory.h
+++ b/p2p/client/turn_port_factory.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_CLIENT_TURNPORTFACTORY_H_
-#define P2P_CLIENT_TURNPORTFACTORY_H_
+#ifndef P2P_CLIENT_TURN_PORT_FACTORY_H_
+#define P2P_CLIENT_TURN_PORT_FACTORY_H_
#include <memory>
#include "p2p/base/port.h"
-#include "p2p/client/relayportfactoryinterface.h"
-#include "rtc_base/asyncpacketsocket.h"
+#include "p2p/client/relay_port_factory_interface.h"
+#include "rtc_base/async_packet_socket.h"
namespace cricket {
@@ -34,4 +34,4 @@
} // namespace cricket
-#endif // P2P_CLIENT_TURNPORTFACTORY_H_
+#endif // P2P_CLIENT_TURN_PORT_FACTORY_H_
diff --git a/p2p/stunprober/stun_prober.cc b/p2p/stunprober/stun_prober.cc
index 9778416..4fe572f 100644
--- a/p2p/stunprober/stun_prober.cc
+++ b/p2p/stunprober/stun_prober.cc
@@ -14,18 +14,18 @@
#include <string>
#include <utility>
-#include "p2p/base/packetsocketfactory.h"
+#include "p2p/base/packet_socket_factory.h"
#include "p2p/base/stun.h"
-#include "p2p/stunprober/stunprober.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/asyncresolverinterface.h"
+#include "p2p/stunprober/stun_prober.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/async_resolver_interface.h"
#include "rtc_base/bind.h"
#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/helpers.h"
#include "rtc_base/logging.h"
#include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace stunprober {
diff --git a/p2p/stunprober/stun_prober.h b/p2p/stunprober/stun_prober.h
index a4feecd..bdfb758 100644
--- a/p2p/stunprober/stun_prober.h
+++ b/p2p/stunprober/stun_prober.h
@@ -8,20 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef P2P_STUNPROBER_STUNPROBER_H_
-#define P2P_STUNPROBER_STUNPROBER_H_
+#ifndef P2P_STUNPROBER_STUN_PROBER_H_
+#define P2P_STUNPROBER_STUN_PROBER_H_
#include <set>
#include <string>
#include <vector>
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/byte_buffer.h"
#include "rtc_base/callback.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ip_address.h"
#include "rtc_base/network.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
#include "rtc_base/system/rtc_export.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_checker.h"
@@ -248,4 +248,4 @@
} // namespace stunprober
-#endif // P2P_STUNPROBER_STUNPROBER_H_
+#endif // P2P_STUNPROBER_STUN_PROBER_H_
diff --git a/p2p/stunprober/stun_prober_unittest.cc b/p2p/stunprober/stun_prober_unittest.cc
index b800939..c54f453 100644
--- a/p2p/stunprober/stun_prober_unittest.cc
+++ b/p2p/stunprober/stun_prober_unittest.cc
@@ -11,13 +11,13 @@
#include <stdint.h>
#include <memory>
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/base/teststunserver.h"
-#include "p2p/stunprober/stunprober.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/test_stun_server.h"
+#include "p2p/stunprober/stun_prober.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/ipaddress.h"
-#include "rtc_base/ssladapter.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/ssl_adapter.h"
+#include "rtc_base/virtual_socket_server.h"
#include "test/gtest.h"
using stunprober::StunProber;