(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/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index f350028..4b3bdc3 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -90,18 +90,18 @@
sources = [
"bind.h",
- "bitbuffer.cc",
- "bitbuffer.h",
- "bitrateallocationstrategy.cc",
- "bitrateallocationstrategy.h",
+ "bit_buffer.cc",
+ "bit_buffer.h",
+ "bitrate_allocation_strategy.cc",
+ "bitrate_allocation_strategy.h",
"buffer.h",
- "bufferqueue.cc",
- "bufferqueue.h",
- "bytebuffer.cc",
- "bytebuffer.h",
- "byteorder.h",
- "copyonwritebuffer.cc",
- "copyonwritebuffer.h",
+ "buffer_queue.cc",
+ "buffer_queue.h",
+ "byte_buffer.cc",
+ "byte_buffer.h",
+ "byte_order.h",
+ "copy_on_write_buffer.cc",
+ "copy_on_write_buffer.h",
"event_tracer.cc",
"event_tracer.h",
"file.cc",
@@ -119,7 +119,7 @@
"numerics/moving_max_counter.h",
"numerics/sample_counter.cc",
"numerics/sample_counter.h",
- "onetimeevent.h",
+ "one_time_event.h",
"platform_file.cc",
"platform_file.h",
"race_checker.cc",
@@ -128,12 +128,12 @@
"random.h",
"rate_statistics.cc",
"rate_statistics.h",
- "ratetracker.cc",
- "ratetracker.h",
+ "rate_tracker.cc",
+ "rate_tracker.h",
"swap_queue.h",
"template_util.h",
- "timestampaligner.cc",
- "timestampaligner.h",
+ "timestamp_aligner.cc",
+ "timestamp_aligner.h",
"trace_event.h",
"zero_memory.cc",
"zero_memory.h",
@@ -184,7 +184,7 @@
visibility = [ "*" ]
sources = [
"arraysize.h",
- "constructormagic.h",
+ "constructor_magic.h",
"format_macros.h",
"stringize_macros.h",
"thread_annotations.h",
@@ -214,9 +214,9 @@
rtc_source_set("refcount") {
visibility = [ "*" ]
sources = [
- "refcount.h",
- "refcountedobject.h",
- "refcounter.h",
+ "ref_count.h",
+ "ref_counted_object.h",
+ "ref_counter.h",
]
deps = [
":atomicops",
@@ -226,8 +226,8 @@
rtc_source_set("criticalsection") {
sources = [
- "criticalsection.cc",
- "criticalsection.h",
+ "critical_section.cc",
+ "critical_section.h",
]
deps = [
":atomicops",
@@ -342,7 +342,7 @@
rtc_source_set("atomicops") {
sources = [
- "atomicops.h",
+ "atomic_ops.h",
]
}
@@ -417,8 +417,8 @@
rtc_source_set("timeutils") {
visibility = [ "*" ]
sources = [
- "timeutils.cc",
- "timeutils.h",
+ "time_utils.cc",
+ "time_utils.h",
]
deps = [
":checks",
@@ -429,14 +429,14 @@
rtc_source_set("stringutils") {
sources = [
+ "string_encode.cc",
+ "string_encode.h",
"string_to_number.cc",
"string_to_number.h",
- "stringencode.cc",
- "stringencode.h",
+ "string_utils.cc",
+ "string_utils.h",
"strings/string_builder.cc",
"strings/string_builder.h",
- "stringutils.cc",
- "stringutils.h",
]
deps = [
":checks",
@@ -728,8 +728,8 @@
# TODO(bugs.webrtc.org/9987): This build target will soon contain
# the following files:
# sources = [
- # "nethelpers.cc",
- # "nethelpers.h",
+ # "net_helpers.cc",
+ # "net_helpers.h",
# ]
}
@@ -737,8 +737,8 @@
# TODO(bugs.webrtc.org/9987): This build target will soon contain
# the following files:
# sources = [
- # "asyncresolverinterface.cc",
- # "asyncresolverinterface.h",
+ # "async_resolver_interface.cc",
+ # "async_resolver_interface.h",
# ]
}
@@ -746,8 +746,8 @@
# TODO(bugs.webrtc.org/9987): This build target will soon contain
# the following files:
# sources = [
- # "ipaddress.cc",
- # "ipaddress.h",
+ # "ip_address.cc",
+ # "ip_address.h",
# ]
}
@@ -755,8 +755,8 @@
# TODO(bugs.webrtc.org/9987): This build target will soon contain
# the following files:
# sources = [
- # "socketaddress.cc",
- # "socketaddress.h",
+ # "socket_address.cc",
+ # "socket_address.h",
# ]
}
@@ -764,8 +764,8 @@
# TODO(bugs.webrtc.org/9987): This build target will soon contain
# the following files:
# sources = [
- # "nullsocketserver.cc",
- # "nullsocketserver.h",
+ # "null_socket_server.cc",
+ # "null_socket_server.h",
# ]
}
@@ -773,7 +773,7 @@
# TODO(bugs.webrtc.org/9987): This build target will soon contain
# the following files:
# sources = [
- # "socketserver.h",
+ # "socket_server.h",
# ]
}
@@ -785,16 +785,16 @@
# "asyncresolver.h",
# "defaultsocketserver.cc",
# "defaultsocketserver.h",
- # "messagehandler.cc",
- # "messagehandler.h",
- # "messagequeue.cc",
- # "messagequeue.h",
- # "networkmonitor.cc",
- # "networkmonitor.h",
- # "physicalsocketserver.cc",
- # "physicalsocketserver.h",
- # "signalthread.cc",
- # "signalthread.h",
+ # "message_handler.cc",
+ # "message_handler.h",
+ # "message_queue.cc",
+ # "message_queue.h",
+ # "network_monitor.cc",
+ # "network_monitor.h",
+ # "physical_socket_server.cc",
+ # "physical_socket_server.h",
+ # "signal_thread.cc",
+ # "signal_thread.h",
# "thread.cc",
# "thread.h",
# ]
@@ -804,7 +804,7 @@
# TODO(bugs.webrtc.org/9987): This build target will soon contain
# the following files:
# sources = [
- # "socketfactory.h",
+ # "socket_factory.h",
# ]
}
@@ -812,8 +812,8 @@
# TODO(bugs.webrtc.org/9987): This build target will soon contain
# the following files:
# sources = [
- # "asyncsocket.cc",
- # "asyncsocket.h",
+ # "async_socket.cc",
+ # "async_socket.h",
# ]
}
@@ -839,8 +839,8 @@
# TODO(bugs.webrtc.org/9987): This build target will soon contain
# the following files:
# sources = [
- # "ifaddrs-android.cc",
- # "ifaddrs-android.h",
+ # "ifaddrs_android.cc",
+ # "ifaddrs_android.h",
# ]
}
}
@@ -882,105 +882,105 @@
all_dependent_configs = [ ":rtc_base_all_dependent_config" ]
sources = [
- "asyncinvoker-inl.h",
- "asyncinvoker.cc",
- "asyncinvoker.h",
- "asyncpacketsocket.cc",
- "asyncpacketsocket.h",
- "asyncresolverinterface.cc",
- "asyncresolverinterface.h",
- "asyncsocket.cc",
- "asyncsocket.h",
- "asynctcpsocket.cc",
- "asynctcpsocket.h",
- "asyncudpsocket.cc",
- "asyncudpsocket.h",
+ "async_invoker.cc",
+ "async_invoker.h",
+ "async_invoker_inl.h",
+ "async_packet_socket.cc",
+ "async_packet_socket.h",
+ "async_resolver_interface.cc",
+ "async_resolver_interface.h",
+ "async_socket.cc",
+ "async_socket.h",
+ "async_tcp_socket.cc",
+ "async_tcp_socket.h",
+ "async_udp_socket.cc",
+ "async_udp_socket.h",
"crc32.cc",
"crc32.h",
- "cryptstring.cc",
- "cryptstring.h",
+ "crypt_string.cc",
+ "crypt_string.h",
"data_rate_limiter.cc",
"data_rate_limiter.h",
"dscp.h",
- "filerotatingstream.cc",
- "filerotatingstream.h",
+ "file_rotating_stream.cc",
+ "file_rotating_stream.h",
"gunit_prod.h",
"helpers.cc",
"helpers.h",
- "httpcommon.cc",
- "httpcommon.h",
- "ipaddress.cc",
- "ipaddress.h",
+ "http_common.cc",
+ "http_common.h",
+ "ip_address.cc",
+ "ip_address.h",
"keep_ref_until_done.h",
"key_derivation.cc",
"key_derivation.h",
"mdns_responder_interface.h",
- "messagedigest.cc",
- "messagedigest.h",
- "messagehandler.cc",
- "messagehandler.h",
- "messagequeue.cc",
- "messagequeue.h",
- "nethelper.cc",
- "nethelper.h",
- "nethelpers.cc",
- "nethelpers.h",
+ "message_digest.cc",
+ "message_digest.h",
+ "message_handler.cc",
+ "message_handler.h",
+ "message_queue.cc",
+ "message_queue.h",
+ "net_helper.cc",
+ "net_helper.h",
+ "net_helpers.cc",
+ "net_helpers.h",
"network.cc",
"network.h",
"network_constants.h",
- "networkmonitor.cc",
- "networkmonitor.h",
- "networkroute.h",
- "nullsocketserver.cc",
- "nullsocketserver.h",
+ "network_monitor.cc",
+ "network_monitor.h",
+ "network_route.h",
+ "null_socket_server.cc",
+ "null_socket_server.h",
"openssl.h",
+ "openssl_adapter.cc",
+ "openssl_adapter.h",
+ "openssl_certificate.cc",
+ "openssl_certificate.h",
+ "openssl_digest.cc",
+ "openssl_digest.h",
+ "openssl_identity.cc",
+ "openssl_identity.h",
"openssl_key_derivation_hkdf.cc",
"openssl_key_derivation_hkdf.h",
- "openssladapter.cc",
- "openssladapter.h",
- "opensslcertificate.cc",
- "opensslcertificate.h",
- "openssldigest.cc",
- "openssldigest.h",
- "opensslidentity.cc",
- "opensslidentity.h",
- "opensslsessioncache.cc",
- "opensslsessioncache.h",
- "opensslstreamadapter.cc",
- "opensslstreamadapter.h",
- "opensslutility.cc",
- "opensslutility.h",
- "physicalsocketserver.cc",
- "physicalsocketserver.h",
- "proxyinfo.cc",
- "proxyinfo.h",
- "rtccertificate.cc",
- "rtccertificate.h",
- "rtccertificategenerator.cc",
- "rtccertificategenerator.h",
- "signalthread.cc",
- "signalthread.h",
- "sigslotrepeater.h",
+ "openssl_session_cache.cc",
+ "openssl_session_cache.h",
+ "openssl_stream_adapter.cc",
+ "openssl_stream_adapter.h",
+ "openssl_utility.cc",
+ "openssl_utility.h",
+ "physical_socket_server.cc",
+ "physical_socket_server.h",
+ "proxy_info.cc",
+ "proxy_info.h",
+ "rtc_certificate.cc",
+ "rtc_certificate.h",
+ "rtc_certificate_generator.cc",
+ "rtc_certificate_generator.h",
+ "signal_thread.cc",
+ "signal_thread.h",
+ "sigslot_repeater.h",
"socket.cc",
"socket.h",
- "socketadapters.cc",
- "socketadapters.h",
- "socketaddress.cc",
- "socketaddress.h",
- "socketaddresspair.cc",
- "socketaddresspair.h",
- "socketfactory.h",
- "socketserver.h",
- "ssladapter.cc",
- "ssladapter.h",
- "sslcertificate.cc",
- "sslcertificate.h",
- "sslfingerprint.cc",
- "sslfingerprint.h",
- "sslidentity.cc",
- "sslidentity.h",
- "sslstreamadapter.cc",
- "sslstreamadapter.h",
+ "socket_adapters.cc",
+ "socket_adapters.h",
+ "socket_address.cc",
+ "socket_address.h",
+ "socket_address_pair.cc",
+ "socket_address_pair.h",
+ "socket_factory.h",
+ "socket_server.h",
+ "ssl_adapter.cc",
+ "ssl_adapter.h",
+ "ssl_certificate.cc",
+ "ssl_certificate.h",
+ "ssl_fingerprint.cc",
+ "ssl_fingerprint.h",
+ "ssl_identity.cc",
+ "ssl_identity.h",
+ "ssl_stream_adapter.cc",
+ "ssl_stream_adapter.h",
"stream.cc",
"stream.h",
"thread.cc",
@@ -993,19 +993,19 @@
} else {
sources += [
"callback.h",
- "logsinks.cc",
- "logsinks.h",
- "numerics/mathutils.h",
- "rollingaccumulator.h",
- "sslroots.h",
+ "log_sinks.cc",
+ "log_sinks.h",
+ "numerics/math_utils.h",
+ "rolling_accumulator.h",
+ "ssl_roots.h",
]
if (is_win) {
- sources += [ "win32socketinit.h" ]
+ sources += [ "win32_socket_init.h" ]
if (current_os != "winuwp") {
sources += [
- "win32socketserver.cc",
- "win32socketserver.h",
+ "win32_socket_server.cc",
+ "win32_socket_server.h",
]
}
}
@@ -1019,8 +1019,8 @@
if (is_android) {
sources += [
- "ifaddrs-android.cc",
- "ifaddrs-android.h",
+ "ifaddrs_android.cc",
+ "ifaddrs_android.h",
]
libs += [
@@ -1030,7 +1030,7 @@
}
if (is_ios || is_mac) {
- sources += [ "macifaddrs_converter.cc" ]
+ sources += [ "mac_ifaddrs_converter.cc" ]
deps += [ "system:cocoa_threading" ]
}
@@ -1054,8 +1054,8 @@
if (is_mac) {
sources += [
- "macutils.cc",
- "macutils.h",
+ "mac_utils.cc",
+ "mac_utils.h",
]
}
@@ -1063,8 +1063,8 @@
sources += [
"win32.cc",
"win32.h",
- "win32window.cc",
- "win32window.h",
+ "win32_window.cc",
+ "win32_window.h",
]
libs += [
@@ -1116,8 +1116,8 @@
rtc_source_set("testclient") {
testonly = true
sources = [
- "testclient.cc",
- "testclient.h",
+ "test_client.cc",
+ "test_client.h",
]
deps = [
":criticalsection",
@@ -1135,40 +1135,40 @@
sources = [
"cpu_time.cc",
"cpu_time.h",
+ "fake_clock.cc",
+ "fake_clock.h",
"fake_mdns_responder.h",
- "fakeclock.cc",
- "fakeclock.h",
- "fakenetwork.h",
- "fakesslidentity.cc",
- "fakesslidentity.h",
- "firewallsocketserver.cc",
- "firewallsocketserver.h",
+ "fake_network.h",
+ "fake_ssl_identity.cc",
+ "fake_ssl_identity.h",
+ "firewall_socket_server.cc",
+ "firewall_socket_server.h",
"memory_stream.cc",
"memory_stream.h",
"memory_usage.cc",
"memory_usage.h",
- "natserver.cc",
- "natserver.h",
- "natsocketfactory.cc",
- "natsocketfactory.h",
- "nattypes.cc",
- "nattypes.h",
- "proxyserver.cc",
- "proxyserver.h",
+ "nat_server.cc",
+ "nat_server.h",
+ "nat_socket_factory.cc",
+ "nat_socket_factory.h",
+ "nat_types.cc",
+ "nat_types.h",
+ "proxy_server.cc",
+ "proxy_server.h",
"server_socket_adapters.cc",
"server_socket_adapters.h",
- "sigslottester.h",
+ "sigslot_tester.h",
"sigslottester.h.pump",
- "socketstream.cc",
- "socketstream.h",
- "testbase64.h",
- "testcertificateverifier.h",
- "testechoserver.cc",
- "testechoserver.h",
- "testutils.cc",
- "testutils.h",
- "virtualsocketserver.cc",
- "virtualsocketserver.h",
+ "socket_stream.cc",
+ "socket_stream.h",
+ "test_base64.h",
+ "test_certificate_verifier.h",
+ "test_echo_server.cc",
+ "test_echo_server.h",
+ "test_utils.cc",
+ "test_utils.h",
+ "virtual_socket_server.cc",
+ "virtual_socket_server.h",
]
deps = [
":checks",
@@ -1235,12 +1235,12 @@
sources = [
"cpu_time_unittest.cc",
- "filerotatingstream_unittest.cc",
- "nullsocketserver_unittest.cc",
- "physicalsocketserver_unittest.cc",
+ "file_rotating_stream_unittest.cc",
+ "null_socket_server_unittest.cc",
+ "physical_socket_server_unittest.cc",
+ "socket_address_unittest.cc",
"socket_unittest.cc",
"socket_unittest.h",
- "socketaddress_unittest.cc",
]
deps = [
":checks",
@@ -1257,7 +1257,7 @@
"//third_party/abseil-cpp/absl/memory",
]
if (is_win) {
- sources += [ "win32socketserver_unittest.cc" ]
+ sources += [ "win32_socket_server_unittest.cc" ]
}
}
@@ -1267,17 +1267,17 @@
cflags = [ "-fsanitize=memory" ]
}
sources = [
- "atomicops_unittest.cc",
+ "atomic_ops_unittest.cc",
"base64_unittest.cc",
"bind_unittest.cc",
- "bitbuffer_unittest.cc",
- "bitrateallocationstrategy_unittest.cc",
+ "bit_buffer_unittest.cc",
+ "bitrate_allocation_strategy_unittest.cc",
+ "buffer_queue_unittest.cc",
"buffer_unittest.cc",
- "bufferqueue_unittest.cc",
- "bytebuffer_unittest.cc",
- "byteorder_unittest.cc",
- "copyonwritebuffer_unittest.cc",
- "criticalsection_unittest.cc",
+ "byte_buffer_unittest.cc",
+ "byte_order_unittest.cc",
+ "copy_on_write_buffer_unittest.cc",
+ "critical_section_unittest.cc",
"event_tracer_unittest.cc",
"event_unittest.cc",
"file_unittest.cc",
@@ -1289,26 +1289,26 @@
"numerics/safe_compare_unittest.cc",
"numerics/safe_minmax_unittest.cc",
"numerics/sample_counter_unittest.cc",
- "onetimeevent_unittest.cc",
+ "one_time_event_unittest.cc",
"platform_file_unittest.cc",
"platform_thread_unittest.cc",
"random_unittest.cc",
"rate_limiter_unittest.cc",
"rate_statistics_unittest.cc",
- "ratetracker_unittest.cc",
- "refcountedobject_unittest.cc",
+ "rate_tracker_unittest.cc",
+ "ref_counted_object_unittest.cc",
"sanitizer_unittest.cc",
+ "string_encode_unittest.cc",
"string_to_number_unittest.cc",
- "stringencode_unittest.cc",
+ "string_utils_unittest.cc",
"stringize_macros_unittest.cc",
"strings/string_builder_unittest.cc",
- "stringutils_unittest.cc",
"swap_queue_unittest.cc",
"thread_annotations_unittest.cc",
"thread_checker_unittest.cc",
- "timestampaligner_unittest.cc",
- "timeutils_unittest.cc",
- "virtualsocket_unittest.cc",
+ "time_utils_unittest.cc",
+ "timestamp_aligner_unittest.cc",
+ "virtual_socket_unittest.cc",
"zero_memory_unittest.cc",
]
if (is_win) {
@@ -1439,37 +1439,37 @@
"crc32_unittest.cc",
"data_rate_limiter_unittest.cc",
"helpers_unittest.cc",
- "ipaddress_unittest.cc",
+ "ip_address_unittest.cc",
"memory_usage_unittest.cc",
- "messagedigest_unittest.cc",
- "messagequeue_unittest.cc",
+ "message_digest_unittest.cc",
+ "message_queue_unittest.cc",
"nat_unittest.cc",
"network_unittest.cc",
"proxy_unittest.cc",
- "rollingaccumulator_unittest.cc",
- "rtccertificate_unittest.cc",
- "rtccertificategenerator_unittest.cc",
- "signalthread_unittest.cc",
- "sigslottester_unittest.cc",
+ "rolling_accumulator_unittest.cc",
+ "rtc_certificate_generator_unittest.cc",
+ "rtc_certificate_unittest.cc",
+ "signal_thread_unittest.cc",
+ "sigslot_tester_unittest.cc",
"stream_unittest.cc",
- "testclient_unittest.cc",
+ "test_client_unittest.cc",
"thread_unittest.cc",
]
if (is_win) {
sources += [
"win32_unittest.cc",
- "win32window_unittest.cc",
+ "win32_window_unittest.cc",
]
}
if (is_posix || is_fuchsia) {
sources += [
+ "openssl_adapter_unittest.cc",
"openssl_key_derivation_hkdf_unittest.cc",
- "openssladapter_unittest.cc",
- "opensslsessioncache_unittest.cc",
- "opensslutility_unittest.cc",
- "ssladapter_unittest.cc",
- "sslidentity_unittest.cc",
- "sslstreamadapter_unittest.cc",
+ "openssl_session_cache_unittest.cc",
+ "openssl_utility_unittest.cc",
+ "ssl_adapter_unittest.cc",
+ "ssl_identity_unittest.cc",
+ "ssl_stream_adapter_unittest.cc",
]
}
deps = [
diff --git a/rtc_base/async_invoker.cc b/rtc_base/async_invoker.cc
index f0dd188..8584bda 100644
--- a/rtc_base/async_invoker.cc
+++ b/rtc_base/async_invoker.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/asyncinvoker.h"
+#include "rtc_base/async_invoker.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
diff --git a/rtc_base/async_invoker.h b/rtc_base/async_invoker.h
index 474ec7c..805768b 100644
--- a/rtc_base/async_invoker.h
+++ b/rtc_base/async_invoker.h
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_ASYNCINVOKER_H_
-#define RTC_BASE_ASYNCINVOKER_H_
+#ifndef RTC_BASE_ASYNC_INVOKER_H_
+#define RTC_BASE_ASYNC_INVOKER_H_
#include <atomic>
#include <memory>
#include <utility>
-#include "rtc_base/asyncinvoker-inl.h"
+#include "rtc_base/async_invoker_inl.h"
#include "rtc_base/bind.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/event.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
@@ -262,4 +262,4 @@
} // namespace rtc
-#endif // RTC_BASE_ASYNCINVOKER_H_
+#endif // RTC_BASE_ASYNC_INVOKER_H_
diff --git a/rtc_base/async_invoker_inl.h b/rtc_base/async_invoker_inl.h
index 0dadc0f..50ee638 100644
--- a/rtc_base/async_invoker_inl.h
+++ b/rtc_base/async_invoker_inl.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_ASYNCINVOKER_INL_H_
-#define RTC_BASE_ASYNCINVOKER_INL_H_
+#ifndef RTC_BASE_ASYNC_INVOKER_INL_H_
+#define RTC_BASE_ASYNC_INVOKER_INL_H_
#include "rtc_base/bind.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/event.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
@@ -58,4 +58,4 @@
} // namespace rtc
-#endif // RTC_BASE_ASYNCINVOKER_INL_H_
+#endif // RTC_BASE_ASYNC_INVOKER_INL_H_
diff --git a/rtc_base/async_packet_socket.cc b/rtc_base/async_packet_socket.cc
index 7e0cc8f..12afbeb 100644
--- a/rtc_base/async_packet_socket.cc
+++ b/rtc_base/async_packet_socket.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/nethelper.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/net_helper.h"
namespace rtc {
diff --git a/rtc_base/async_packet_socket.h b/rtc_base/async_packet_socket.h
index 0e31c2b..3afff3b 100644
--- a/rtc_base/async_packet_socket.h
+++ b/rtc_base/async_packet_socket.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_ASYNCPACKETSOCKET_H_
-#define RTC_BASE_ASYNCPACKETSOCKET_H_
+#ifndef RTC_BASE_ASYNC_PACKET_SOCKET_H_
+#define RTC_BASE_ASYNC_PACKET_SOCKET_H_
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/dscp.h"
#include "rtc_base/network/sent_packet.h"
#include "rtc_base/socket.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace rtc {
@@ -140,4 +140,4 @@
} // namespace rtc
-#endif // RTC_BASE_ASYNCPACKETSOCKET_H_
+#endif // RTC_BASE_ASYNC_PACKET_SOCKET_H_
diff --git a/rtc_base/async_resolver_interface.cc b/rtc_base/async_resolver_interface.cc
index b2880f2..c8d6ab8 100644
--- a/rtc_base/async_resolver_interface.cc
+++ b/rtc_base/async_resolver_interface.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/asyncresolverinterface.h"
+#include "rtc_base/async_resolver_interface.h"
namespace rtc {
diff --git a/rtc_base/async_resolver_interface.h b/rtc_base/async_resolver_interface.h
index f3df884..0f5e989 100644
--- a/rtc_base/async_resolver_interface.h
+++ b/rtc_base/async_resolver_interface.h
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_ASYNCRESOLVERINTERFACE_H_
-#define RTC_BASE_ASYNCRESOLVERINTERFACE_H_
+#ifndef RTC_BASE_ASYNC_RESOLVER_INTERFACE_H_
+#define RTC_BASE_ASYNC_RESOLVER_INTERFACE_H_
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
namespace rtc {
diff --git a/rtc_base/async_socket.cc b/rtc_base/async_socket.cc
index acd5415..ab3f99e 100644
--- a/rtc_base/async_socket.cc
+++ b/rtc_base/async_socket.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/asyncsocket.h"
+#include "rtc_base/async_socket.h"
#include "rtc_base/checks.h"
namespace rtc {
diff --git a/rtc_base/async_socket.h b/rtc_base/async_socket.h
index c23929f..7b2f0e0 100644
--- a/rtc_base/async_socket.h
+++ b/rtc_base/async_socket.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_ASYNCSOCKET_H_
-#define RTC_BASE_ASYNCSOCKET_H_
+#ifndef RTC_BASE_ASYNC_SOCKET_H_
+#define RTC_BASE_ASYNC_SOCKET_H_
#include <stddef.h>
#include <stdint.h>
#include "rtc_base/socket.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
namespace rtc {
@@ -83,4 +83,4 @@
} // namespace rtc
-#endif // RTC_BASE_ASYNCSOCKET_H_
+#endif // RTC_BASE_ASYNC_SOCKET_H_
diff --git a/rtc_base/async_tcp_socket.cc b/rtc_base/async_tcp_socket.cc
index f15b524..148e459 100644
--- a/rtc_base/async_tcp_socket.cc
+++ b/rtc_base/async_tcp_socket.cc
@@ -8,19 +8,19 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/asynctcpsocket.h"
+#include "rtc_base/async_tcp_socket.h"
#include <stdint.h>
#include <string.h>
#include <algorithm>
#include <memory>
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/network/sent_packet.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
-#include "rtc_base/timeutils.h" // for TimeMillis
+#include "rtc_base/time_utils.h" // for TimeMillis
#if defined(WEBRTC_POSIX)
#include <errno.h>
diff --git a/rtc_base/async_tcp_socket.h b/rtc_base/async_tcp_socket.h
index 9567dd9..ae12a94 100644
--- a/rtc_base/async_tcp_socket.h
+++ b/rtc_base/async_tcp_socket.h
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_ASYNCTCPSOCKET_H_
-#define RTC_BASE_ASYNCTCPSOCKET_H_
+#ifndef RTC_BASE_ASYNC_TCP_SOCKET_H_
+#define RTC_BASE_ASYNC_TCP_SOCKET_H_
#include <stddef.h>
#include <memory>
-#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/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/socket.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
namespace rtc {
@@ -109,4 +109,4 @@
} // namespace rtc
-#endif // RTC_BASE_ASYNCTCPSOCKET_H_
+#endif // RTC_BASE_ASYNC_TCP_SOCKET_H_
diff --git a/rtc_base/async_tcp_socket_unittest.cc b/rtc_base/async_tcp_socket_unittest.cc
index e8fd96c..69b5392 100644
--- a/rtc_base/async_tcp_socket_unittest.cc
+++ b/rtc_base/async_tcp_socket_unittest.cc
@@ -11,9 +11,9 @@
#include <memory>
#include <string>
-#include "rtc_base/asynctcpsocket.h"
+#include "rtc_base/async_tcp_socket.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
namespace rtc {
diff --git a/rtc_base/async_udp_socket.cc b/rtc_base/async_udp_socket.cc
index a83403b..8521910 100644
--- a/rtc_base/async_udp_socket.cc
+++ b/rtc_base/async_udp_socket.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/asyncudpsocket.h"
+#include "rtc_base/async_udp_socket.h"
#include <stdint.h>
#include <string>
@@ -17,7 +17,7 @@
#include "rtc_base/logging.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 rtc {
diff --git a/rtc_base/async_udp_socket.h b/rtc_base/async_udp_socket.h
index 030946d..237c88d 100644
--- a/rtc_base/async_udp_socket.h
+++ b/rtc_base/async_udp_socket.h
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_ASYNCUDPSOCKET_H_
-#define RTC_BASE_ASYNCUDPSOCKET_H_
+#ifndef RTC_BASE_ASYNC_UDP_SOCKET_H_
+#define RTC_BASE_ASYNC_UDP_SOCKET_H_
#include <stddef.h>
#include <memory>
-#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/socket.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/socketfactory.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/socket_factory.h"
namespace rtc {
@@ -68,4 +68,4 @@
} // namespace rtc
-#endif // RTC_BASE_ASYNCUDPSOCKET_H_
+#endif // RTC_BASE_ASYNC_UDP_SOCKET_H_
diff --git a/rtc_base/async_udp_socket_unittest.cc b/rtc_base/async_udp_socket_unittest.cc
index 33b3d136..0484c3a 100644
--- a/rtc_base/async_udp_socket_unittest.cc
+++ b/rtc_base/async_udp_socket_unittest.cc
@@ -11,10 +11,10 @@
#include <memory>
#include <string>
-#include "rtc_base/asyncudpsocket.h"
+#include "rtc_base/async_udp_socket.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/physicalsocketserver.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/physical_socket_server.h"
+#include "rtc_base/virtual_socket_server.h"
namespace rtc {
diff --git a/rtc_base/atomic_ops.h b/rtc_base/atomic_ops.h
index 16fa603..18a24a8 100644
--- a/rtc_base/atomic_ops.h
+++ b/rtc_base/atomic_ops.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_ATOMICOPS_H_
-#define RTC_BASE_ATOMICOPS_H_
+#ifndef RTC_BASE_ATOMIC_OPS_H_
+#define RTC_BASE_ATOMIC_OPS_H_
#if defined(WEBRTC_WIN)
// clang-format off
@@ -76,4 +76,4 @@
} // namespace rtc
-#endif // RTC_BASE_ATOMICOPS_H_
+#endif // RTC_BASE_ATOMIC_OPS_H_
diff --git a/rtc_base/base64_unittest.cc b/rtc_base/base64_unittest.cc
index 16dcd8d..dcc4d1b 100644
--- a/rtc_base/base64_unittest.cc
+++ b/rtc_base/base64_unittest.cc
@@ -15,7 +15,7 @@
#include <algorithm>
#include "rtc_base/logging.h"
-#include "rtc_base/testbase64.h"
+#include "rtc_base/test_base64.h"
#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/bind_unittest.cc b/rtc_base/bind_unittest.cc
index f0c6801..a62e547 100644
--- a/rtc_base/bind_unittest.cc
+++ b/rtc_base/bind_unittest.cc
@@ -11,8 +11,8 @@
#include <string>
#include "rtc_base/bind.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/bit_buffer.cc b/rtc_base/bit_buffer.cc
index be72d55..59b71fc 100644
--- a/rtc_base/bit_buffer.cc
+++ b/rtc_base/bit_buffer.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/bitbuffer.h"
+#include "rtc_base/bit_buffer.h"
#include <algorithm>
#include <limits>
diff --git a/rtc_base/bit_buffer.h b/rtc_base/bit_buffer.h
index ba96a12..b03677c 100644
--- a/rtc_base/bit_buffer.h
+++ b/rtc_base/bit_buffer.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_BITBUFFER_H_
-#define RTC_BASE_BITBUFFER_H_
+#ifndef RTC_BASE_BIT_BUFFER_H_
+#define RTC_BASE_BIT_BUFFER_H_
#include <stddef.h> // For size_t.
#include <stdint.h> // For integer types.
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
namespace rtc {
@@ -123,4 +123,4 @@
} // namespace rtc
-#endif // RTC_BASE_BITBUFFER_H_
+#endif // RTC_BASE_BIT_BUFFER_H_
diff --git a/rtc_base/bit_buffer_unittest.cc b/rtc_base/bit_buffer_unittest.cc
index 0696c42..20c0049 100644
--- a/rtc_base/bit_buffer_unittest.cc
+++ b/rtc_base/bit_buffer_unittest.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/bitbuffer.h"
+#include "rtc_base/bit_buffer.h"
#include <limits>
#include "rtc_base/arraysize.h"
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/bitrate_allocation_strategy.cc b/rtc_base/bitrate_allocation_strategy.cc
index 46e6674..af40af4 100644
--- a/rtc_base/bitrate_allocation_strategy.cc
+++ b/rtc_base/bitrate_allocation_strategy.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/bitrateallocationstrategy.h"
+#include "rtc_base/bitrate_allocation_strategy.h"
#include <algorithm>
#include <cstddef>
diff --git a/rtc_base/bitrate_allocation_strategy.h b/rtc_base/bitrate_allocation_strategy.h
index 13a4eee..fc54373 100644
--- a/rtc_base/bitrate_allocation_strategy.h
+++ b/rtc_base/bitrate_allocation_strategy.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_BITRATEALLOCATIONSTRATEGY_H_
-#define RTC_BASE_BITRATEALLOCATIONSTRATEGY_H_
+#ifndef RTC_BASE_BITRATE_ALLOCATION_STRATEGY_H_
+#define RTC_BASE_BITRATE_ALLOCATION_STRATEGY_H_
#include <stdint.h>
#include <string>
@@ -117,4 +117,4 @@
};
} // namespace rtc
-#endif // RTC_BASE_BITRATEALLOCATIONSTRATEGY_H_
+#endif // RTC_BASE_BITRATE_ALLOCATION_STRATEGY_H_
diff --git a/rtc_base/bitrate_allocation_strategy_unittest.cc b/rtc_base/bitrate_allocation_strategy_unittest.cc
index 618a603..aea3966 100644
--- a/rtc_base/bitrate_allocation_strategy_unittest.cc
+++ b/rtc_base/bitrate_allocation_strategy_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/bitrateallocationstrategy.h"
+#include "rtc_base/bitrate_allocation_strategy.h"
#include <cstdint>
diff --git a/rtc_base/buffer_queue.cc b/rtc_base/buffer_queue.cc
index 74f7a50..8f3ead9 100644
--- a/rtc_base/buffer_queue.cc
+++ b/rtc_base/buffer_queue.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/bufferqueue.h"
+#include "rtc_base/buffer_queue.h"
#include <stdint.h>
#include <string.h>
diff --git a/rtc_base/buffer_queue.h b/rtc_base/buffer_queue.h
index 63f5182..bce3c8a 100644
--- a/rtc_base/buffer_queue.h
+++ b/rtc_base/buffer_queue.h
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_BUFFERQUEUE_H_
-#define RTC_BASE_BUFFERQUEUE_H_
+#ifndef RTC_BASE_BUFFER_QUEUE_H_
+#define RTC_BASE_BUFFER_QUEUE_H_
#include <stddef.h>
#include <deque>
#include <vector>
#include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/thread_annotations.h"
namespace rtc {
@@ -60,4 +60,4 @@
} // namespace rtc
-#endif // RTC_BASE_BUFFERQUEUE_H_
+#endif // RTC_BASE_BUFFER_QUEUE_H_
diff --git a/rtc_base/buffer_queue_unittest.cc b/rtc_base/buffer_queue_unittest.cc
index d21e22e..2a2f8cc 100644
--- a/rtc_base/buffer_queue_unittest.cc
+++ b/rtc_base/buffer_queue_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/bufferqueue.h"
+#include "rtc_base/buffer_queue.h"
#include <string.h>
diff --git a/rtc_base/byte_buffer.cc b/rtc_base/byte_buffer.cc
index f8ce1a2..9f79120 100644
--- a/rtc_base/byte_buffer.cc
+++ b/rtc_base/byte_buffer.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
#include <string.h>
diff --git a/rtc_base/byte_buffer.h b/rtc_base/byte_buffer.h
index 4d25c21..73e9040 100644
--- a/rtc_base/byte_buffer.h
+++ b/rtc_base/byte_buffer.h
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_BYTEBUFFER_H_
-#define RTC_BASE_BYTEBUFFER_H_
+#ifndef RTC_BASE_BYTE_BUFFER_H_
+#define RTC_BASE_BYTE_BUFFER_H_
#include <stddef.h>
#include <stdint.h>
#include <string>
#include "rtc_base/buffer.h"
-#include "rtc_base/byteorder.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/byte_order.h"
+#include "rtc_base/constructor_magic.h"
namespace rtc {
@@ -201,4 +201,4 @@
} // namespace rtc
-#endif // RTC_BASE_BYTEBUFFER_H_
+#endif // RTC_BASE_BYTE_BUFFER_H_
diff --git a/rtc_base/byte_buffer_unittest.cc b/rtc_base/byte_buffer_unittest.cc
index 8fb02ff..eafe670 100644
--- a/rtc_base/byte_buffer_unittest.cc
+++ b/rtc_base/byte_buffer_unittest.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
#include <string.h>
#include "rtc_base/arraysize.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/byte_order.h b/rtc_base/byte_order.h
index 86546a5..2b50f0d 100644
--- a/rtc_base/byte_order.h
+++ b/rtc_base/byte_order.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_BYTEORDER_H_
-#define RTC_BASE_BYTEORDER_H_
+#ifndef RTC_BASE_BYTE_ORDER_H_
+#define RTC_BASE_BYTE_ORDER_H_
#include <stdint.h>
@@ -177,4 +177,4 @@
} // namespace rtc
-#endif // RTC_BASE_BYTEORDER_H_
+#endif // RTC_BASE_BYTE_ORDER_H_
diff --git a/rtc_base/byte_order_unittest.cc b/rtc_base/byte_order_unittest.cc
index 7aac17b..82b5fe9 100644
--- a/rtc_base/byte_order_unittest.cc
+++ b/rtc_base/byte_order_unittest.cc
@@ -10,7 +10,7 @@
#include <stdint.h>
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/callback.h b/rtc_base/callback.h
index 65b7c9c..bead5f4 100644
--- a/rtc_base/callback.h
+++ b/rtc_base/callback.h
@@ -62,8 +62,8 @@
#ifndef RTC_BASE_CALLBACK_H_
#define RTC_BASE_CALLBACK_H_
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/scoped_ref_ptr.h"
namespace rtc {
diff --git a/rtc_base/callback.h.pump b/rtc_base/callback.h.pump
index 2c40eab..a8a3faa 100644
--- a/rtc_base/callback.h.pump
+++ b/rtc_base/callback.h.pump
@@ -57,8 +57,8 @@
#ifndef RTC_BASE_CALLBACK_H_
#define RTC_BASE_CALLBACK_H_
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/scoped_ref_ptr.h"
namespace rtc {
diff --git a/rtc_base/callback_unittest.cc b/rtc_base/callback_unittest.cc
index 54480bd..8767295 100644
--- a/rtc_base/callback_unittest.cc
+++ b/rtc_base/callback_unittest.cc
@@ -12,7 +12,7 @@
#include "rtc_base/bind.h"
#include "rtc_base/keep_ref_until_done.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/cancelable_task_handle.cc b/rtc_base/cancelable_task_handle.cc
index 2267242..06c3e80 100644
--- a/rtc_base/cancelable_task_handle.cc
+++ b/rtc_base/cancelable_task_handle.cc
@@ -13,8 +13,8 @@
#include <utility>
#include "rtc_base/checks.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcounter.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counter.h"
#include "rtc_base/sequenced_task_checker.h"
#include "rtc_base/thread_annotations.h"
#include "rtc_base/thread_checker.h"
diff --git a/rtc_base/constructor_magic.h b/rtc_base/constructor_magic.h
index 6b6e83c..e63c2ff 100644
--- a/rtc_base/constructor_magic.h
+++ b/rtc_base/constructor_magic.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_CONSTRUCTORMAGIC_H_
-#define RTC_BASE_CONSTRUCTORMAGIC_H_
+#ifndef RTC_BASE_CONSTRUCTOR_MAGIC_H_
+#define RTC_BASE_CONSTRUCTOR_MAGIC_H_
// Put this in the declarations for a class to be unassignable.
#define RTC_DISALLOW_ASSIGN(TypeName) \
@@ -31,4 +31,4 @@
TypeName() = delete; \
RTC_DISALLOW_COPY_AND_ASSIGN(TypeName)
-#endif // RTC_BASE_CONSTRUCTORMAGIC_H_
+#endif // RTC_BASE_CONSTRUCTOR_MAGIC_H_
diff --git a/rtc_base/copy_on_write_buffer.cc b/rtc_base/copy_on_write_buffer.cc
index 8f5126a..de003f2 100644
--- a/rtc_base/copy_on_write_buffer.cc
+++ b/rtc_base/copy_on_write_buffer.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
#include <stddef.h>
diff --git a/rtc_base/copy_on_write_buffer.h b/rtc_base/copy_on_write_buffer.h
index cc174df..e055f8d 100644
--- a/rtc_base/copy_on_write_buffer.h
+++ b/rtc_base/copy_on_write_buffer.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_COPYONWRITEBUFFER_H_
-#define RTC_BASE_COPYONWRITEBUFFER_H_
+#ifndef RTC_BASE_COPY_ON_WRITE_BUFFER_H_
+#define RTC_BASE_COPY_ON_WRITE_BUFFER_H_
#include <stdint.h>
#include <algorithm>
@@ -20,7 +20,7 @@
#include "rtc_base/buffer.h"
#include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/scoped_ref_ptr.h"
namespace rtc {
@@ -243,4 +243,4 @@
} // namespace rtc
-#endif // RTC_BASE_COPYONWRITEBUFFER_H_
+#endif // RTC_BASE_COPY_ON_WRITE_BUFFER_H_
diff --git a/rtc_base/copy_on_write_buffer_unittest.cc b/rtc_base/copy_on_write_buffer_unittest.cc
index 9062611..fc569bd 100644
--- a/rtc_base/copy_on_write_buffer_unittest.cc
+++ b/rtc_base/copy_on_write_buffer_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
#include <cstdint>
diff --git a/rtc_base/cpu_time.cc b/rtc_base/cpu_time.cc
index 13a68db..b95bcb1 100644
--- a/rtc_base/cpu_time.cc
+++ b/rtc_base/cpu_time.cc
@@ -11,7 +11,7 @@
#include "rtc_base/cpu_time.h"
#include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#if defined(WEBRTC_LINUX)
#include <time.h>
diff --git a/rtc_base/cpu_time_unittest.cc b/rtc_base/cpu_time_unittest.cc
index d362506..b5e0f67 100644
--- a/rtc_base/cpu_time_unittest.cc
+++ b/rtc_base/cpu_time_unittest.cc
@@ -11,7 +11,7 @@
#include "rtc_base/cpu_time.h"
#include "rtc_base/platform_thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "system_wrappers/include/sleep.h"
#include "test/gtest.h"
diff --git a/rtc_base/critical_section.cc b/rtc_base/critical_section.cc
index 4e00be9..72a238f 100644
--- a/rtc_base/critical_section.cc
+++ b/rtc_base/critical_section.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
#include <time.h>
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
#include "rtc_base/checks.h"
#include "rtc_base/platform_thread_types.h"
#include "rtc_base/system/unused.h"
diff --git a/rtc_base/critical_section.h b/rtc_base/critical_section.h
index f25e7d0..f744a5e 100644
--- a/rtc_base/critical_section.h
+++ b/rtc_base/critical_section.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_CRITICALSECTION_H_
-#define RTC_BASE_CRITICALSECTION_H_
+#ifndef RTC_BASE_CRITICAL_SECTION_H_
+#define RTC_BASE_CRITICAL_SECTION_H_
#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/platform_thread_types.h"
#include "rtc_base/thread_annotations.h"
@@ -157,4 +157,4 @@
} // namespace rtc
-#endif // RTC_BASE_CRITICALSECTION_H_
+#endif // RTC_BASE_CRITICAL_SECTION_H_
diff --git a/rtc_base/critical_section_unittest.cc b/rtc_base/critical_section_unittest.cc
index 6357736..e988046 100644
--- a/rtc_base/critical_section_unittest.cc
+++ b/rtc_base/critical_section_unittest.cc
@@ -16,13 +16,13 @@
#include <vector>
#include "rtc_base/arraysize.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
#include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/event.h"
#include "rtc_base/location.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/platform_thread.h"
#include "rtc_base/thread.h"
#include "test/gtest.h"
diff --git a/rtc_base/crypt_string.cc b/rtc_base/crypt_string.cc
index 2c7c0c7..3238255 100644
--- a/rtc_base/crypt_string.cc
+++ b/rtc_base/crypt_string.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/cryptstring.h"
+#include "rtc_base/crypt_string.h"
namespace rtc {
diff --git a/rtc_base/crypt_string.h b/rtc_base/crypt_string.h
index d0e36cb..8aa757c 100644
--- a/rtc_base/crypt_string.h
+++ b/rtc_base/crypt_string.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_CRYPTSTRING_H_
-#define RTC_BASE_CRYPTSTRING_H_
+#ifndef RTC_BASE_CRYPT_STRING_H_
+#define RTC_BASE_CRYPT_STRING_H_
#include <string.h>
@@ -83,4 +83,4 @@
} // namespace rtc
-#endif // RTC_BASE_CRYPTSTRING_H_
+#endif // RTC_BASE_CRYPT_STRING_H_
diff --git a/rtc_base/event_tracer.cc b/rtc_base/event_tracer.cc
index af88c9d..bcc8252 100644
--- a/rtc_base/event_tracer.cc
+++ b/rtc_base/event_tracer.cc
@@ -16,16 +16,16 @@
#include <string>
#include <vector>
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
#include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/event.h"
#include "rtc_base/logging.h"
#include "rtc_base/platform_thread.h"
#include "rtc_base/platform_thread_types.h"
#include "rtc_base/thread_annotations.h"
#include "rtc_base/thread_checker.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "rtc_base/trace_event.h"
// This is a guesstimate that should be enough in most cases.
diff --git a/rtc_base/fake_clock.cc b/rtc_base/fake_clock.cc
index f63b85c..6b7d96b 100644
--- a/rtc_base/fake_clock.cc
+++ b/rtc_base/fake_clock.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
#include "rtc_base/checks.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/message_queue.h"
namespace rtc {
diff --git a/rtc_base/fake_clock.h b/rtc_base/fake_clock.h
index 5a0bbee..5ccf370 100644
--- a/rtc_base/fake_clock.h
+++ b/rtc_base/fake_clock.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_FAKECLOCK_H_
-#define RTC_BASE_FAKECLOCK_H_
+#ifndef RTC_BASE_FAKE_CLOCK_H_
+#define RTC_BASE_FAKE_CLOCK_H_
#include <stdint.h>
#include "api/units/time_delta.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/thread_annotations.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace rtc {
@@ -72,4 +72,4 @@
} // namespace rtc
-#endif // RTC_BASE_FAKECLOCK_H_
+#endif // RTC_BASE_FAKE_CLOCK_H_
diff --git a/rtc_base/fake_network.h b/rtc_base/fake_network.h
index 98c6217..196d43e 100644
--- a/rtc_base/fake_network.h
+++ b/rtc_base/fake_network.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_FAKENETWORK_H_
-#define RTC_BASE_FAKENETWORK_H_
+#ifndef RTC_BASE_FAKE_NETWORK_H_
+#define RTC_BASE_FAKE_NETWORK_H_
#include <memory>
#include <string>
@@ -19,10 +19,10 @@
#include "absl/memory/memory.h"
#include "rtc_base/checks.h"
#include "rtc_base/fake_mdns_responder.h"
-#include "rtc_base/messagehandler.h"
+#include "rtc_base/message_handler.h"
#include "rtc_base/network.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/string_encode.h"
#include "rtc_base/thread.h"
namespace rtc {
@@ -139,4 +139,4 @@
} // namespace rtc
-#endif // RTC_BASE_FAKENETWORK_H_
+#endif // RTC_BASE_FAKE_NETWORK_H_
diff --git a/rtc_base/fake_ssl_identity.cc b/rtc_base/fake_ssl_identity.cc
index 4799679..8607e0a 100644
--- a/rtc_base/fake_ssl_identity.cc
+++ b/rtc_base/fake_ssl_identity.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/fakesslidentity.h"
+#include "rtc_base/fake_ssl_identity.h"
#include <string>
#include <utility>
#include "absl/memory/memory.h"
#include "rtc_base/checks.h"
-#include "rtc_base/messagedigest.h"
+#include "rtc_base/message_digest.h"
namespace rtc {
diff --git a/rtc_base/fake_ssl_identity.h b/rtc_base/fake_ssl_identity.h
index b19cbfb..c3a8d1f 100644
--- a/rtc_base/fake_ssl_identity.h
+++ b/rtc_base/fake_ssl_identity.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_FAKESSLIDENTITY_H_
-#define RTC_BASE_FAKESSLIDENTITY_H_
+#ifndef RTC_BASE_FAKE_SSL_IDENTITY_H_
+#define RTC_BASE_FAKE_SSL_IDENTITY_H_
#include <memory>
#include <vector>
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_identity.h"
namespace rtc {
@@ -78,4 +78,4 @@
} // namespace rtc
-#endif // RTC_BASE_FAKESSLIDENTITY_H_
+#endif // RTC_BASE_FAKE_SSL_IDENTITY_H_
diff --git a/rtc_base/file.h b/rtc_base/file.h
index bc0974a..42428fa 100644
--- a/rtc_base/file.h
+++ b/rtc_base/file.h
@@ -15,7 +15,7 @@
#include <stdint.h>
#include <string>
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/platform_file.h"
namespace rtc {
diff --git a/rtc_base/file_rotating_stream.cc b/rtc_base/file_rotating_stream.cc
index fc87acb..01429b6 100644
--- a/rtc_base/file_rotating_stream.cc
+++ b/rtc_base/file_rotating_stream.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/filerotatingstream.h"
+#include "rtc_base/file_rotating_stream.h"
#include <algorithm>
#include <cstdio>
@@ -17,7 +17,7 @@
#if defined(WEBRTC_WIN)
#include <windows.h>
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
#else
#include <dirent.h>
#include <sys/stat.h>
diff --git a/rtc_base/file_rotating_stream.h b/rtc_base/file_rotating_stream.h
index 5560f3b..bda1ee1 100644
--- a/rtc_base/file_rotating_stream.h
+++ b/rtc_base/file_rotating_stream.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_FILEROTATINGSTREAM_H_
-#define RTC_BASE_FILEROTATINGSTREAM_H_
+#ifndef RTC_BASE_FILE_ROTATING_STREAM_H_
+#define RTC_BASE_FILE_ROTATING_STREAM_H_
#include <stddef.h>
#include <memory>
#include <string>
#include <vector>
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/stream.h"
namespace rtc {
@@ -178,4 +178,4 @@
} // namespace rtc
-#endif // RTC_BASE_FILEROTATINGSTREAM_H_
+#endif // RTC_BASE_FILE_ROTATING_STREAM_H_
diff --git a/rtc_base/file_rotating_stream_unittest.cc b/rtc_base/file_rotating_stream_unittest.cc
index 63ddc96..214cde9 100644
--- a/rtc_base/file_rotating_stream_unittest.cc
+++ b/rtc_base/file_rotating_stream_unittest.cc
@@ -13,9 +13,9 @@
#include <memory>
#include "rtc_base/arraysize.h"
-#include "rtc_base/filerotatingstream.h"
+#include "rtc_base/file_rotating_stream.h"
#include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
namespace rtc {
diff --git a/rtc_base/file_unittest.cc b/rtc_base/file_unittest.cc
index 151771b..bd3a61b 100644
--- a/rtc_base/file_unittest.cc
+++ b/rtc_base/file_unittest.cc
@@ -13,7 +13,7 @@
#include "rtc_base/file.h"
#include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
#if defined(WEBRTC_WIN)
diff --git a/rtc_base/firewall_socket_server.cc b/rtc_base/firewall_socket_server.cc
index 0552481..ec5a857 100644
--- a/rtc_base/firewall_socket_server.cc
+++ b/rtc_base/firewall_socket_server.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/firewallsocketserver.h"
+#include "rtc_base/firewall_socket_server.h"
#include <errno.h>
#include <stddef.h>
@@ -16,7 +16,7 @@
#include <algorithm>
#include <string>
-#include "rtc_base/asyncsocket.h"
+#include "rtc_base/async_socket.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
diff --git a/rtc_base/firewall_socket_server.h b/rtc_base/firewall_socket_server.h
index 64a4311..9536bd2 100644
--- a/rtc_base/firewall_socket_server.h
+++ b/rtc_base/firewall_socket_server.h
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_FIREWALLSOCKETSERVER_H_
-#define RTC_BASE_FIREWALLSOCKETSERVER_H_
+#ifndef RTC_BASE_FIREWALL_SOCKET_SERVER_H_
+#define RTC_BASE_FIREWALL_SOCKET_SERVER_H_
#include <vector>
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/ip_address.h"
#include "rtc_base/socket.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/socket_server.h"
namespace rtc {
@@ -129,4 +129,4 @@
} // namespace rtc
-#endif // RTC_BASE_FIREWALLSOCKETSERVER_H_
+#endif // RTC_BASE_FIREWALL_SOCKET_SERVER_H_
diff --git a/rtc_base/flags.cc b/rtc_base/flags.cc
index bcce0da..6a87eb4 100644
--- a/rtc_base/flags.cc
+++ b/rtc_base/flags.cc
@@ -23,7 +23,7 @@
#include <shellapi.h> // must come after windows.h
// clang-format on
-#include "rtc_base/stringutils.h" // For ToUtf8
+#include "rtc_base/string_utils.h" // For ToUtf8
#endif
namespace {
diff --git a/rtc_base/flags.h b/rtc_base/flags.h
index a08bfd2..e152e2a 100644
--- a/rtc_base/flags.h
+++ b/rtc_base/flags.h
@@ -25,7 +25,7 @@
#include "rtc_base/checks.h"
#if defined(WEBRTC_WIN)
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#endif
namespace rtc {
diff --git a/rtc_base/gunit.h b/rtc_base/gunit.h
index 7f23fbb..d499125 100644
--- a/rtc_base/gunit.h
+++ b/rtc_base/gunit.h
@@ -11,7 +11,7 @@
#ifndef RTC_BASE_GUNIT_H_
#define RTC_BASE_GUNIT_H_
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
#include "rtc_base/logging.h"
#include "rtc_base/thread.h"
#include "test/gtest.h"
diff --git a/rtc_base/http_common.cc b/rtc_base/http_common.cc
index 4640363..0456eea 100644
--- a/rtc_base/http_common.cc
+++ b/rtc_base/http_common.cc
@@ -25,11 +25,11 @@
#include <vector>
#include "absl/strings/match.h"
-#include "rtc_base/cryptstring.h" // for CryptString
-#include "rtc_base/httpcommon.h"
+#include "rtc_base/crypt_string.h" // for CryptString
+#include "rtc_base/http_common.h"
#include "rtc_base/logging.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/socket_address.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/third_party/base64/base64.h" // for Base64
#include "rtc_base/zero_memory.h" // for ExplicitZeroMemory
diff --git a/rtc_base/http_common.h b/rtc_base/http_common.h
index fbad280..edf161f 100644
--- a/rtc_base/http_common.h
+++ b/rtc_base/http_common.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_HTTPCOMMON_H_
-#define RTC_BASE_HTTPCOMMON_H_
+#ifndef RTC_BASE_HTTP_COMMON_H_
+#define RTC_BASE_HTTP_COMMON_H_
#include <string>
@@ -49,4 +49,4 @@
} // namespace rtc
-#endif // RTC_BASE_HTTPCOMMON_H_
+#endif // RTC_BASE_HTTP_COMMON_H_
diff --git a/rtc_base/ifaddrs_android.cc b/rtc_base/ifaddrs_android.cc
index cc6cdab..94b8669 100644
--- a/rtc_base/ifaddrs_android.cc
+++ b/rtc_base/ifaddrs_android.cc
@@ -9,7 +9,7 @@
*/
#if defined(WEBRTC_ANDROID)
-#include "rtc_base/ifaddrs-android.h"
+#include "rtc_base/ifaddrs_android.h"
#include <errno.h>
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
diff --git a/rtc_base/ifaddrs_converter.h b/rtc_base/ifaddrs_converter.h
index 35bef5b..bd6957d 100644
--- a/rtc_base/ifaddrs_converter.h
+++ b/rtc_base/ifaddrs_converter.h
@@ -12,12 +12,12 @@
#define RTC_BASE_IFADDRS_CONVERTER_H_
#if defined(WEBRTC_ANDROID)
-#include "rtc_base/ifaddrs-android.h"
+#include "rtc_base/ifaddrs_android.h"
#else
#include <ifaddrs.h>
#endif // WEBRTC_ANDROID
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
namespace rtc {
diff --git a/rtc_base/ip_address.cc b/rtc_base/ip_address.cc
index 027a7b2..ff0be13 100644
--- a/rtc_base/ip_address.cc
+++ b/rtc_base/ip_address.cc
@@ -20,10 +20,10 @@
#include <netdb.h>
#endif
-#include "rtc_base/byteorder.h"
-#include "rtc_base/ipaddress.h"
-#include "rtc_base/nethelpers.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/byte_order.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/net_helpers.h"
+#include "rtc_base/string_utils.h"
#if defined(WEBRTC_WIN)
#include "rtc_base/win32.h"
diff --git a/rtc_base/ip_address.h b/rtc_base/ip_address.h
index 8189d1f..49dea68 100644
--- a/rtc_base/ip_address.h
+++ b/rtc_base/ip_address.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_IPADDRESS_H_
-#define RTC_BASE_IPADDRESS_H_
+#ifndef RTC_BASE_IP_ADDRESS_H_
+#define RTC_BASE_IP_ADDRESS_H_
#if defined(WEBRTC_POSIX)
#include <arpa/inet.h>
@@ -24,7 +24,7 @@
#include <string.h>
#include <string>
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
#if defined(WEBRTC_WIN)
#include "rtc_base/win32.h"
#endif
@@ -189,4 +189,4 @@
} // namespace rtc
-#endif // RTC_BASE_IPADDRESS_H_
+#endif // RTC_BASE_IP_ADDRESS_H_
diff --git a/rtc_base/ip_address_unittest.cc b/rtc_base/ip_address_unittest.cc
index 6ac1a40..c93244d 100644
--- a/rtc_base/ip_address_unittest.cc
+++ b/rtc_base/ip_address_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
#include "test/gtest.h"
diff --git a/rtc_base/keep_ref_until_done.h b/rtc_base/keep_ref_until_done.h
index 9ba0e87..feb1e90 100644
--- a/rtc_base/keep_ref_until_done.h
+++ b/rtc_base/keep_ref_until_done.h
@@ -13,7 +13,7 @@
#include "rtc_base/bind.h"
#include "rtc_base/callback.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
#include "rtc_base/scoped_ref_ptr.h"
namespace rtc {
diff --git a/rtc_base/key_derivation.h b/rtc_base/key_derivation.h
index d98c667..f35e7ff 100644
--- a/rtc_base/key_derivation.h
+++ b/rtc_base/key_derivation.h
@@ -18,7 +18,7 @@
#include "absl/types/optional.h"
#include "api/array_view.h"
#include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
namespace rtc {
diff --git a/rtc_base/log_sinks.cc b/rtc_base/log_sinks.cc
index c01bafb..db12e9f 100644
--- a/rtc_base/log_sinks.cc
+++ b/rtc_base/log_sinks.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/logsinks.h"
+#include "rtc_base/log_sinks.h"
#include <string.h>
#include <cstdio>
diff --git a/rtc_base/log_sinks.h b/rtc_base/log_sinks.h
index d0867a2..9e35748 100644
--- a/rtc_base/log_sinks.h
+++ b/rtc_base/log_sinks.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_LOGSINKS_H_
-#define RTC_BASE_LOGSINKS_H_
+#ifndef RTC_BASE_LOG_SINKS_H_
+#define RTC_BASE_LOG_SINKS_H_
#include <stddef.h>
#include <memory>
#include <string>
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/filerotatingstream.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/file_rotating_stream.h"
#include "rtc_base/logging.h"
namespace rtc {
@@ -69,4 +69,4 @@
} // namespace rtc
-#endif // RTC_BASE_LOGSINKS_H_
+#endif // RTC_BASE_LOG_SINKS_H_
diff --git a/rtc_base/logging.cc b/rtc_base/logging.cc
index f7b0627..74128fb 100644
--- a/rtc_base/logging.cc
+++ b/rtc_base/logging.cc
@@ -35,14 +35,14 @@
#include <vector>
#include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/logging.h"
#include "rtc_base/platform_thread_types.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
+#include "rtc_base/string_utils.h"
#include "rtc_base/strings/string_builder.h"
-#include "rtc_base/stringutils.h"
#include "rtc_base/thread_annotations.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace rtc {
namespace {
diff --git a/rtc_base/logging.h b/rtc_base/logging.h
index 6dd2648..b46aa2d 100644
--- a/rtc_base/logging.h
+++ b/rtc_base/logging.h
@@ -52,7 +52,7 @@
#include <utility>
#include "absl/strings/string_view.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/deprecation.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/system/inline.h"
diff --git a/rtc_base/logging_unittest.cc b/rtc_base/logging_unittest.cc
index a7945f2..bbeac44 100644
--- a/rtc_base/logging_unittest.cc
+++ b/rtc_base/logging_unittest.cc
@@ -18,7 +18,7 @@
#include "rtc_base/event.h"
#include "rtc_base/platform_thread.h"
#include "rtc_base/stream.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/mac_utils.cc b/rtc_base/mac_utils.cc
index 67fb69c..390f183 100644
--- a/rtc_base/mac_utils.cc
+++ b/rtc_base/mac_utils.cc
@@ -15,7 +15,7 @@
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/macutils.h"
+#include "rtc_base/mac_utils.h"
namespace rtc {
diff --git a/rtc_base/mac_utils.h b/rtc_base/mac_utils.h
index b22e5f9..ae97c3a 100644
--- a/rtc_base/mac_utils.h
+++ b/rtc_base/mac_utils.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_MACUTILS_H_
-#define RTC_BASE_MACUTILS_H_
+#ifndef RTC_BASE_MAC_UTILS_H_
+#define RTC_BASE_MAC_UTILS_H_
#include <CoreFoundation/CoreFoundation.h>
#include <string>
@@ -19,4 +19,4 @@
bool ToUtf16(const std::string& str8, CFStringRef* str16);
} // namespace rtc
-#endif // RTC_BASE_MACUTILS_H_
+#endif // RTC_BASE_MAC_UTILS_H_
diff --git a/rtc_base/mdns_responder_interface.h b/rtc_base/mdns_responder_interface.h
index 71938b2..96280a7 100644
--- a/rtc_base/mdns_responder_interface.h
+++ b/rtc_base/mdns_responder_interface.h
@@ -14,7 +14,7 @@
#include <functional>
#include <string>
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
namespace webrtc {
diff --git a/rtc_base/message_buffer_reader.h b/rtc_base/message_buffer_reader.h
index baba89e..32b8f33 100644
--- a/rtc_base/message_buffer_reader.h
+++ b/rtc_base/message_buffer_reader.h
@@ -11,7 +11,7 @@
#ifndef RTC_BASE_MESSAGE_BUFFER_READER_H_
#define RTC_BASE_MESSAGE_BUFFER_READER_H_
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
namespace webrtc {
diff --git a/rtc_base/message_digest.cc b/rtc_base/message_digest.cc
index 5a0d16a..b1d4a48 100644
--- a/rtc_base/message_digest.cc
+++ b/rtc_base/message_digest.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/messagedigest.h"
+#include "rtc_base/message_digest.h"
#include <string.h>
#include <cstdint>
#include <memory>
-#include "rtc_base/openssldigest.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/openssl_digest.h"
+#include "rtc_base/string_encode.h"
namespace rtc {
diff --git a/rtc_base/message_digest.h b/rtc_base/message_digest.h
index 757f914..bbb22cf 100644
--- a/rtc_base/message_digest.h
+++ b/rtc_base/message_digest.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_MESSAGEDIGEST_H_
-#define RTC_BASE_MESSAGEDIGEST_H_
+#ifndef RTC_BASE_MESSAGE_DIGEST_H_
+#define RTC_BASE_MESSAGE_DIGEST_H_
#include <stddef.h>
#include <string>
@@ -126,4 +126,4 @@
} // namespace rtc
-#endif // RTC_BASE_MESSAGEDIGEST_H_
+#endif // RTC_BASE_MESSAGE_DIGEST_H_
diff --git a/rtc_base/message_digest_unittest.cc b/rtc_base/message_digest_unittest.cc
index 623fafb..85e9bbd 100644
--- a/rtc_base/message_digest_unittest.cc
+++ b/rtc_base/message_digest_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/messagedigest.h"
+#include "rtc_base/message_digest.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/message_handler.cc b/rtc_base/message_handler.cc
index 7376def..0e6c237 100644
--- a/rtc_base/message_handler.cc
+++ b/rtc_base/message_handler.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
namespace rtc {
diff --git a/rtc_base/message_handler.h b/rtc_base/message_handler.h
index 67a3103..015255e 100644
--- a/rtc_base/message_handler.h
+++ b/rtc_base/message_handler.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_MESSAGEHANDLER_H_
-#define RTC_BASE_MESSAGEHANDLER_H_
+#ifndef RTC_BASE_MESSAGE_HANDLER_H_
+#define RTC_BASE_MESSAGE_HANDLER_H_
#include <utility>
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
namespace rtc {
@@ -67,4 +67,4 @@
} // namespace rtc
-#endif // RTC_BASE_MESSAGEHANDLER_H_
+#endif // RTC_BASE_MESSAGE_HANDLER_H_
diff --git a/rtc_base/message_queue.cc b/rtc_base/message_queue.cc
index 204952a..abb01b3 100644
--- a/rtc_base/message_queue.cc
+++ b/rtc_base/message_queue.cc
@@ -11,12 +11,12 @@
#include <string>
#include <utility>
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/message_queue.h"
#include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "rtc_base/trace_event.h"
namespace rtc {
diff --git a/rtc_base/message_queue.h b/rtc_base/message_queue.h
index c1b9b5a..e484561 100644
--- a/rtc_base/message_queue.h
+++ b/rtc_base/message_queue.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_MESSAGEQUEUE_H_
-#define RTC_BASE_MESSAGEQUEUE_H_
+#ifndef RTC_BASE_MESSAGE_QUEUE_H_
+#define RTC_BASE_MESSAGE_QUEUE_H_
#include <string.h>
@@ -19,12 +19,12 @@
#include <queue>
#include <vector>
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/location.h"
-#include "rtc_base/messagehandler.h"
+#include "rtc_base/message_handler.h"
#include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/socket_server.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread_annotations.h"
@@ -330,4 +330,4 @@
} // namespace rtc
-#endif // RTC_BASE_MESSAGEQUEUE_H_
+#endif // RTC_BASE_MESSAGE_QUEUE_H_
diff --git a/rtc_base/message_queue_unittest.cc b/rtc_base/message_queue_unittest.cc
index d04d753..657949c 100644
--- a/rtc_base/message_queue_unittest.cc
+++ b/rtc_base/message_queue_unittest.cc
@@ -8,20 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/message_queue.h"
#include <functional>
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
#include "rtc_base/bind.h"
#include "rtc_base/event.h"
#include "rtc_base/gunit.h"
#include "rtc_base/logging.h"
-#include "rtc_base/nullsocketserver.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/null_socket_server.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace rtc {
namespace {
diff --git a/rtc_base/nat_server.cc b/rtc_base/nat_server.cc
index b005eca..2b614e8 100644
--- a/rtc_base/nat_server.cc
+++ b/rtc_base/nat_server.cc
@@ -12,9 +12,9 @@
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/natserver.h"
-#include "rtc_base/natsocketfactory.h"
-#include "rtc_base/socketadapters.h"
+#include "rtc_base/nat_server.h"
+#include "rtc_base/nat_socket_factory.h"
+#include "rtc_base/socket_adapters.h"
namespace rtc {
diff --git a/rtc_base/nat_server.h b/rtc_base/nat_server.h
index d16b537..46f01e9 100644
--- a/rtc_base/nat_server.h
+++ b/rtc_base/nat_server.h
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_NATSERVER_H_
-#define RTC_BASE_NATSERVER_H_
+#ifndef RTC_BASE_NAT_SERVER_H_
+#define RTC_BASE_NAT_SERVER_H_
#include <map>
#include <set>
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/nattypes.h"
-#include "rtc_base/proxyserver.h"
-#include "rtc_base/socketaddresspair.h"
-#include "rtc_base/socketfactory.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/nat_types.h"
+#include "rtc_base/proxy_server.h"
+#include "rtc_base/socket_address_pair.h"
+#include "rtc_base/socket_factory.h"
#include "rtc_base/thread.h"
namespace rtc {
@@ -126,4 +126,4 @@
} // namespace rtc
-#endif // RTC_BASE_NATSERVER_H_
+#endif // RTC_BASE_NAT_SERVER_H_
diff --git a/rtc_base/nat_socket_factory.cc b/rtc_base/nat_socket_factory.cc
index a707ce0..6d44651 100644
--- a/rtc_base/nat_socket_factory.cc
+++ b/rtc_base/nat_socket_factory.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/natsocketfactory.h"
+#include "rtc_base/nat_socket_factory.h"
#include "rtc_base/arraysize.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/natserver.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/nat_server.h"
+#include "rtc_base/virtual_socket_server.h"
namespace rtc {
diff --git a/rtc_base/nat_socket_factory.h b/rtc_base/nat_socket_factory.h
index ecbd2f8..9b5cb5a 100644
--- a/rtc_base/nat_socket_factory.h
+++ b/rtc_base/nat_socket_factory.h
@@ -8,23 +8,23 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_NATSOCKETFACTORY_H_
-#define RTC_BASE_NATSOCKETFACTORY_H_
+#ifndef RTC_BASE_NAT_SOCKET_FACTORY_H_
+#define RTC_BASE_NAT_SOCKET_FACTORY_H_
#include <stddef.h>
#include <map>
#include <memory>
#include <set>
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/natserver.h"
-#include "rtc_base/nattypes.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/nat_server.h"
+#include "rtc_base/nat_types.h"
#include "rtc_base/socket.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/socketfactory.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/socket_factory.h"
+#include "rtc_base/socket_server.h"
namespace rtc {
@@ -175,4 +175,4 @@
SocketAddress* remote_addr);
} // namespace rtc
-#endif // RTC_BASE_NATSOCKETFACTORY_H_
+#endif // RTC_BASE_NAT_SOCKET_FACTORY_H_
diff --git a/rtc_base/nat_types.cc b/rtc_base/nat_types.cc
index a7af57d..50d7de0 100644
--- a/rtc_base/nat_types.cc
+++ b/rtc_base/nat_types.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/nattypes.h"
+#include "rtc_base/nat_types.h"
#include "rtc_base/checks.h"
diff --git a/rtc_base/nat_types.h b/rtc_base/nat_types.h
index 1d816ac..60e7fbd 100644
--- a/rtc_base/nat_types.h
+++ b/rtc_base/nat_types.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_NATTYPES_H_
-#define RTC_BASE_NATTYPES_H_
+#ifndef RTC_BASE_NAT_TYPES_H_
+#define RTC_BASE_NAT_TYPES_H_
namespace rtc {
@@ -44,4 +44,4 @@
} // namespace rtc
-#endif // RTC_BASE_NATTYPES_H_
+#endif // RTC_BASE_NAT_TYPES_H_
diff --git a/rtc_base/nat_unittest.cc b/rtc_base/nat_unittest.cc
index 731bba6..95504c2 100644
--- a/rtc_base/nat_unittest.cc
+++ b/rtc_base/nat_unittest.cc
@@ -15,26 +15,26 @@
#include <vector>
#include "absl/memory/memory.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/asynctcpsocket.h"
-#include "rtc_base/asyncudpsocket.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/async_tcp_socket.h"
+#include "rtc_base/async_udp_socket.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/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_helpers.h"
#include "rtc_base/network.h"
-#include "rtc_base/physicalsocketserver.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/socketfactory.h"
-#include "rtc_base/socketserver.h"
-#include "rtc_base/testclient.h"
+#include "rtc_base/physical_socket_server.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/socket_factory.h"
+#include "rtc_base/socket_server.h"
+#include "rtc_base/test_client.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 rtc {
diff --git a/rtc_base/net_helper.cc b/rtc_base/net_helper.cc
index e654fe3..7dcb599 100644
--- a/rtc_base/net_helper.cc
+++ b/rtc_base/net_helper.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/nethelper.h"
+#include "rtc_base/net_helper.h"
#include "rtc_base/checks.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
namespace cricket {
diff --git a/rtc_base/net_helper.h b/rtc_base/net_helper.h
index f956138..e42502b 100644
--- a/rtc_base/net_helper.h
+++ b/rtc_base/net_helper.h
@@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_NETHELPER_H_
-#define RTC_BASE_NETHELPER_H_
+#ifndef RTC_BASE_NET_HELPER_H_
+#define RTC_BASE_NET_HELPER_H_
#include <string>
@@ -29,4 +29,4 @@
} // namespace cricket
-#endif // RTC_BASE_NETHELPER_H_
+#endif // RTC_BASE_NET_HELPER_H_
diff --git a/rtc_base/net_helpers.cc b/rtc_base/net_helpers.cc
index 1bba3b4..c662f1a 100644
--- a/rtc_base/net_helpers.cc
+++ b/rtc_base/net_helpers.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/net_helpers.h"
#include <memory>
@@ -19,14 +19,14 @@
#endif
#if defined(WEBRTC_POSIX) && !defined(__native_client__)
#if defined(WEBRTC_ANDROID)
-#include "rtc_base/ifaddrs-android.h"
+#include "rtc_base/ifaddrs_android.h"
#else
#include <ifaddrs.h>
#endif
#endif // defined(WEBRTC_POSIX) && !defined(__native_client__)
#include "rtc_base/logging.h"
-#include "rtc_base/signalthread.h"
+#include "rtc_base/signal_thread.h"
#include "rtc_base/third_party/sigslot/sigslot.h" // for signal_with_thread...
namespace rtc {
diff --git a/rtc_base/net_helpers.h b/rtc_base/net_helpers.h
index 138f958..6f75318 100644
--- a/rtc_base/net_helpers.h
+++ b/rtc_base/net_helpers.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_NETHELPERS_H_
-#define RTC_BASE_NETHELPERS_H_
+#ifndef RTC_BASE_NET_HELPERS_H_
+#define RTC_BASE_NET_HELPERS_H_
#if defined(WEBRTC_POSIX)
#include <sys/socket.h>
@@ -19,10 +19,10 @@
#include <vector>
-#include "rtc_base/asyncresolverinterface.h"
-#include "rtc_base/ipaddress.h"
-#include "rtc_base/signalthread.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/async_resolver_interface.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/signal_thread.h"
+#include "rtc_base/socket_address.h"
namespace rtc {
@@ -60,4 +60,4 @@
bool HasIPv6Enabled();
} // namespace rtc
-#endif // RTC_BASE_NETHELPERS_H_
+#endif // RTC_BASE_NET_HELPERS_H_
diff --git a/rtc_base/network.cc b/rtc_base/network.cc
index 5c7b019..c62c3ce 100644
--- a/rtc_base/network.cc
+++ b/rtc_base/network.cc
@@ -36,11 +36,11 @@
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/networkmonitor.h"
+#include "rtc_base/network_monitor.h"
#include "rtc_base/socket.h" // includes something that makes windows happy
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
+#include "rtc_base/string_utils.h"
#include "rtc_base/strings/string_builder.h"
-#include "rtc_base/stringutils.h"
#include "rtc_base/thread.h"
namespace rtc {
diff --git a/rtc_base/network.h b/rtc_base/network.h
index 8b1a5fc..b5772a8 100644
--- a/rtc_base/network.h
+++ b/rtc_base/network.h
@@ -19,10 +19,10 @@
#include <string>
#include <vector>
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
#include "rtc_base/mdns_responder_interface.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/networkmonitor.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/network_monitor.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#if defined(WEBRTC_POSIX)
diff --git a/rtc_base/network_monitor.cc b/rtc_base/network_monitor.cc
index 0185eab..4eb5290 100644
--- a/rtc_base/network_monitor.cc
+++ b/rtc_base/network_monitor.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/networkmonitor.h"
+#include "rtc_base/network_monitor.h"
#include <stdint.h>
diff --git a/rtc_base/network_monitor.h b/rtc_base/network_monitor.h
index 1ad7663..ed4464d 100644
--- a/rtc_base/network_monitor.h
+++ b/rtc_base/network_monitor.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_NETWORKMONITOR_H_
-#define RTC_BASE_NETWORKMONITOR_H_
+#ifndef RTC_BASE_NETWORK_MONITOR_H_
+#define RTC_BASE_NETWORK_MONITOR_H_
#include "rtc_base/network_constants.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
@@ -120,4 +120,4 @@
} // namespace rtc
-#endif // RTC_BASE_NETWORKMONITOR_H_
+#endif // RTC_BASE_NETWORK_MONITOR_H_
diff --git a/rtc_base/network_route.h b/rtc_base/network_route.h
index be02731..6a8f183 100644
--- a/rtc_base/network_route.h
+++ b/rtc_base/network_route.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_NETWORKROUTE_H_
-#define RTC_BASE_NETWORKROUTE_H_
+#ifndef RTC_BASE_NETWORK_ROUTE_H_
+#define RTC_BASE_NETWORK_ROUTE_H_
#include <stdint.h>
@@ -30,4 +30,4 @@
};
} // namespace rtc
-#endif // RTC_BASE_NETWORKROUTE_H_
+#endif // RTC_BASE_NETWORK_ROUTE_H_
diff --git a/rtc_base/network_unittest.cc b/rtc_base/network_unittest.cc
index cf1cecc..b1a5da6 100644
--- a/rtc_base/network_unittest.cc
+++ b/rtc_base/network_unittest.cc
@@ -16,8 +16,8 @@
#include <vector>
#include "rtc_base/checks.h"
-#include "rtc_base/nethelpers.h"
-#include "rtc_base/networkmonitor.h"
+#include "rtc_base/net_helpers.h"
+#include "rtc_base/network_monitor.h"
#if defined(WEBRTC_POSIX)
#include <net/if.h>
#include <sys/types.h>
diff --git a/rtc_base/null_socket_server.cc b/rtc_base/null_socket_server.cc
index ec042dd..f446b3d 100644
--- a/rtc_base/null_socket_server.cc
+++ b/rtc_base/null_socket_server.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/nullsocketserver.h"
+#include "rtc_base/null_socket_server.h"
#include "rtc_base/checks.h"
namespace rtc {
diff --git a/rtc_base/null_socket_server.h b/rtc_base/null_socket_server.h
index 47a7fa6..da22c79 100644
--- a/rtc_base/null_socket_server.h
+++ b/rtc_base/null_socket_server.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_NULLSOCKETSERVER_H_
-#define RTC_BASE_NULLSOCKETSERVER_H_
+#ifndef RTC_BASE_NULL_SOCKET_SERVER_H_
+#define RTC_BASE_NULL_SOCKET_SERVER_H_
-#include "rtc_base/asyncsocket.h"
+#include "rtc_base/async_socket.h"
#include "rtc_base/event.h"
#include "rtc_base/socket.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/socket_server.h"
namespace rtc {
@@ -35,4 +35,4 @@
} // namespace rtc
-#endif // RTC_BASE_NULLSOCKETSERVER_H_
+#endif // RTC_BASE_NULL_SOCKET_SERVER_H_
diff --git a/rtc_base/null_socket_server_unittest.cc b/rtc_base/null_socket_server_unittest.cc
index 5d4a251..8268911 100644
--- a/rtc_base/null_socket_server_unittest.cc
+++ b/rtc_base/null_socket_server_unittest.cc
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/nullsocketserver.h"
+#include "rtc_base/null_socket_server.h"
#include <stdint.h>
#include <memory>
#include "rtc_base/gunit.h"
#include "rtc_base/location.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"
namespace rtc {
diff --git a/rtc_base/numerics/math_utils.h b/rtc_base/numerics/math_utils.h
index 5036c8f..8a91958 100644
--- a/rtc_base/numerics/math_utils.h
+++ b/rtc_base/numerics/math_utils.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_NUMERICS_MATHUTILS_H_
-#define RTC_BASE_NUMERICS_MATHUTILS_H_
+#ifndef RTC_BASE_NUMERICS_MATH_UTILS_H_
+#define RTC_BASE_NUMERICS_MATH_UTILS_H_
#include <math.h>
#include <type_traits>
@@ -36,4 +36,4 @@
return static_cast<unsigned_type>(x) - static_cast<unsigned_type>(y);
}
-#endif // RTC_BASE_NUMERICS_MATHUTILS_H_
+#endif // RTC_BASE_NUMERICS_MATH_UTILS_H_
diff --git a/rtc_base/numerics/moving_max_counter.h b/rtc_base/numerics/moving_max_counter.h
index 6c6286d..ca956e9 100644
--- a/rtc_base/numerics/moving_max_counter.h
+++ b/rtc_base/numerics/moving_max_counter.h
@@ -19,7 +19,7 @@
#include "absl/types/optional.h"
#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
namespace rtc {
diff --git a/rtc_base/numerics/moving_median_filter.h b/rtc_base/numerics/moving_median_filter.h
index dba3cd2..b4d8741 100644
--- a/rtc_base/numerics/moving_median_filter.h
+++ b/rtc_base/numerics/moving_median_filter.h
@@ -15,7 +15,7 @@
#include <list>
#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/numerics/percentile_filter.h"
namespace webrtc {
diff --git a/rtc_base/numerics/percentile_filter_unittest.cc b/rtc_base/numerics/percentile_filter_unittest.cc
index 66121e4..a4cb317 100644
--- a/rtc_base/numerics/percentile_filter_unittest.cc
+++ b/rtc_base/numerics/percentile_filter_unittest.cc
@@ -14,7 +14,7 @@
#include <cstdint>
#include <random>
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/numerics/percentile_filter.h"
#include "test/gtest.h"
diff --git a/rtc_base/one_time_event.h b/rtc_base/one_time_event.h
index f649f15..c5ccbf6 100644
--- a/rtc_base/one_time_event.h
+++ b/rtc_base/one_time_event.h
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_ONETIMEEVENT_H_
-#define RTC_BASE_ONETIMEEVENT_H_
+#ifndef RTC_BASE_ONE_TIME_EVENT_H_
+#define RTC_BASE_ONE_TIME_EVENT_H_
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
namespace webrtc {
// Provides a simple way to perform an operation (such as logging) one
@@ -57,4 +57,4 @@
} // namespace webrtc
-#endif // RTC_BASE_ONETIMEEVENT_H_
+#endif // RTC_BASE_ONE_TIME_EVENT_H_
diff --git a/rtc_base/one_time_event_unittest.cc b/rtc_base/one_time_event_unittest.cc
index 2334cb5..39fd8f9 100644
--- a/rtc_base/one_time_event_unittest.cc
+++ b/rtc_base/one_time_event_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/onetimeevent.h"
+#include "rtc_base/one_time_event.h"
#include "test/gtest.h"
diff --git a/rtc_base/openssl_adapter.cc b/rtc_base/openssl_adapter.cc
index fcfa53b..dd2152e 100644
--- a/rtc_base/openssl_adapter.cc
+++ b/rtc_base/openssl_adapter.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/openssladapter.h"
+#include "rtc_base/openssl_adapter.h"
#include <errno.h>
@@ -26,9 +26,9 @@
#include "rtc_base/location.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/opensslcertificate.h"
-#include "rtc_base/opensslutility.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/openssl_certificate.h"
+#include "rtc_base/openssl_utility.h"
+#include "rtc_base/string_encode.h"
#include "rtc_base/thread.h"
#ifndef OPENSSL_IS_BORINGSSL
diff --git a/rtc_base/openssl_adapter.h b/rtc_base/openssl_adapter.h
index 2e3a355..7219671 100644
--- a/rtc_base/openssl_adapter.h
+++ b/rtc_base/openssl_adapter.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_OPENSSLADAPTER_H_
-#define RTC_BASE_OPENSSLADAPTER_H_
+#ifndef RTC_BASE_OPENSSL_ADAPTER_H_
+#define RTC_BASE_OPENSSL_ADAPTER_H_
#include <stddef.h>
#include <stdint.h>
@@ -17,18 +17,18 @@
#include <string>
#include <vector>
-#include "rtc_base/asyncsocket.h"
+#include "rtc_base/async_socket.h"
#include "rtc_base/buffer.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/opensslidentity.h"
-#include "rtc_base/opensslsessioncache.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/openssl_identity.h"
+#include "rtc_base/openssl_session_cache.h"
#include "rtc_base/socket.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/ssladapter.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_adapter.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/ssl_stream_adapter.h"
namespace rtc {
@@ -189,4 +189,4 @@
} // namespace rtc
-#endif // RTC_BASE_OPENSSLADAPTER_H_
+#endif // RTC_BASE_OPENSSL_ADAPTER_H_
diff --git a/rtc_base/openssl_adapter_unittest.cc b/rtc_base/openssl_adapter_unittest.cc
index 4db00e5..2b171e6 100644
--- a/rtc_base/openssl_adapter_unittest.cc
+++ b/rtc_base/openssl_adapter_unittest.cc
@@ -13,9 +13,9 @@
#include <vector>
#include "absl/memory/memory.h"
-#include "rtc_base/asyncsocket.h"
+#include "rtc_base/async_socket.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/openssladapter.h"
+#include "rtc_base/openssl_adapter.h"
#include "test/gmock.h"
namespace rtc {
diff --git a/rtc_base/openssl_certificate.cc b/rtc_base/openssl_certificate.cc
index 4e61b86..c22e5fb 100644
--- a/rtc_base/openssl_certificate.cc
+++ b/rtc_base/openssl_certificate.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/opensslcertificate.h"
+#include "rtc_base/openssl_certificate.h"
#if defined(WEBRTC_WIN)
// Must be included first before openssl headers.
@@ -24,10 +24,10 @@
#include "rtc_base/checks.h"
#include "rtc_base/helpers.h"
#include "rtc_base/logging.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/openssldigest.h"
-#include "rtc_base/opensslidentity.h"
-#include "rtc_base/opensslutility.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/openssl_digest.h"
+#include "rtc_base/openssl_identity.h"
+#include "rtc_base/openssl_utility.h"
namespace rtc {
namespace {
diff --git a/rtc_base/openssl_certificate.h b/rtc_base/openssl_certificate.h
index 088725c..9b61eee 100644
--- a/rtc_base/openssl_certificate.h
+++ b/rtc_base/openssl_certificate.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_OPENSSLCERTIFICATE_H_
-#define RTC_BASE_OPENSSLCERTIFICATE_H_
+#ifndef RTC_BASE_OPENSSL_CERTIFICATE_H_
+#define RTC_BASE_OPENSSL_CERTIFICATE_H_
#include <openssl/ossl_typ.h>
@@ -18,9 +18,9 @@
#include <string>
#include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_identity.h"
namespace rtc {
@@ -75,4 +75,4 @@
} // namespace rtc
-#endif // RTC_BASE_OPENSSLCERTIFICATE_H_
+#endif // RTC_BASE_OPENSSL_CERTIFICATE_H_
diff --git a/rtc_base/openssl_digest.cc b/rtc_base/openssl_digest.cc
index da90b65..1cf5bc0 100644
--- a/rtc_base/openssl_digest.cc
+++ b/rtc_base/openssl_digest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/openssldigest.h"
+#include "rtc_base/openssl_digest.h"
#include "rtc_base/checks.h" // RTC_DCHECK, RTC_CHECK
#include "rtc_base/openssl.h"
diff --git a/rtc_base/openssl_digest.h b/rtc_base/openssl_digest.h
index 82dc9a9..00f883c 100644
--- a/rtc_base/openssl_digest.h
+++ b/rtc_base/openssl_digest.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_OPENSSLDIGEST_H_
-#define RTC_BASE_OPENSSLDIGEST_H_
+#ifndef RTC_BASE_OPENSSL_DIGEST_H_
+#define RTC_BASE_OPENSSL_DIGEST_H_
#include <openssl/base.h>
#include <stddef.h>
#include <string>
-#include "rtc_base/messagedigest.h"
+#include "rtc_base/message_digest.h"
namespace rtc {
@@ -46,4 +46,4 @@
} // namespace rtc
-#endif // RTC_BASE_OPENSSLDIGEST_H_
+#endif // RTC_BASE_OPENSSL_DIGEST_H_
diff --git a/rtc_base/openssl_identity.cc b/rtc_base/openssl_identity.cc
index 9850c85..531c971 100644
--- a/rtc_base/openssl_identity.cc
+++ b/rtc_base/openssl_identity.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/opensslidentity.h"
+#include "rtc_base/openssl_identity.h"
#include <memory>
#include <utility>
@@ -32,7 +32,7 @@
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/openssl.h"
-#include "rtc_base/opensslutility.h"
+#include "rtc_base/openssl_utility.h"
namespace rtc {
diff --git a/rtc_base/openssl_identity.h b/rtc_base/openssl_identity.h
index fcf7deb..f0c4fb8 100644
--- a/rtc_base/openssl_identity.h
+++ b/rtc_base/openssl_identity.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_OPENSSLIDENTITY_H_
-#define RTC_BASE_OPENSSLIDENTITY_H_
+#ifndef RTC_BASE_OPENSSL_IDENTITY_H_
+#define RTC_BASE_OPENSSL_IDENTITY_H_
#include <openssl/ossl_typ.h>
@@ -18,10 +18,10 @@
#include <string>
#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/opensslcertificate.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/openssl_certificate.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_identity.h"
namespace rtc {
@@ -98,4 +98,4 @@
} // namespace rtc
-#endif // RTC_BASE_OPENSSLIDENTITY_H_
+#endif // RTC_BASE_OPENSSL_IDENTITY_H_
diff --git a/rtc_base/openssl_key_derivation_hkdf.h b/rtc_base/openssl_key_derivation_hkdf.h
index ebf43cf..7f88252 100644
--- a/rtc_base/openssl_key_derivation_hkdf.h
+++ b/rtc_base/openssl_key_derivation_hkdf.h
@@ -11,7 +11,7 @@
#ifndef RTC_BASE_OPENSSL_KEY_DERIVATION_HKDF_H_
#define RTC_BASE_OPENSSL_KEY_DERIVATION_HKDF_H_
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/key_derivation.h"
namespace rtc {
diff --git a/rtc_base/openssl_session_cache.cc b/rtc_base/openssl_session_cache.cc
index 2e37d55..f74dfea 100644
--- a/rtc_base/openssl_session_cache.cc
+++ b/rtc_base/openssl_session_cache.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/opensslsessioncache.h"
+#include "rtc_base/openssl_session_cache.h"
#include "rtc_base/checks.h"
#include "rtc_base/openssl.h"
diff --git a/rtc_base/openssl_session_cache.h b/rtc_base/openssl_session_cache.h
index c74b7bf..e53e41a 100644
--- a/rtc_base/openssl_session_cache.h
+++ b/rtc_base/openssl_session_cache.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_OPENSSLSESSIONCACHE_H_
-#define RTC_BASE_OPENSSLSESSIONCACHE_H_
+#ifndef RTC_BASE_OPENSSL_SESSION_CACHE_H_
+#define RTC_BASE_OPENSSL_SESSION_CACHE_H_
#include <openssl/ossl_typ.h>
#include <map>
#include <string>
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ssl_stream_adapter.h"
#ifndef OPENSSL_IS_BORINGSSL
typedef struct ssl_session_st SSL_SESSION;
@@ -64,4 +64,4 @@
} // namespace rtc
-#endif // RTC_BASE_OPENSSLSESSIONCACHE_H_
+#endif // RTC_BASE_OPENSSL_SESSION_CACHE_H_
diff --git a/rtc_base/openssl_session_cache_unittest.cc b/rtc_base/openssl_session_cache_unittest.cc
index 6489b2b..366fc26 100644
--- a/rtc_base/openssl_session_cache_unittest.cc
+++ b/rtc_base/openssl_session_cache_unittest.cc
@@ -16,7 +16,7 @@
#include "rtc_base/gunit.h"
#include "rtc_base/openssl.h"
-#include "rtc_base/opensslsessioncache.h"
+#include "rtc_base/openssl_session_cache.h"
namespace rtc {
diff --git a/rtc_base/openssl_stream_adapter.cc b/rtc_base/openssl_stream_adapter.cc
index 2682013..0245976 100644
--- a/rtc_base/openssl_stream_adapter.cc
+++ b/rtc_base/openssl_stream_adapter.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/opensslstreamadapter.h"
+#include "rtc_base/openssl_stream_adapter.h"
#include <openssl/bio.h>
#include <openssl/crypto.h>
@@ -29,13 +29,13 @@
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/openssl.h"
-#include "rtc_base/openssladapter.h"
-#include "rtc_base/openssldigest.h"
-#include "rtc_base/opensslidentity.h"
-#include "rtc_base/sslcertificate.h"
+#include "rtc_base/openssl_adapter.h"
+#include "rtc_base/openssl_digest.h"
+#include "rtc_base/openssl_identity.h"
+#include "rtc_base/ssl_certificate.h"
#include "rtc_base/stream.h"
#include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace {
bool g_use_time_callback_for_testing = false;
diff --git a/rtc_base/openssl_stream_adapter.h b/rtc_base/openssl_stream_adapter.h
index e012d17..40d1779 100644
--- a/rtc_base/openssl_stream_adapter.h
+++ b/rtc_base/openssl_stream_adapter.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_OPENSSLSTREAMADAPTER_H_
-#define RTC_BASE_OPENSSLSTREAMADAPTER_H_
+#ifndef RTC_BASE_OPENSSL_STREAM_ADAPTER_H_
+#define RTC_BASE_OPENSSL_STREAM_ADAPTER_H_
#include <openssl/ossl_typ.h>
@@ -20,10 +20,10 @@
#include <vector>
#include "rtc_base/buffer.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/opensslidentity.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/openssl_identity.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/ssl_stream_adapter.h"
#include "rtc_base/stream.h"
namespace rtc {
@@ -223,4 +223,4 @@
} // namespace rtc
-#endif // RTC_BASE_OPENSSLSTREAMADAPTER_H_
+#endif // RTC_BASE_OPENSSL_STREAM_ADAPTER_H_
diff --git a/rtc_base/openssl_utility.cc b/rtc_base/openssl_utility.cc
index a3f3347..9749912 100644
--- a/rtc_base/openssl_utility.cc
+++ b/rtc_base/openssl_utility.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/opensslutility.h"
+#include "rtc_base/openssl_utility.h"
#if defined(WEBRTC_WIN)
// Must be included first before openssl headers.
#include "rtc_base/win32.h" // NOLINT
@@ -24,9 +24,9 @@
#include "rtc_base/arraysize.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/opensslcertificate.h"
+#include "rtc_base/openssl_certificate.h"
#ifndef WEBRTC_EXCLUDE_BUILT_IN_SSL_ROOT_CERTS
-#include "rtc_base/sslroots.h"
+#include "rtc_base/ssl_roots.h"
#endif // WEBRTC_EXCLUDE_BUILT_IN_SSL_ROOT_CERTS
namespace rtc {
diff --git a/rtc_base/openssl_utility.h b/rtc_base/openssl_utility.h
index 77ed0b1..a2e49df 100644
--- a/rtc_base/openssl_utility.h
+++ b/rtc_base/openssl_utility.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_OPENSSLUTILITY_H_
-#define RTC_BASE_OPENSSLUTILITY_H_
+#ifndef RTC_BASE_OPENSSL_UTILITY_H_
+#define RTC_BASE_OPENSSL_UTILITY_H_
#include <openssl/ossl_typ.h>
#include <string>
@@ -37,4 +37,4 @@
} // namespace openssl
} // namespace rtc
-#endif // RTC_BASE_OPENSSLUTILITY_H_
+#endif // RTC_BASE_OPENSSL_UTILITY_H_
diff --git a/rtc_base/openssl_utility_unittest.cc b/rtc_base/openssl_utility_unittest.cc
index 2f952ae..9c9b971 100644
--- a/rtc_base/openssl_utility_unittest.cc
+++ b/rtc_base/openssl_utility_unittest.cc
@@ -32,8 +32,8 @@
#include "rtc_base/gunit.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/openssl.h"
-#include "rtc_base/opensslutility.h"
-#include "rtc_base/sslroots.h"
+#include "rtc_base/openssl_utility.h"
+#include "rtc_base/ssl_roots.h"
#include "test/gmock.h"
namespace rtc {
diff --git a/rtc_base/physical_socket_server.cc b/rtc_base/physical_socket_server.cc
index 4ad2857..4845a73 100644
--- a/rtc_base/physical_socket_server.cc
+++ b/rtc_base/physical_socket_server.cc
@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/physicalsocketserver.h"
+#include "rtc_base/physical_socket_server.h"
#if defined(_MSC_VER) && _MSC_VER < 1300
#pragma warning(disable : 4786)
@@ -44,12 +44,12 @@
#include <map>
#include "rtc_base/arraysize.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/networkmonitor.h"
-#include "rtc_base/nullsocketserver.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/network_monitor.h"
+#include "rtc_base/null_socket_server.h"
+#include "rtc_base/time_utils.h"
#if defined(WEBRTC_WIN)
#define LAST_SYSTEM_ERROR (::GetLastError())
diff --git a/rtc_base/physical_socket_server.h b/rtc_base/physical_socket_server.h
index ee4f936..b2dfb3f 100644
--- a/rtc_base/physical_socket_server.h
+++ b/rtc_base/physical_socket_server.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_PHYSICALSOCKETSERVER_H_
-#define RTC_BASE_PHYSICALSOCKETSERVER_H_
+#ifndef RTC_BASE_PHYSICAL_SOCKET_SERVER_H_
+#define RTC_BASE_PHYSICAL_SOCKET_SERVER_H_
#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX)
#include <sys/epoll.h>
@@ -20,9 +20,9 @@
#include <set>
#include <vector>
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/nethelpers.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/net_helpers.h"
+#include "rtc_base/socket_server.h"
#if defined(WEBRTC_POSIX)
typedef int SOCKET;
@@ -268,4 +268,4 @@
} // namespace rtc
-#endif // RTC_BASE_PHYSICALSOCKETSERVER_H_
+#endif // RTC_BASE_PHYSICAL_SOCKET_SERVER_H_
diff --git a/rtc_base/physical_socket_server_unittest.cc b/rtc_base/physical_socket_server_unittest.cc
index c253cc66..aed8bf3 100644
--- a/rtc_base/physical_socket_server_unittest.cc
+++ b/rtc_base/physical_socket_server_unittest.cc
@@ -13,12 +13,12 @@
#include <memory>
#include "rtc_base/gunit.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
#include "rtc_base/logging.h"
-#include "rtc_base/networkmonitor.h"
-#include "rtc_base/physicalsocketserver.h"
+#include "rtc_base/network_monitor.h"
+#include "rtc_base/physical_socket_server.h"
#include "rtc_base/socket_unittest.h"
-#include "rtc_base/testutils.h"
+#include "rtc_base/test_utils.h"
#include "rtc_base/thread.h"
#include "test/gtest.h"
diff --git a/rtc_base/platform_file.cc b/rtc_base/platform_file.cc
index baefb22..f9317d3 100644
--- a/rtc_base/platform_file.cc
+++ b/rtc_base/platform_file.cc
@@ -13,7 +13,7 @@
#if defined(WEBRTC_WIN)
#include <io.h>
-#include "rtc_base/stringutils.h" // For ToUtf16
+#include "rtc_base/string_utils.h" // For ToUtf16
#else
#include <fcntl.h>
#include <sys/stat.h>
diff --git a/rtc_base/platform_file_unittest.cc b/rtc_base/platform_file_unittest.cc
index 4e72400..396286a 100644
--- a/rtc_base/platform_file_unittest.cc
+++ b/rtc_base/platform_file_unittest.cc
@@ -10,7 +10,7 @@
#include "rtc_base/platform_file.h"
#include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
namespace rtc {
diff --git a/rtc_base/platform_thread.cc b/rtc_base/platform_thread.cc
index ba84b6a..1324069 100644
--- a/rtc_base/platform_thread.cc
+++ b/rtc_base/platform_thread.cc
@@ -17,9 +17,9 @@
#include <time.h>
#include <algorithm>
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
#include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace rtc {
namespace {
diff --git a/rtc_base/platform_thread.h b/rtc_base/platform_thread.h
index 47c23dc..79ea7c1 100644
--- a/rtc_base/platform_thread.h
+++ b/rtc_base/platform_thread.h
@@ -16,7 +16,7 @@
#endif
#include <string>
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/platform_thread_types.h"
#include "rtc_base/thread_checker.h"
diff --git a/rtc_base/proxy_info.cc b/rtc_base/proxy_info.cc
index c394487..23d60af 100644
--- a/rtc_base/proxy_info.cc
+++ b/rtc_base/proxy_info.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/proxyinfo.h"
+#include "rtc_base/proxy_info.h"
namespace rtc {
diff --git a/rtc_base/proxy_info.h b/rtc_base/proxy_info.h
index 1947669..6fded09 100644
--- a/rtc_base/proxy_info.h
+++ b/rtc_base/proxy_info.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_PROXYINFO_H_
-#define RTC_BASE_PROXYINFO_H_
+#ifndef RTC_BASE_PROXY_INFO_H_
+#define RTC_BASE_PROXY_INFO_H_
#include <string>
-#include "rtc_base/cryptstring.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/crypt_string.h"
+#include "rtc_base/socket_address.h"
namespace rtc {
@@ -35,4 +35,4 @@
} // namespace rtc
-#endif // RTC_BASE_PROXYINFO_H_
+#endif // RTC_BASE_PROXY_INFO_H_
diff --git a/rtc_base/proxy_server.cc b/rtc_base/proxy_server.cc
index 638ce0d..3420404 100644
--- a/rtc_base/proxy_server.cc
+++ b/rtc_base/proxy_server.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/proxyserver.h"
+#include "rtc_base/proxy_server.h"
#include <stddef.h>
#include <algorithm>
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/socketfactory.h"
+#include "rtc_base/socket_factory.h"
namespace rtc {
diff --git a/rtc_base/proxy_server.h b/rtc_base/proxy_server.h
index 587a49c..ef4a3c7 100644
--- a/rtc_base/proxy_server.h
+++ b/rtc_base/proxy_server.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_PROXYSERVER_H_
-#define RTC_BASE_PROXYSERVER_H_
+#ifndef RTC_BASE_PROXY_SERVER_H_
+#define RTC_BASE_PROXY_SERVER_H_
#include <list>
#include <memory>
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/server_socket_adapters.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
#include "rtc_base/stream.h"
namespace rtc {
@@ -101,4 +101,4 @@
} // namespace rtc
-#endif // RTC_BASE_PROXYSERVER_H_
+#endif // RTC_BASE_PROXY_SERVER_H_
diff --git a/rtc_base/proxy_unittest.cc b/rtc_base/proxy_unittest.cc
index 0101893..229891d 100644
--- a/rtc_base/proxy_unittest.cc
+++ b/rtc_base/proxy_unittest.cc
@@ -11,11 +11,11 @@
#include <memory>
#include <string>
#include "rtc_base/gunit.h"
-#include "rtc_base/proxyserver.h"
-#include "rtc_base/socketadapters.h"
-#include "rtc_base/testclient.h"
-#include "rtc_base/testechoserver.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/proxy_server.h"
+#include "rtc_base/socket_adapters.h"
+#include "rtc_base/test_client.h"
+#include "rtc_base/test_echo_server.h"
+#include "rtc_base/virtual_socket_server.h"
using rtc::Socket;
using rtc::SocketAddress;
diff --git a/rtc_base/random.h b/rtc_base/random.h
index e1c3bb7..31de6e1 100644
--- a/rtc_base/random.h
+++ b/rtc_base/random.h
@@ -15,7 +15,7 @@
#include <limits>
#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
namespace webrtc {
diff --git a/rtc_base/random_unittest.cc b/rtc_base/random_unittest.cc
index d05a16b..8f32657 100644
--- a/rtc_base/random_unittest.cc
+++ b/rtc_base/random_unittest.cc
@@ -13,7 +13,7 @@
#include <limits>
#include <vector>
-#include "rtc_base/numerics/mathutils.h" // unsigned difference
+#include "rtc_base/numerics/math_utils.h" // unsigned difference
#include "rtc_base/random.h"
#include "test/gtest.h"
diff --git a/rtc_base/rate_limiter.h b/rtc_base/rate_limiter.h
index 43ef88d..7eaa946 100644
--- a/rtc_base/rate_limiter.h
+++ b/rtc_base/rate_limiter.h
@@ -14,8 +14,8 @@
#include <stddef.h>
#include <stdint.h>
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/rate_statistics.h"
#include "rtc_base/thread_annotations.h"
diff --git a/rtc_base/rate_tracker.cc b/rtc_base/rate_tracker.cc
index 7c96ca9..771dc6c 100644
--- a/rtc_base/rate_tracker.cc
+++ b/rtc_base/rate_tracker.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/ratetracker.h"
+#include "rtc_base/rate_tracker.h"
#include <algorithm>
#include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace rtc {
diff --git a/rtc_base/rate_tracker.h b/rtc_base/rate_tracker.h
index ac9b88a..e9be522 100644
--- a/rtc_base/rate_tracker.h
+++ b/rtc_base/rate_tracker.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_RATETRACKER_H_
-#define RTC_BASE_RATETRACKER_H_
+#ifndef RTC_BASE_RATE_TRACKER_H_
+#define RTC_BASE_RATE_TRACKER_H_
#include <stdint.h>
#include <stdlib.h>
@@ -66,4 +66,4 @@
} // namespace rtc
-#endif // RTC_BASE_RATETRACKER_H_
+#endif // RTC_BASE_RATE_TRACKER_H_
diff --git a/rtc_base/rate_tracker_unittest.cc b/rtc_base/rate_tracker_unittest.cc
index ff74a37..7a2c1ad 100644
--- a/rtc_base/rate_tracker_unittest.cc
+++ b/rtc_base/rate_tracker_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/ratetracker.h"
+#include "rtc_base/rate_tracker.h"
#include "test/gtest.h"
diff --git a/rtc_base/ref_count.h b/rtc_base/ref_count.h
index fb0971c..d8d652a 100644
--- a/rtc_base/ref_count.h
+++ b/rtc_base/ref_count.h
@@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_REFCOUNT_H_
-#define RTC_BASE_REFCOUNT_H_
+#ifndef RTC_BASE_REF_COUNT_H_
+#define RTC_BASE_REF_COUNT_H_
namespace rtc {
@@ -64,4 +64,4 @@
} // namespace rtc
-#endif // RTC_BASE_REFCOUNT_H_
+#endif // RTC_BASE_REF_COUNT_H_
diff --git a/rtc_base/ref_counted_object.h b/rtc_base/ref_counted_object.h
index 3b21004..ce18379 100644
--- a/rtc_base/ref_counted_object.h
+++ b/rtc_base/ref_counted_object.h
@@ -7,15 +7,15 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_REFCOUNTEDOBJECT_H_
-#define RTC_BASE_REFCOUNTEDOBJECT_H_
+#ifndef RTC_BASE_REF_COUNTED_OBJECT_H_
+#define RTC_BASE_REF_COUNTED_OBJECT_H_
#include <type_traits>
#include <utility>
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcounter.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counter.h"
namespace rtc {
@@ -61,4 +61,4 @@
} // namespace rtc
-#endif // RTC_BASE_REFCOUNTEDOBJECT_H_
+#endif // RTC_BASE_REF_COUNTED_OBJECT_H_
diff --git a/rtc_base/ref_counted_object_unittest.cc b/rtc_base/ref_counted_object_unittest.cc
index 71ff426..9b475e2 100644
--- a/rtc_base/ref_counted_object_unittest.cc
+++ b/rtc_base/ref_counted_object_unittest.cc
@@ -12,8 +12,8 @@
#include <string>
#include <utility>
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "test/gtest.h"
diff --git a/rtc_base/ref_counter.h b/rtc_base/ref_counter.h
index 3906529..9b4d5ef 100644
--- a/rtc_base/ref_counter.h
+++ b/rtc_base/ref_counter.h
@@ -7,11 +7,11 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_REFCOUNTER_H_
-#define RTC_BASE_REFCOUNTER_H_
+#ifndef RTC_BASE_REF_COUNTER_H_
+#define RTC_BASE_REF_COUNTER_H_
-#include "rtc_base/atomicops.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/atomic_ops.h"
+#include "rtc_base/ref_count.h"
namespace webrtc {
namespace webrtc_impl {
@@ -49,4 +49,4 @@
} // namespace webrtc_impl
} // namespace webrtc
-#endif // RTC_BASE_REFCOUNTER_H_
+#endif // RTC_BASE_REF_COUNTER_H_
diff --git a/rtc_base/rolling_accumulator.h b/rtc_base/rolling_accumulator.h
index 9ad8159..dacceff 100644
--- a/rtc_base/rolling_accumulator.h
+++ b/rtc_base/rolling_accumulator.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_ROLLINGACCUMULATOR_H_
-#define RTC_BASE_ROLLINGACCUMULATOR_H_
+#ifndef RTC_BASE_ROLLING_ACCUMULATOR_H_
+#define RTC_BASE_ROLLING_ACCUMULATOR_H_
#include <stddef.h>
#include <algorithm>
#include <vector>
#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
namespace rtc {
@@ -164,4 +164,4 @@
} // namespace rtc
-#endif // RTC_BASE_ROLLINGACCUMULATOR_H_
+#endif // RTC_BASE_ROLLING_ACCUMULATOR_H_
diff --git a/rtc_base/rolling_accumulator_unittest.cc b/rtc_base/rolling_accumulator_unittest.cc
index 38716f2..7d5e70d 100644
--- a/rtc_base/rolling_accumulator_unittest.cc
+++ b/rtc_base/rolling_accumulator_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/rollingaccumulator.h"
+#include "rtc_base/rolling_accumulator.h"
#include "test/gtest.h"
diff --git a/rtc_base/rtc_certificate.cc b/rtc_base/rtc_certificate.cc
index 875068f..46f6c31 100644
--- a/rtc_base/rtc_certificate.cc
+++ b/rtc_base/rtc_certificate.cc
@@ -10,13 +10,13 @@
#include <memory>
-#include "rtc_base/rtccertificate.h"
+#include "rtc_base/rtc_certificate.h"
#include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/time_utils.h"
namespace rtc {
diff --git a/rtc_base/rtc_certificate.h b/rtc_base/rtc_certificate.h
index 561ea0f..a826af4 100644
--- a/rtc_base/rtc_certificate.h
+++ b/rtc_base/rtc_certificate.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_RTCCERTIFICATE_H_
-#define RTC_BASE_RTCCERTIFICATE_H_
+#ifndef RTC_BASE_RTC_CERTIFICATE_H_
+#define RTC_BASE_RTC_CERTIFICATE_H_
#include <stdint.h>
#include <memory>
#include <string>
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
#include "rtc_base/scoped_ref_ptr.h"
namespace rtc {
@@ -90,4 +90,4 @@
} // namespace rtc
-#endif // RTC_BASE_RTCCERTIFICATE_H_
+#endif // RTC_BASE_RTC_CERTIFICATE_H_
diff --git a/rtc_base/rtc_certificate_generator.cc b/rtc_base/rtc_certificate_generator.cc
index 114b35c..08cd19946 100644
--- a/rtc_base/rtc_certificate_generator.cc
+++ b/rtc_base/rtc_certificate_generator.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/rtccertificategenerator.h"
+#include "rtc_base/rtc_certificate_generator.h"
#include <time.h>
#include <algorithm>
@@ -17,10 +17,10 @@
#include "rtc_base/checks.h"
#include "rtc_base/location.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/ssl_identity.h"
namespace rtc {
diff --git a/rtc_base/rtc_certificate_generator.h b/rtc_base/rtc_certificate_generator.h
index fed075e..75688dd 100644
--- a/rtc_base/rtc_certificate_generator.h
+++ b/rtc_base/rtc_certificate_generator.h
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_RTCCERTIFICATEGENERATOR_H_
-#define RTC_BASE_RTCCERTIFICATEGENERATOR_H_
+#ifndef RTC_BASE_RTC_CERTIFICATE_GENERATOR_H_
+#define RTC_BASE_RTC_CERTIFICATE_GENERATOR_H_
#include <stdint.h>
#include "absl/types/optional.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/rtccertificate.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/rtc_certificate.h"
#include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/ssl_identity.h"
#include "rtc_base/thread.h"
namespace rtc {
@@ -84,4 +84,4 @@
} // namespace rtc
-#endif // RTC_BASE_RTCCERTIFICATEGENERATOR_H_
+#endif // RTC_BASE_RTC_CERTIFICATE_GENERATOR_H_
diff --git a/rtc_base/rtc_certificate_generator_unittest.cc b/rtc_base/rtc_certificate_generator_unittest.cc
index e3c820b..69c8597 100644
--- a/rtc_base/rtc_certificate_generator_unittest.cc
+++ b/rtc_base/rtc_certificate_generator_unittest.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/rtccertificategenerator.h"
+#include "rtc_base/rtc_certificate_generator.h"
#include <memory>
#include "absl/types/optional.h"
#include "rtc_base/checks.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/thread.h"
#include "test/gtest.h"
diff --git a/rtc_base/rtc_certificate_unittest.cc b/rtc_base/rtc_certificate_unittest.cc
index f5a777c..ab242bb 100644
--- a/rtc_base/rtc_certificate_unittest.cc
+++ b/rtc_base/rtc_certificate_unittest.cc
@@ -14,9 +14,9 @@
#include "rtc_base/checks.h"
#include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/time_utils.h"
#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/sequenced_task_checker.h b/rtc_base/sequenced_task_checker.h
index eb15198..e5443af 100644
--- a/rtc_base/sequenced_task_checker.h
+++ b/rtc_base/sequenced_task_checker.h
@@ -17,7 +17,7 @@
#define ENABLE_SEQUENCED_TASK_CHECKER RTC_DCHECK_IS_ON
#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/sequenced_task_checker_impl.h"
#include "rtc_base/thread_annotations.h"
diff --git a/rtc_base/sequenced_task_checker_impl.h b/rtc_base/sequenced_task_checker_impl.h
index 293b1ac..a850b94 100644
--- a/rtc_base/sequenced_task_checker_impl.h
+++ b/rtc_base/sequenced_task_checker_impl.h
@@ -11,7 +11,7 @@
#ifndef RTC_BASE_SEQUENCED_TASK_CHECKER_IMPL_H_
#define RTC_BASE_SEQUENCED_TASK_CHECKER_IMPL_H_
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/thread_checker.h"
namespace rtc {
diff --git a/rtc_base/sequenced_task_checker_unittest.cc b/rtc_base/sequenced_task_checker_unittest.cc
index 02918cd..b3df2fa 100644
--- a/rtc_base/sequenced_task_checker_unittest.cc
+++ b/rtc_base/sequenced_task_checker_unittest.cc
@@ -14,7 +14,7 @@
#include <utility>
#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/event.h"
#include "rtc_base/platform_thread.h"
#include "rtc_base/task_queue.h"
diff --git a/rtc_base/server_socket_adapters.cc b/rtc_base/server_socket_adapters.cc
index 64f9bf0..887ca87 100644
--- a/rtc_base/server_socket_adapters.cc
+++ b/rtc_base/server_socket_adapters.cc
@@ -10,7 +10,7 @@
#include <string>
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
#include "rtc_base/server_socket_adapters.h"
namespace rtc {
diff --git a/rtc_base/server_socket_adapters.h b/rtc_base/server_socket_adapters.h
index e741ba8..a534eea 100644
--- a/rtc_base/server_socket_adapters.h
+++ b/rtc_base/server_socket_adapters.h
@@ -11,7 +11,7 @@
#ifndef RTC_BASE_SERVER_SOCKET_ADAPTERS_H_
#define RTC_BASE_SERVER_SOCKET_ADAPTERS_H_
-#include "rtc_base/socketadapters.h"
+#include "rtc_base/socket_adapters.h"
namespace rtc {
diff --git a/rtc_base/signal_thread.cc b/rtc_base/signal_thread.cc
index 5dd9387..84613db 100644
--- a/rtc_base/signal_thread.cc
+++ b/rtc_base/signal_thread.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/signalthread.h"
+#include "rtc_base/signal_thread.h"
#include <memory>
#include "absl/memory/memory.h"
#include "rtc_base/checks.h"
#include "rtc_base/location.h"
-#include "rtc_base/nullsocketserver.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/null_socket_server.h"
+#include "rtc_base/socket_server.h"
namespace rtc {
diff --git a/rtc_base/signal_thread.h b/rtc_base/signal_thread.h
index 9208e2c..9a20ad2 100644
--- a/rtc_base/signal_thread.h
+++ b/rtc_base/signal_thread.h
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_SIGNALTHREAD_H_
-#define RTC_BASE_SIGNALTHREAD_H_
+#ifndef RTC_BASE_SIGNAL_THREAD_H_
+#define RTC_BASE_SIGNAL_THREAD_H_
#include <string>
#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.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"
#include "rtc_base/thread_annotations.h"
@@ -155,4 +155,4 @@
} // namespace rtc
-#endif // RTC_BASE_SIGNALTHREAD_H_
+#endif // RTC_BASE_SIGNAL_THREAD_H_
diff --git a/rtc_base/signal_thread_unittest.cc b/rtc_base/signal_thread_unittest.cc
index eeae030..2bc0dda 100644
--- a/rtc_base/signal_thread_unittest.cc
+++ b/rtc_base/signal_thread_unittest.cc
@@ -10,10 +10,10 @@
#include <memory>
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/signalthread.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/signal_thread.h"
+#include "rtc_base/socket_server.h"
#include "rtc_base/thread.h"
#include "test/gtest.h"
diff --git a/rtc_base/sigslot_repeater.h b/rtc_base/sigslot_repeater.h
index 724e624..f562c5a 100644
--- a/rtc_base/sigslot_repeater.h
+++ b/rtc_base/sigslot_repeater.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_SIGSLOTREPEATER_H__
-#define RTC_BASE_SIGSLOTREPEATER_H__
+#ifndef RTC_BASE_SIGSLOT_REPEATER_H__
+#define RTC_BASE_SIGSLOT_REPEATER_H__
// repeaters are both signals and slots, which are designed as intermediate
// pass-throughs for signals and slots which don't know about each other (for
@@ -53,4 +53,4 @@
} // namespace sigslot
-#endif // RTC_BASE_SIGSLOTREPEATER_H__
+#endif // RTC_BASE_SIGSLOT_REPEATER_H__
diff --git a/rtc_base/sigslot_tester.h b/rtc_base/sigslot_tester.h
index 73f4365..58be511 100644
--- a/rtc_base/sigslot_tester.h
+++ b/rtc_base/sigslot_tester.h
@@ -12,8 +12,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_SIGSLOTTESTER_H_
-#define RTC_BASE_SIGSLOTTESTER_H_
+#ifndef RTC_BASE_SIGSLOT_TESTER_H_
+#define RTC_BASE_SIGSLOT_TESTER_H_
// To generate sigslottester.h from sigslottester.h.pump, execute:
// /home/build/google3/third_party/gtest/scripts/pump.py sigslottester.h.pump
@@ -38,7 +38,7 @@
// EXPECT_EQ("hello", capture);
// /* See unit-tests for more examples */
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
namespace rtc {
@@ -237,4 +237,4 @@
};
} // namespace rtc
-#endif // RTC_BASE_SIGSLOTTESTER_H_
+#endif // RTC_BASE_SIGSLOT_TESTER_H_
diff --git a/rtc_base/sigslot_tester_unittest.cc b/rtc_base/sigslot_tester_unittest.cc
index b8d5735..6c5b12e 100644
--- a/rtc_base/sigslot_tester_unittest.cc
+++ b/rtc_base/sigslot_tester_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/sigslottester.h"
+#include "rtc_base/sigslot_tester.h"
#include <string>
diff --git a/rtc_base/sigslot_unittest.cc b/rtc_base/sigslot_unittest.cc
index d5d8e00..8edab7c 100644
--- a/rtc_base/sigslot_unittest.cc
+++ b/rtc_base/sigslot_unittest.cc
@@ -10,7 +10,7 @@
#include "rtc_base/third_party/sigslot/sigslot.h"
-#include "rtc_base/sigslotrepeater.h"
+#include "rtc_base/sigslot_repeater.h"
#include "test/gtest.h"
// This function, when passed a has_slots or signalx, will break the build if
diff --git a/rtc_base/sigslottester.h.pump b/rtc_base/sigslottester.h.pump
index 0c7c693..0a1f411 100755
--- a/rtc_base/sigslottester.h.pump
+++ b/rtc_base/sigslottester.h.pump
@@ -35,7 +35,7 @@
// EXPECT_EQ("hello", capture);
// /* See unit-tests for more examples */
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
namespace rtc {
diff --git a/rtc_base/socket.h b/rtc_base/socket.h
index 84a0e84..a2b65d1 100644
--- a/rtc_base/socket.h
+++ b/rtc_base/socket.h
@@ -25,8 +25,8 @@
#include "rtc_base/win32.h"
#endif
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/socket_address.h"
// Rather than converting errors into a private namespace,
// Reuse the POSIX socket api errors. Note this depends on
diff --git a/rtc_base/socket_adapters.cc b/rtc_base/socket_adapters.cc
index 3fe88d5..2bcdcd8 100644
--- a/rtc_base/socket_adapters.cc
+++ b/rtc_base/socket_adapters.cc
@@ -31,11 +31,11 @@
#include "absl/strings/match.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/httpcommon.h"
+#include "rtc_base/http_common.h"
#include "rtc_base/logging.h"
-#include "rtc_base/socketadapters.h"
+#include "rtc_base/socket_adapters.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/zero_memory.h"
diff --git a/rtc_base/socket_adapters.h b/rtc_base/socket_adapters.h
index ca55909..99c9109 100644
--- a/rtc_base/socket_adapters.h
+++ b/rtc_base/socket_adapters.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_SOCKETADAPTERS_H_
-#define RTC_BASE_SOCKETADAPTERS_H_
+#ifndef RTC_BASE_SOCKET_ADAPTERS_H_
+#define RTC_BASE_SOCKET_ADAPTERS_H_
#include <string>
#include "api/array_view.h"
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/cryptstring.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/crypt_string.h"
namespace rtc {
@@ -167,4 +167,4 @@
} // namespace rtc
-#endif // RTC_BASE_SOCKETADAPTERS_H_
+#endif // RTC_BASE_SOCKET_ADAPTERS_H_
diff --git a/rtc_base/socket_address.cc b/rtc_base/socket_address.cc
index c91846d..3b22a05 100644
--- a/rtc_base/socket_address.cc
+++ b/rtc_base/socket_address.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
#include "rtc_base/numerics/safe_conversions.h"
#if defined(WEBRTC_POSIX)
@@ -26,10 +26,10 @@
#include <unistd.h>
#endif
-#include "rtc_base/byteorder.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/net_helpers.h"
#include "rtc_base/strings/string_builder.h"
#if defined(WEBRTC_WIN)
diff --git a/rtc_base/socket_address.h b/rtc_base/socket_address.h
index b1a52b9..342f5de 100644
--- a/rtc_base/socket_address.h
+++ b/rtc_base/socket_address.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_SOCKETADDRESS_H_
-#define RTC_BASE_SOCKETADDRESS_H_
+#ifndef RTC_BASE_SOCKET_ADDRESS_H_
+#define RTC_BASE_SOCKET_ADDRESS_H_
#include <string>
#ifdef UNIT_TEST
#include <ostream> // no-presubmit-check TODO(webrtc:8982)
#endif // UNIT_TEST
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
#undef SetPort
@@ -199,4 +199,4 @@
} // namespace rtc
-#endif // RTC_BASE_SOCKETADDRESS_H_
+#endif // RTC_BASE_SOCKET_ADDRESS_H_
diff --git a/rtc_base/socket_address_pair.cc b/rtc_base/socket_address_pair.cc
index 914ffd9..54f70ff 100644
--- a/rtc_base/socket_address_pair.cc
+++ b/rtc_base/socket_address_pair.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/socketaddresspair.h"
+#include "rtc_base/socket_address_pair.h"
namespace rtc {
diff --git a/rtc_base/socket_address_pair.h b/rtc_base/socket_address_pair.h
index 6691386..f315e64 100644
--- a/rtc_base/socket_address_pair.h
+++ b/rtc_base/socket_address_pair.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_SOCKETADDRESSPAIR_H_
-#define RTC_BASE_SOCKETADDRESSPAIR_H_
+#ifndef RTC_BASE_SOCKET_ADDRESS_PAIR_H_
+#define RTC_BASE_SOCKET_ADDRESS_PAIR_H_
#include <stddef.h>
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
namespace rtc {
@@ -40,4 +40,4 @@
} // namespace rtc
-#endif // RTC_BASE_SOCKETADDRESSPAIR_H_
+#endif // RTC_BASE_SOCKET_ADDRESS_PAIR_H_
diff --git a/rtc_base/socket_address_unittest.cc b/rtc_base/socket_address_unittest.cc
index d2420fc..14da8cb 100644
--- a/rtc_base/socket_address_unittest.cc
+++ b/rtc_base/socket_address_unittest.cc
@@ -14,8 +14,8 @@
#include <string.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/gtest.h"
namespace rtc {
diff --git a/rtc_base/socket_factory.h b/rtc_base/socket_factory.h
index 5a5cd04..7356745 100644
--- a/rtc_base/socket_factory.h
+++ b/rtc_base/socket_factory.h
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_SOCKETFACTORY_H_
-#define RTC_BASE_SOCKETFACTORY_H_
+#ifndef RTC_BASE_SOCKET_FACTORY_H_
+#define RTC_BASE_SOCKET_FACTORY_H_
-#include "rtc_base/asyncsocket.h"
+#include "rtc_base/async_socket.h"
#include "rtc_base/socket.h"
namespace rtc {
@@ -30,4 +30,4 @@
} // namespace rtc
-#endif // RTC_BASE_SOCKETFACTORY_H_
+#endif // RTC_BASE_SOCKET_FACTORY_H_
diff --git a/rtc_base/socket_server.h b/rtc_base/socket_server.h
index e29884e..348d099 100644
--- a/rtc_base/socket_server.h
+++ b/rtc_base/socket_server.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_SOCKETSERVER_H_
-#define RTC_BASE_SOCKETSERVER_H_
+#ifndef RTC_BASE_SOCKET_SERVER_H_
+#define RTC_BASE_SOCKET_SERVER_H_
#include <memory>
-#include "rtc_base/socketfactory.h"
+#include "rtc_base/socket_factory.h"
namespace rtc {
@@ -59,4 +59,4 @@
} // namespace rtc
-#endif // RTC_BASE_SOCKETSERVER_H_
+#endif // RTC_BASE_SOCKET_SERVER_H_
diff --git a/rtc_base/socket_stream.cc b/rtc_base/socket_stream.cc
index 8978404..e93d6aa 100644
--- a/rtc_base/socket_stream.cc
+++ b/rtc_base/socket_stream.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/socketstream.h"
+#include "rtc_base/socket_stream.h"
#include "rtc_base/checks.h"
#include "rtc_base/socket.h"
diff --git a/rtc_base/socket_stream.h b/rtc_base/socket_stream.h
index 6047fcd..f9875fe 100644
--- a/rtc_base/socket_stream.h
+++ b/rtc_base/socket_stream.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_SOCKETSTREAM_H_
-#define RTC_BASE_SOCKETSTREAM_H_
+#ifndef RTC_BASE_SOCKET_STREAM_H_
+#define RTC_BASE_SOCKET_STREAM_H_
#include <stddef.h>
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/stream.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
@@ -61,4 +61,4 @@
} // namespace rtc
-#endif // RTC_BASE_SOCKETSTREAM_H_
+#endif // RTC_BASE_SOCKET_STREAM_H_
diff --git a/rtc_base/socket_unittest.cc b/rtc_base/socket_unittest.cc
index 79259a5..3166ec7 100644
--- a/rtc_base/socket_unittest.cc
+++ b/rtc_base/socket_unittest.cc
@@ -15,25 +15,25 @@
#include "absl/memory/memory.h"
#include "rtc_base/arraysize.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/asyncudpsocket.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/async_udp_socket.h"
#include "rtc_base/buffer.h"
#include "rtc_base/gunit.h"
#include "rtc_base/location.h"
#include "rtc_base/logging.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/net_helpers.h"
#include "rtc_base/socket.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/socket_server.h"
#include "rtc_base/socket_unittest.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/socketserver.h"
-#include "rtc_base/testclient.h"
-#include "rtc_base/testutils.h"
+#include "rtc_base/test_client.h"
+#include "rtc_base/test_utils.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace rtc {
diff --git a/rtc_base/ssl_adapter.cc b/rtc_base/ssl_adapter.cc
index e091f00..9d414ea 100644
--- a/rtc_base/ssl_adapter.cc
+++ b/rtc_base/ssl_adapter.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/ssl_adapter.h"
-#include "rtc_base/openssladapter.h"
+#include "rtc_base/openssl_adapter.h"
///////////////////////////////////////////////////////////////////////////////
diff --git a/rtc_base/ssl_adapter.h b/rtc_base/ssl_adapter.h
index 7ebedca..240899f 100644
--- a/rtc_base/ssl_adapter.h
+++ b/rtc_base/ssl_adapter.h
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_SSLADAPTER_H_
-#define RTC_BASE_SSLADAPTER_H_
+#ifndef RTC_BASE_SSL_ADAPTER_H_
+#define RTC_BASE_SSL_ADAPTER_H_
#include <string>
#include <vector>
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/ssl_stream_adapter.h"
namespace rtc {
@@ -103,4 +103,4 @@
} // namespace rtc
-#endif // RTC_BASE_SSLADAPTER_H_
+#endif // RTC_BASE_SSL_ADAPTER_H_
diff --git a/rtc_base/ssl_adapter_unittest.cc b/rtc_base/ssl_adapter_unittest.cc
index c84c668..9774c0a 100644
--- a/rtc_base/ssl_adapter_unittest.cc
+++ b/rtc_base/ssl_adapter_unittest.cc
@@ -14,15 +14,15 @@
#include "absl/memory/memory.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/ipaddress.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/socketstream.h"
-#include "rtc_base/ssladapter.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/socket_stream.h"
+#include "rtc_base/ssl_adapter.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/ssl_stream_adapter.h"
#include "rtc_base/stream.h"
-#include "rtc_base/stringencode.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/string_encode.h"
+#include "rtc_base/virtual_socket_server.h"
#include "test/gmock.h"
using ::testing::_;
diff --git a/rtc_base/ssl_certificate.cc b/rtc_base/ssl_certificate.cc
index 934848f..8f6cfa2 100644
--- a/rtc_base/ssl_certificate.cc
+++ b/rtc_base/ssl_certificate.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/sslcertificate.h"
+#include "rtc_base/ssl_certificate.h"
#include <algorithm>
#include <string>
@@ -16,8 +16,8 @@
#include "absl/memory/memory.h"
#include "rtc_base/checks.h"
-#include "rtc_base/opensslcertificate.h"
-#include "rtc_base/sslfingerprint.h"
+#include "rtc_base/openssl_certificate.h"
+#include "rtc_base/ssl_fingerprint.h"
#include "rtc_base/third_party/base64/base64.h"
namespace rtc {
diff --git a/rtc_base/ssl_certificate.h b/rtc_base/ssl_certificate.h
index eb81c20..fad1404 100644
--- a/rtc_base/ssl_certificate.h
+++ b/rtc_base/ssl_certificate.h
@@ -12,8 +12,8 @@
// for TLS TURN connections and the SSLStreamAdapter for DTLS Peer to Peer
// Connections for SRTP Key negotiation and SCTP encryption.
-#ifndef RTC_BASE_SSLCERTIFICATE_H_
-#define RTC_BASE_SSLCERTIFICATE_H_
+#ifndef RTC_BASE_SSL_CERTIFICATE_H_
+#define RTC_BASE_SSL_CERTIFICATE_H_
#include <stddef.h>
#include <stdint.h>
@@ -22,7 +22,7 @@
#include <vector>
#include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
namespace rtc {
@@ -134,4 +134,4 @@
} // namespace rtc
-#endif // RTC_BASE_SSLCERTIFICATE_H_
+#endif // RTC_BASE_SSL_CERTIFICATE_H_
diff --git a/rtc_base/ssl_fingerprint.cc b/rtc_base/ssl_fingerprint.cc
index b296d33..77b6149 100644
--- a/rtc_base/ssl_fingerprint.cc
+++ b/rtc_base/ssl_fingerprint.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/sslfingerprint.h"
+#include "rtc_base/ssl_fingerprint.h"
#include <ctype.h>
#include <algorithm>
@@ -17,11 +17,11 @@
#include "absl/memory/memory.h"
#include "rtc_base/logging.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/string_encode.h"
namespace rtc {
diff --git a/rtc_base/ssl_fingerprint.h b/rtc_base/ssl_fingerprint.h
index ea10ede..f4037f7 100644
--- a/rtc_base/ssl_fingerprint.h
+++ b/rtc_base/ssl_fingerprint.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_SSLFINGERPRINT_H_
-#define RTC_BASE_SSLFINGERPRINT_H_
+#ifndef RTC_BASE_SSL_FINGERPRINT_H_
+#define RTC_BASE_SSL_FINGERPRINT_H_
#include <stddef.h>
#include <stdint.h>
#include <string>
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
namespace rtc {
@@ -70,4 +70,4 @@
} // namespace rtc
-#endif // RTC_BASE_SSLFINGERPRINT_H_
+#endif // RTC_BASE_SSL_FINGERPRINT_H_
diff --git a/rtc_base/ssl_identity.cc b/rtc_base/ssl_identity.cc
index 41eb35d..63818c1 100644
--- a/rtc_base/ssl_identity.cc
+++ b/rtc_base/ssl_identity.cc
@@ -9,18 +9,18 @@
*/
// Handling of certificates and keypairs for SSLStreamAdapter's peer mode.
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/ssl_identity.h"
#include <string.h>
#include <time.h>
#include <string>
#include "rtc_base/checks.h"
-#include "rtc_base/opensslidentity.h"
-#include "rtc_base/sslcertificate.h"
+#include "rtc_base/openssl_identity.h"
+#include "rtc_base/ssl_certificate.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/third_party/base64/base64.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace rtc {
diff --git a/rtc_base/ssl_identity.h b/rtc_base/ssl_identity.h
index 39feeab..c013a89 100644
--- a/rtc_base/ssl_identity.h
+++ b/rtc_base/ssl_identity.h
@@ -10,8 +10,8 @@
// Handling of certificates and keypairs for SSLStreamAdapter's peer mode.
-#ifndef RTC_BASE_SSLIDENTITY_H_
-#define RTC_BASE_SSLIDENTITY_H_
+#ifndef RTC_BASE_SSL_IDENTITY_H_
+#define RTC_BASE_SSL_IDENTITY_H_
#include <stdint.h>
#include <ctime>
@@ -164,4 +164,4 @@
} // namespace rtc
-#endif // RTC_BASE_SSLIDENTITY_H_
+#endif // RTC_BASE_SSL_IDENTITY_H_
diff --git a/rtc_base/ssl_identity_unittest.cc b/rtc_base/ssl_identity_unittest.cc
index d2ec157..f01f37b 100644
--- a/rtc_base/ssl_identity_unittest.cc
+++ b/rtc_base/ssl_identity_unittest.cc
@@ -14,13 +14,13 @@
#include <vector>
#include "rtc_base/checks.h"
-#include "rtc_base/fakesslidentity.h"
+#include "rtc_base/fake_ssl_identity.h"
#include "rtc_base/helpers.h"
#include "rtc_base/logging.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/sslfingerprint.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/ssl_fingerprint.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/string_utils.h"
#include "test/gtest.h"
using rtc::SSLIdentity;
diff --git a/rtc_base/ssl_roots.h b/rtc_base/ssl_roots.h
index 0dbd19b..69f6e39 100644
--- a/rtc_base/ssl_roots.h
+++ b/rtc_base/ssl_roots.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_SSLROOTS_H_
-#define RTC_BASE_SSLROOTS_H_
+#ifndef RTC_BASE_SSL_ROOTS_H_
+#define RTC_BASE_SSL_ROOTS_H_
// This file is the root certificates in C form that are needed to connect to
// Google.
@@ -4283,4 +4283,4 @@
// clang-format on
-#endif // RTC_BASE_SSLROOTS_H_
+#endif // RTC_BASE_SSL_ROOTS_H_
diff --git a/rtc_base/ssl_stream_adapter.cc b/rtc_base/ssl_stream_adapter.cc
index 9c33a9c..372c37f 100644
--- a/rtc_base/ssl_stream_adapter.cc
+++ b/rtc_base/ssl_stream_adapter.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ssl_stream_adapter.h"
-#include "rtc_base/opensslstreamadapter.h"
+#include "rtc_base/openssl_stream_adapter.h"
///////////////////////////////////////////////////////////////////////////////
diff --git a/rtc_base/ssl_stream_adapter.h b/rtc_base/ssl_stream_adapter.h
index 3fff6bc..04d0fc5 100644
--- a/rtc_base/ssl_stream_adapter.h
+++ b/rtc_base/ssl_stream_adapter.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_SSLSTREAMADAPTER_H_
-#define RTC_BASE_SSLSTREAMADAPTER_H_
+#ifndef RTC_BASE_SSL_STREAM_ADAPTER_H_
+#define RTC_BASE_SSL_STREAM_ADAPTER_H_
#include <stddef.h>
#include <stdint.h>
@@ -17,8 +17,8 @@
#include <string>
#include <vector>
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_identity.h"
#include "rtc_base/stream.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
@@ -263,4 +263,4 @@
} // namespace rtc
-#endif // RTC_BASE_SSLSTREAMADAPTER_H_
+#endif // RTC_BASE_SSL_STREAM_ADAPTER_H_
diff --git a/rtc_base/ssl_stream_adapter_unittest.cc b/rtc_base/ssl_stream_adapter_unittest.cc
index 6fbb1d7..e866266 100644
--- a/rtc_base/ssl_stream_adapter_unittest.cc
+++ b/rtc_base/ssl_stream_adapter_unittest.cc
@@ -13,15 +13,15 @@
#include <set>
#include <string>
-#include "rtc_base/bufferqueue.h"
+#include "rtc_base/buffer_queue.h"
#include "rtc_base/checks.h"
#include "rtc_base/gunit.h"
#include "rtc_base/helpers.h"
#include "rtc_base/memory_stream.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/ssladapter.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/ssl_adapter.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/ssl_stream_adapter.h"
#include "rtc_base/stream.h"
using ::testing::WithParamInterface;
diff --git a/rtc_base/stream.cc b/rtc_base/stream.cc
index 0541bf6..083df40 100644
--- a/rtc_base/stream.cc
+++ b/rtc_base/stream.cc
@@ -14,7 +14,7 @@
#include "rtc_base/checks.h"
#include "rtc_base/location.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/message_queue.h"
#include "rtc_base/stream.h"
#include "rtc_base/thread.h"
@@ -22,7 +22,7 @@
#include <windows.h>
#define fileno _fileno
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
#endif
namespace rtc {
diff --git a/rtc_base/stream.h b/rtc_base/stream.h
index f643114..718c12e 100644
--- a/rtc_base/stream.h
+++ b/rtc_base/stream.h
@@ -16,10 +16,10 @@
#include <memory>
#include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
namespace rtc {
diff --git a/rtc_base/string_encode.cc b/rtc_base/string_encode.cc
index fc4e3bc..45ea586 100644
--- a/rtc_base/string_encode.cc
+++ b/rtc_base/string_encode.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
#include <cstdio>
#include "rtc_base/arraysize.h"
#include "rtc_base/checks.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
namespace rtc {
diff --git a/rtc_base/string_encode.h b/rtc_base/string_encode.h
index 09bf77f..d3338d9 100644
--- a/rtc_base/string_encode.h
+++ b/rtc_base/string_encode.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_STRINGENCODE_H_
-#define RTC_BASE_STRINGENCODE_H_
+#ifndef RTC_BASE_STRING_ENCODE_H_
+#define RTC_BASE_STRING_ENCODE_H_
#include <stddef.h>
#include <string>
@@ -197,4 +197,4 @@
} // namespace rtc
-#endif // RTC_BASE_STRINGENCODE_H__
+#endif // RTC_BASE_STRING_ENCODE_H__
diff --git a/rtc_base/string_encode_unittest.cc b/rtc_base/string_encode_unittest.cc
index ab871a5..cc72e43 100644
--- a/rtc_base/string_encode_unittest.cc
+++ b/rtc_base/string_encode_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
#include <string.h>
#include <sstream> // no-presubmit-check TODO(webrtc:8982)
diff --git a/rtc_base/string_utils.cc b/rtc_base/string_utils.cc
index 57ca408..97bf481 100644
--- a/rtc_base/string_utils.cc
+++ b/rtc_base/string_utils.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
namespace rtc {
diff --git a/rtc_base/string_utils.h b/rtc_base/string_utils.h
index 2a53e69..b4ce209 100644
--- a/rtc_base/string_utils.h
+++ b/rtc_base/string_utils.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_STRINGUTILS_H_
-#define RTC_BASE_STRINGUTILS_H_
+#ifndef RTC_BASE_STRING_UTILS_H_
+#define RTC_BASE_STRING_UTILS_H_
#include <ctype.h>
#include <stdarg.h>
@@ -110,4 +110,4 @@
} // namespace rtc
-#endif // RTC_BASE_STRINGUTILS_H_
+#endif // RTC_BASE_STRING_UTILS_H_
diff --git a/rtc_base/string_utils_unittest.cc b/rtc_base/string_utils_unittest.cc
index a07d8bb..b4396f1 100644
--- a/rtc_base/string_utils_unittest.cc
+++ b/rtc_base/string_utils_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
#include "test/gtest.h"
diff --git a/rtc_base/strings/json.cc b/rtc_base/strings/json.cc
index efcb97a..8a544a0 100644
--- a/rtc_base/strings/json.cc
+++ b/rtc_base/strings/json.cc
@@ -14,7 +14,7 @@
#include <limits.h>
#include <stdlib.h>
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
namespace rtc {
diff --git a/rtc_base/strings/string_builder.h b/rtc_base/strings/string_builder.h
index 27001d1..7c45ac4 100644
--- a/rtc_base/strings/string_builder.h
+++ b/rtc_base/strings/string_builder.h
@@ -17,8 +17,8 @@
#include "absl/strings/string_view.h"
#include "api/array_view.h"
-#include "rtc_base/stringencode.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_encode.h"
+#include "rtc_base/string_utils.h"
namespace rtc {
diff --git a/rtc_base/swap_queue.h b/rtc_base/swap_queue.h
index 53d4219..c3246db 100644
--- a/rtc_base/swap_queue.h
+++ b/rtc_base/swap_queue.h
@@ -16,8 +16,8 @@
#include <vector>
#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/system/unused.h"
#include "rtc_base/thread_annotations.h"
diff --git a/rtc_base/system/file_wrapper.h b/rtc_base/system/file_wrapper.h
index 0bb86a3..f2ed51a 100644
--- a/rtc_base/system/file_wrapper.h
+++ b/rtc_base/system/file_wrapper.h
@@ -14,7 +14,7 @@
#include <stddef.h>
#include <stdio.h>
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
// Implementation that can read (exclusive) or write from/to a file.
diff --git a/rtc_base/task_queue.h b/rtc_base/task_queue.h
index fa84625..0f2d219 100644
--- a/rtc_base/task_queue.h
+++ b/rtc_base/task_queue.h
@@ -17,7 +17,7 @@
#include <utility>
#include "absl/memory/memory.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/system/rtc_export.h"
#include "rtc_base/thread_annotations.h"
diff --git a/rtc_base/task_queue_for_test.h b/rtc_base/task_queue_for_test.h
index 5cd4e83..dd27f64 100644
--- a/rtc_base/task_queue_for_test.h
+++ b/rtc_base/task_queue_for_test.h
@@ -12,7 +12,7 @@
#define RTC_BASE_TASK_QUEUE_FOR_TEST_H_
#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/event.h"
#include "rtc_base/task_queue.h"
#include "rtc_base/thread_annotations.h"
diff --git a/rtc_base/task_queue_gcd.cc b/rtc_base/task_queue_gcd.cc
index f2f3412..405edab 100644
--- a/rtc_base/task_queue_gcd.cc
+++ b/rtc_base/task_queue_gcd.cc
@@ -20,8 +20,8 @@
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/task_queue_posix.h"
namespace rtc {
diff --git a/rtc_base/task_queue_libevent.cc b/rtc_base/task_queue_libevent.cc
index d30c82d..ab97b0c 100644
--- a/rtc_base/task_queue_libevent.cc
+++ b/rtc_base/task_queue_libevent.cc
@@ -24,18 +24,18 @@
#include "base/third_party/libevent/event.h"
#include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/platform_thread.h"
#include "rtc_base/platform_thread_types.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/system/unused.h"
#include "rtc_base/task_queue_posix.h"
#include "rtc_base/thread_annotations.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace rtc {
using internal::GetQueuePtrTls;
diff --git a/rtc_base/task_queue_stdlib.cc b/rtc_base/task_queue_stdlib.cc
index 0fb0ed2..2b9d5a2 100644
--- a/rtc_base/task_queue_stdlib.cc
+++ b/rtc_base/task_queue_stdlib.cc
@@ -19,14 +19,14 @@
#include <utility>
#include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/event.h"
#include "rtc_base/logging.h"
#include "rtc_base/platform_thread.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/thread_annotations.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace rtc {
namespace {
diff --git a/rtc_base/task_queue_unittest.cc b/rtc_base/task_queue_unittest.cc
index a76c09e..d4ef105 100644
--- a/rtc_base/task_queue_unittest.cc
+++ b/rtc_base/task_queue_unittest.cc
@@ -25,7 +25,7 @@
#include "rtc_base/event.h"
#include "rtc_base/task_queue.h"
#include "rtc_base/task_queue_for_test.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include "test/gtest.h"
using rtc::test::TaskQueueForTest;
diff --git a/rtc_base/task_queue_win.cc b/rtc_base/task_queue_win.cc
index 565cc9b..b73aa95 100644
--- a/rtc_base/task_queue_win.cc
+++ b/rtc_base/task_queue_win.cc
@@ -29,14 +29,14 @@
#include "rtc_base/arraysize.h"
#include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/event.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/platform_thread.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/time_utils.h"
namespace rtc {
namespace {
diff --git a/rtc_base/test_base64.h b/rtc_base/test_base64.h
index 5dc94b6..51d8c58 100644
--- a/rtc_base/test_base64.h
+++ b/rtc_base/test_base64.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_TESTBASE64_H_
-#define RTC_BASE_TESTBASE64_H_
+#ifndef RTC_BASE_TEST_BASE64_H_
+#define RTC_BASE_TEST_BASE64_H_
/* This file was generated by googleclient/talk/binary2header.sh */
@@ -2108,4 +2108,4 @@
0xba, 0x5b, 0xfe, 0x97, 0xfa, 0x4b, 0xfc, 0xba, 0x7f, 0xb1, 0xc7, 0xab,
0x1e, 0x8f, 0xff, 0xd9};
-#endif // RTC_BASE_TESTBASE64_H_
+#endif // RTC_BASE_TEST_BASE64_H_
diff --git a/rtc_base/test_certificate_verifier.h b/rtc_base/test_certificate_verifier.h
index 8ad6e4d..9775615 100644
--- a/rtc_base/test_certificate_verifier.h
+++ b/rtc_base/test_certificate_verifier.h
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_TESTCERTIFICATEVERIFIER_H_
-#define RTC_BASE_TESTCERTIFICATEVERIFIER_H_
+#ifndef RTC_BASE_TEST_CERTIFICATE_VERIFIER_H_
+#define RTC_BASE_TEST_CERTIFICATE_VERIFIER_H_
-#include "rtc_base/sslcertificate.h"
+#include "rtc_base/ssl_certificate.h"
namespace rtc {
@@ -31,4 +31,4 @@
} // namespace rtc
-#endif // RTC_BASE_TESTCERTIFICATEVERIFIER_H_
+#endif // RTC_BASE_TEST_CERTIFICATE_VERIFIER_H_
diff --git a/rtc_base/test_client.cc b/rtc_base/test_client.cc
index 00363ba..274b6ca 100644
--- a/rtc_base/test_client.cc
+++ b/rtc_base/test_client.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/testclient.h"
+#include "rtc_base/test_client.h"
#include <string.h>
#include <utility>
@@ -16,7 +16,7 @@
#include "absl/memory/memory.h"
#include "rtc_base/gunit.h"
#include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace rtc {
diff --git a/rtc_base/test_client.h b/rtc_base/test_client.h
index 16fb6ba..fb8a2f9 100644
--- a/rtc_base/test_client.h
+++ b/rtc_base/test_client.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_TESTCLIENT_H_
-#define RTC_BASE_TESTCLIENT_H_
+#ifndef RTC_BASE_TEST_CLIENT_H_
+#define RTC_BASE_TEST_CLIENT_H_
#include <memory>
#include <vector>
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/fake_clock.h"
namespace rtc {
@@ -113,4 +113,4 @@
} // namespace rtc
-#endif // RTC_BASE_TESTCLIENT_H_
+#endif // RTC_BASE_TEST_CLIENT_H_
diff --git a/rtc_base/test_client_unittest.cc b/rtc_base/test_client_unittest.cc
index d45a5a3..382aaaf 100644
--- a/rtc_base/test_client_unittest.cc
+++ b/rtc_base/test_client_unittest.cc
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/testclient.h"
+#include "rtc_base/test_client.h"
#include <utility>
#include "absl/memory/memory.h"
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/asynctcpsocket.h"
-#include "rtc_base/asyncudpsocket.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/async_tcp_socket.h"
+#include "rtc_base/async_udp_socket.h"
#include "rtc_base/logging.h"
-#include "rtc_base/nethelpers.h"
-#include "rtc_base/socketserver.h"
-#include "rtc_base/testechoserver.h"
+#include "rtc_base/net_helpers.h"
+#include "rtc_base/socket_server.h"
+#include "rtc_base/test_echo_server.h"
#include "rtc_base/thread.h"
#include "test/gtest.h"
diff --git a/rtc_base/test_echo_server.cc b/rtc_base/test_echo_server.cc
index 1e1fb59..d2e11d6 100644
--- a/rtc_base/test_echo_server.cc
+++ b/rtc_base/test_echo_server.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/testechoserver.h"
+#include "rtc_base/test_echo_server.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/socket_server.h"
namespace rtc {
diff --git a/rtc_base/test_echo_server.h b/rtc_base/test_echo_server.h
index f1342fd..4710560 100644
--- a/rtc_base/test_echo_server.h
+++ b/rtc_base/test_echo_server.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_TESTECHOSERVER_H_
-#define RTC_BASE_TESTECHOSERVER_H_
+#ifndef RTC_BASE_TEST_ECHO_SERVER_H_
+#define RTC_BASE_TEST_ECHO_SERVER_H_
#include <stddef.h>
#include <stdint.h>
@@ -17,11 +17,11 @@
#include <list>
#include <memory>
-#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"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
@@ -69,4 +69,4 @@
} // namespace rtc
-#endif // RTC_BASE_TESTECHOSERVER_H_
+#endif // RTC_BASE_TEST_ECHO_SERVER_H_
diff --git a/rtc_base/test_utils.cc b/rtc_base/test_utils.cc
index f3292fd..ecf2cfa 100644
--- a/rtc_base/test_utils.cc
+++ b/rtc_base/test_utils.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/testutils.h"
+#include "rtc_base/test_utils.h"
namespace webrtc {
namespace testing {
diff --git a/rtc_base/test_utils.h b/rtc_base/test_utils.h
index 7ec0c12..4746e96 100644
--- a/rtc_base/test_utils.h
+++ b/rtc_base/test_utils.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_TESTUTILS_H_
-#define RTC_BASE_TESTUTILS_H_
+#ifndef RTC_BASE_TEST_UTILS_H_
+#define RTC_BASE_TEST_UTILS_H_
// Utilities for testing rtc infrastructure in unittests
#include <map>
#include <utility>
-#include "rtc_base/asyncsocket.h"
+#include "rtc_base/async_socket.h"
#include "rtc_base/stream.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
@@ -137,4 +137,4 @@
} // namespace testing
} // namespace webrtc
-#endif // RTC_BASE_TESTUTILS_H_
+#endif // RTC_BASE_TEST_UTILS_H_
diff --git a/rtc_base/thread.cc b/rtc_base/thread.cc
index 4dd5fd2..936871c 100644
--- a/rtc_base/thread.cc
+++ b/rtc_base/thread.cc
@@ -28,10 +28,10 @@
#include <utility>
#include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/logging.h"
-#include "rtc_base/nullsocketserver.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/null_socket_server.h"
+#include "rtc_base/time_utils.h"
#include "rtc_base/trace_event.h"
#if defined(WEBRTC_MAC)
diff --git a/rtc_base/thread.h b/rtc_base/thread.h
index 039192c..e2d37a0 100644
--- a/rtc_base/thread.h
+++ b/rtc_base/thread.h
@@ -20,12 +20,12 @@
#if defined(WEBRTC_POSIX)
#include <pthread.h>
#endif
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/location.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/platform_thread_types.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/socket_server.h"
#include "rtc_base/thread_annotations.h"
#if defined(WEBRTC_WIN)
diff --git a/rtc_base/thread_checker.h b/rtc_base/thread_checker.h
index ad04508..baff897 100644
--- a/rtc_base/thread_checker.h
+++ b/rtc_base/thread_checker.h
@@ -20,7 +20,7 @@
#define RTC_ENABLE_THREAD_CHECKER RTC_DCHECK_IS_ON
#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/thread_annotations.h"
#include "rtc_base/thread_checker_impl.h"
diff --git a/rtc_base/thread_checker_impl.h b/rtc_base/thread_checker_impl.h
index c82fe1d..c39e10f 100644
--- a/rtc_base/thread_checker_impl.h
+++ b/rtc_base/thread_checker_impl.h
@@ -13,7 +13,7 @@
#ifndef RTC_BASE_THREAD_CHECKER_IMPL_H_
#define RTC_BASE_THREAD_CHECKER_IMPL_H_
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
#include "rtc_base/platform_thread_types.h"
namespace rtc {
diff --git a/rtc_base/thread_checker_unittest.cc b/rtc_base/thread_checker_unittest.cc
index 52397a9..a40196f 100644
--- a/rtc_base/thread_checker_unittest.cc
+++ b/rtc_base/thread_checker_unittest.cc
@@ -14,9 +14,9 @@
#include <utility>
#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/nullsocketserver.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/null_socket_server.h"
+#include "rtc_base/socket_server.h"
#include "rtc_base/task_queue.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_checker.h"
diff --git a/rtc_base/thread_unittest.cc b/rtc_base/thread_unittest.cc
index 68930f8..d87c332 100644
--- a/rtc_base/thread_unittest.cc
+++ b/rtc_base/thread_unittest.cc
@@ -10,13 +10,13 @@
#include <memory>
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/asyncudpsocket.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/async_udp_socket.h"
#include "rtc_base/event.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/nullsocketserver.h"
-#include "rtc_base/physicalsocketserver.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/null_socket_server.h"
+#include "rtc_base/physical_socket_server.h"
+#include "rtc_base/socket_address.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
diff --git a/rtc_base/time_utils.cc b/rtc_base/time_utils.cc
index 0f79a87..53f8b36 100644
--- a/rtc_base/time_utils.cc
+++ b/rtc_base/time_utils.cc
@@ -29,7 +29,7 @@
#endif
#include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
namespace rtc {
diff --git a/rtc_base/time_utils.h b/rtc_base/time_utils.h
index c6ddd73..d1d8b05 100644
--- a/rtc_base/time_utils.h
+++ b/rtc_base/time_utils.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_TIMEUTILS_H_
-#define RTC_BASE_TIMEUTILS_H_
+#ifndef RTC_BASE_TIME_UTILS_H_
+#define RTC_BASE_TIME_UTILS_H_
#include <stdint.h>
#include <time.h>
@@ -165,4 +165,4 @@
} // namespace rtc
-#endif // RTC_BASE_TIMEUTILS_H_
+#endif // RTC_BASE_TIME_UTILS_H_
diff --git a/rtc_base/time_utils_unittest.cc b/rtc_base/time_utils_unittest.cc
index a2e9a3f..b4cefb7 100644
--- a/rtc_base/time_utils_unittest.cc
+++ b/rtc_base/time_utils_unittest.cc
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
#include <memory>
#include "api/units/time_delta.h"
#include "rtc_base/event.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
#include "rtc_base/helpers.h"
#include "rtc_base/location.h"
-#include "rtc_base/messagehandler.h"
+#include "rtc_base/message_handler.h"
#include "rtc_base/thread.h"
#include "test/gtest.h"
diff --git a/rtc_base/timestamp_aligner.cc b/rtc_base/timestamp_aligner.cc
index f2da101..3d92dd8 100644
--- a/rtc_base/timestamp_aligner.cc
+++ b/rtc_base/timestamp_aligner.cc
@@ -13,8 +13,8 @@
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/timestampaligner.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
+#include "rtc_base/timestamp_aligner.h"
namespace rtc {
diff --git a/rtc_base/timestamp_aligner.h b/rtc_base/timestamp_aligner.h
index 6fa8d69..2146880 100644
--- a/rtc_base/timestamp_aligner.h
+++ b/rtc_base/timestamp_aligner.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_TIMESTAMPALIGNER_H_
-#define RTC_BASE_TIMESTAMPALIGNER_H_
+#ifndef RTC_BASE_TIMESTAMP_ALIGNER_H_
+#define RTC_BASE_TIMESTAMP_ALIGNER_H_
#include <stdint.h>
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
namespace rtc {
@@ -71,4 +71,4 @@
} // namespace rtc
-#endif // RTC_BASE_TIMESTAMPALIGNER_H_
+#endif // RTC_BASE_TIMESTAMP_ALIGNER_H_
diff --git a/rtc_base/timestamp_aligner_unittest.cc b/rtc_base/timestamp_aligner_unittest.cc
index b57f480..f92cd96 100644
--- a/rtc_base/timestamp_aligner_unittest.cc
+++ b/rtc_base/timestamp_aligner_unittest.cc
@@ -13,8 +13,8 @@
#include <limits>
#include "rtc_base/random.h"
-#include "rtc_base/timestampaligner.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
+#include "rtc_base/timestamp_aligner.h"
#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/unittest_main.cc b/rtc_base/unittest_main.cc
index 981f680..def0104 100644
--- a/rtc_base/unittest_main.cc
+++ b/rtc_base/unittest_main.cc
@@ -16,15 +16,15 @@
#include "rtc_base/flags.h"
#include "rtc_base/logging.h"
-#include "rtc_base/ssladapter.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ssl_adapter.h"
+#include "rtc_base/ssl_stream_adapter.h"
#include "system_wrappers/include/field_trial.h"
#include "system_wrappers/include/metrics.h"
#include "test/field_trial.h"
#include "test/gtest.h"
#if defined(WEBRTC_WIN)
-#include "rtc_base/win32socketinit.h"
+#include "rtc_base/win32_socket_init.h"
#endif
#if defined(WEBRTC_IOS)
diff --git a/rtc_base/virtual_socket_server.cc b/rtc_base/virtual_socket_server.cc
index 7969411..3255124 100644
--- a/rtc_base/virtual_socket_server.cc
+++ b/rtc_base/virtual_socket_server.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
#include <errno.h>
#include <math.h>
@@ -19,12 +19,12 @@
#include <vector>
#include "rtc_base/checks.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
#include "rtc_base/logging.h"
-#include "rtc_base/physicalsocketserver.h"
-#include "rtc_base/socketaddresspair.h"
+#include "rtc_base/physical_socket_server.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 rtc {
#if defined(WEBRTC_WIN)
diff --git a/rtc_base/virtual_socket_server.h b/rtc_base/virtual_socket_server.h
index 4fa7d77..610c0fb 100644
--- a/rtc_base/virtual_socket_server.h
+++ b/rtc_base/virtual_socket_server.h
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_VIRTUALSOCKETSERVER_H_
-#define RTC_BASE_VIRTUALSOCKETSERVER_H_
+#ifndef RTC_BASE_VIRTUAL_SOCKET_SERVER_H_
+#define RTC_BASE_VIRTUAL_SOCKET_SERVER_H_
#include <deque>
#include <map>
#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
#include "rtc_base/event.h"
-#include "rtc_base/fakeclock.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/fake_clock.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/socket_server.h"
namespace rtc {
@@ -409,4 +409,4 @@
} // namespace rtc
-#endif // RTC_BASE_VIRTUALSOCKETSERVER_H_
+#endif // RTC_BASE_VIRTUAL_SOCKET_SERVER_H_
diff --git a/rtc_base/virtual_socket_unittest.cc b/rtc_base/virtual_socket_unittest.cc
index 77f0367..ac0af08 100644
--- a/rtc_base/virtual_socket_unittest.cc
+++ b/rtc_base/virtual_socket_unittest.cc
@@ -23,24 +23,24 @@
#include "absl/memory/memory.h"
#include "rtc_base/arraysize.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/fake_clock.h"
#include "rtc_base/gunit.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/messagehandler.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
#include "rtc_base/socket.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/testclient.h"
-#include "rtc_base/testutils.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/test_client.h"
+#include "rtc_base/test_utils.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"
namespace rtc {
diff --git a/rtc_base/weak_ptr.h b/rtc_base/weak_ptr.h
index 8acfab0..daeb671 100644
--- a/rtc_base/weak_ptr.h
+++ b/rtc_base/weak_ptr.h
@@ -15,8 +15,8 @@
#include <utility>
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/sequenced_task_checker.h"
diff --git a/rtc_base/win/windows_version.cc b/rtc_base/win/windows_version.cc
index 65ef4fd..72aa5c6 100644
--- a/rtc_base/win/windows_version.cc
+++ b/rtc_base/win/windows_version.cc
@@ -14,7 +14,7 @@
#include <memory>
#include "rtc_base/checks.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
#if !defined(__clang__) && _MSC_FULL_VER < 191125507
#error VS 2017 Update 3.2 or higher is required
diff --git a/rtc_base/win/windows_version.h b/rtc_base/win/windows_version.h
index 39d333e..fa0a767 100644
--- a/rtc_base/win/windows_version.h
+++ b/rtc_base/win/windows_version.h
@@ -14,7 +14,7 @@
#include <stddef.h>
#include <string>
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
typedef void* HANDLE;
diff --git a/rtc_base/win32.cc b/rtc_base/win32.cc
index 480d97b..b5a2611 100644
--- a/rtc_base/win32.cc
+++ b/rtc_base/win32.cc
@@ -15,10 +15,10 @@
#include <algorithm>
#include "rtc_base/arraysize.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
namespace rtc {
diff --git a/rtc_base/win32_socket_init.h b/rtc_base/win32_socket_init.h
index 7f9bdcc..4a90e14 100644
--- a/rtc_base/win32_socket_init.h
+++ b/rtc_base/win32_socket_init.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_WIN32SOCKETINIT_H_
-#define RTC_BASE_WIN32SOCKETINIT_H_
+#ifndef RTC_BASE_WIN32_SOCKET_INIT_H_
+#define RTC_BASE_WIN32_SOCKET_INIT_H_
#ifndef WEBRTC_WIN
#error "Only #include this header in Windows builds"
@@ -38,4 +38,4 @@
} // namespace rtc
-#endif // RTC_BASE_WIN32SOCKETINIT_H_
+#endif // RTC_BASE_WIN32_SOCKET_INIT_H_
diff --git a/rtc_base/win32_socket_server.cc b/rtc_base/win32_socket_server.cc
index 230f3ed..389b76b 100644
--- a/rtc_base/win32_socket_server.cc
+++ b/rtc_base/win32_socket_server.cc
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/win32socketserver.h"
+#include "rtc_base/win32_socket_server.h"
#include <ws2tcpip.h> // NOLINT
#include <algorithm>
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h" // For Time, TimeSince
-#include "rtc_base/win32window.h"
+#include "rtc_base/time_utils.h" // For Time, TimeSince
+#include "rtc_base/win32_window.h"
namespace rtc {
diff --git a/rtc_base/win32_socket_server.h b/rtc_base/win32_socket_server.h
index 0b11d64..37515d9 100644
--- a/rtc_base/win32_socket_server.h
+++ b/rtc_base/win32_socket_server.h
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_WIN32SOCKETSERVER_H_
-#define RTC_BASE_WIN32SOCKETSERVER_H_
+#ifndef RTC_BASE_WIN32_SOCKET_SERVER_H_
+#define RTC_BASE_WIN32_SOCKET_SERVER_H_
#if defined(WEBRTC_WIN)
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/message_queue.h"
#include "rtc_base/socket.h"
-#include "rtc_base/socketfactory.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/socket_factory.h"
+#include "rtc_base/socket_server.h"
#include "rtc_base/thread.h"
-#include "rtc_base/win32window.h"
+#include "rtc_base/win32_window.h"
namespace rtc {
@@ -151,4 +151,4 @@
#endif // WEBRTC_WIN
-#endif // RTC_BASE_WIN32SOCKETSERVER_H_
+#endif // RTC_BASE_WIN32_SOCKET_SERVER_H_
diff --git a/rtc_base/win32_socket_server_unittest.cc b/rtc_base/win32_socket_server_unittest.cc
index 60295f1..d8484d1 100644
--- a/rtc_base/win32_socket_server_unittest.cc
+++ b/rtc_base/win32_socket_server_unittest.cc
@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/win32socketserver.h"
+#include "rtc_base/win32_socket_server.h"
#include "rtc_base/gunit.h"
#include "rtc_base/socket_unittest.h"
#include "rtc_base/thread.h"
diff --git a/rtc_base/win32_unittest.cc b/rtc_base/win32_unittest.cc
index 5691be4..913aa01 100644
--- a/rtc_base/win32_unittest.cc
+++ b/rtc_base/win32_unittest.cc
@@ -11,7 +11,7 @@
#include <string>
#include "rtc_base/gunit.h"
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/net_helpers.h"
#include "rtc_base/win32.h"
#if !defined(WEBRTC_WIN)
diff --git a/rtc_base/win32_window.cc b/rtc_base/win32_window.cc
index 4290894..fc7b4c3 100644
--- a/rtc_base/win32_window.cc
+++ b/rtc_base/win32_window.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/win32window.h"
+#include "rtc_base/win32_window.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
diff --git a/rtc_base/win32_window.h b/rtc_base/win32_window.h
index e96aa35..5256a85 100644
--- a/rtc_base/win32_window.h
+++ b/rtc_base/win32_window.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef RTC_BASE_WIN32WINDOW_H_
-#define RTC_BASE_WIN32WINDOW_H_
+#ifndef RTC_BASE_WIN32_WINDOW_H_
+#define RTC_BASE_WIN32_WINDOW_H_
#if defined(WEBRTC_WIN)
@@ -67,4 +67,4 @@
#endif // WEBRTC_WIN
-#endif // RTC_BASE_WIN32WINDOW_H_
+#endif // RTC_BASE_WIN32_WINDOW_H_
diff --git a/rtc_base/win32_window_unittest.cc b/rtc_base/win32_window_unittest.cc
index c659349..62430bb 100644
--- a/rtc_base/win32_window_unittest.cc
+++ b/rtc_base/win32_window_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/win32window.h"
+#include "rtc_base/win32_window.h"
#include "rtc_base/gunit.h"
#include "rtc_base/logging.h"
