Google Git
Sign in
webrtc/src.git/a4d873786f10eedd72de25ad0d94ad7c53c1f68a^!/./rtc_base
commit
a4d873786f10eedd72de25ad0d94ad7c53c1f68a
[log]
author
Jonas Olsson <jonasolsson@webrtc.org>
Fri Jul 05 17:08:33 2019
committer
Commit Bot <commit-bot@chromium.org>
Mon Jul 08 13:45:15 2019
tree
962ed681b560cc929c3521fc50fdded8fd88860d
parent
c93bfcfd2f7613a1f8fa26b567de327db3548c7f [diff]
Format almost everything.

This CL was generated by running

git ls-files | grep -P "(\.h|\.cc)$" | grep -v 'sdk/' | grep -v 'rtc_base/ssl_' | \
grep -v 'fake_rtc_certificate_generator.h' | grep -v 'modules/audio_device/win/' | \
grep -v 'system_wrappers/source/clock.cc' | grep -v 'rtc_base/trace_event.h' | \
grep -v 'modules/audio_coding/codecs/ilbc/' | grep -v 'screen_capturer_mac.h' | \
grep -v 'spl_inl_mips.h' | grep -v 'data_size_unittest.cc' | grep -v 'timestamp_unittest.cc' \
| xargs clang-format -i ; git cl format

Most of these changes are clang-format grouping and reordering includes
differently.

Bug: webrtc:9340
Change-Id: Ic83ddbc169bfacd21883e381b5181c3dd4fe8a63
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144051
Commit-Queue: Jonas Olsson <jonasolsson@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28505}

diff --git a/rtc_base/async_packet_socket.cc b/rtc_base/async_packet_socket.cc
index a708fae..a42725c 100644
--- a/rtc_base/async_packet_socket.cc
+++ b/rtc_base/async_packet_socket.cc

@@ -9,6 +9,7 @@
  */
 
 #include "rtc_base/async_packet_socket.h"
+
 #include "rtc_base/net_helper.h"
 
 namespace rtc {

diff --git a/rtc_base/async_socket.cc b/rtc_base/async_socket.cc
index ab3f99e..90e2c2a 100644
--- a/rtc_base/async_socket.cc
+++ b/rtc_base/async_socket.cc

@@ -9,6 +9,7 @@
  */
 
 #include "rtc_base/async_socket.h"
+
 #include "rtc_base/checks.h"
 
 namespace rtc {

diff --git a/rtc_base/async_tcp_socket.cc b/rtc_base/async_tcp_socket.cc
index 148e459..d03ae32 100644
--- a/rtc_base/async_tcp_socket.cc
+++ b/rtc_base/async_tcp_socket.cc

@@ -12,6 +12,7 @@
 
 #include <stdint.h>
 #include <string.h>
+
 #include <algorithm>
 #include <memory>
 

diff --git a/rtc_base/async_tcp_socket.h b/rtc_base/async_tcp_socket.h
index ae12a94..fecaba7 100644
--- a/rtc_base/async_tcp_socket.h
+++ b/rtc_base/async_tcp_socket.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_ASYNC_TCP_SOCKET_H_
 
 #include <stddef.h>
+
 #include <memory>
 
 #include "rtc_base/async_packet_socket.h"

diff --git a/rtc_base/async_tcp_socket_unittest.cc b/rtc_base/async_tcp_socket_unittest.cc
index 4fa9d92..c701433 100644
--- a/rtc_base/async_tcp_socket_unittest.cc
+++ b/rtc_base/async_tcp_socket_unittest.cc

@@ -8,10 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/async_tcp_socket.h"
+
 #include <memory>
 #include <string>
 
-#include "rtc_base/async_tcp_socket.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/virtual_socket_server.h"
 

diff --git a/rtc_base/async_udp_socket.cc b/rtc_base/async_udp_socket.cc
index 8521910..378b687 100644
--- a/rtc_base/async_udp_socket.cc
+++ b/rtc_base/async_udp_socket.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/async_udp_socket.h"
 
 #include <stdint.h>
+
 #include <string>
 
 #include "rtc_base/checks.h"

diff --git a/rtc_base/async_udp_socket.h b/rtc_base/async_udp_socket.h
index 237c88d..d1f0660 100644
--- a/rtc_base/async_udp_socket.h
+++ b/rtc_base/async_udp_socket.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_ASYNC_UDP_SOCKET_H_
 
 #include <stddef.h>
+
 #include <memory>
 
 #include "rtc_base/async_packet_socket.h"

diff --git a/rtc_base/async_udp_socket_unittest.cc b/rtc_base/async_udp_socket_unittest.cc
index 7ef7c86..ecb28c1 100644
--- a/rtc_base/async_udp_socket_unittest.cc
+++ b/rtc_base/async_udp_socket_unittest.cc

@@ -8,10 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/async_udp_socket.h"
+
 #include <memory>
 #include <string>
 
-#include "rtc_base/async_udp_socket.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/physical_socket_server.h"
 #include "rtc_base/virtual_socket_server.h"

diff --git a/rtc_base/base64_unittest.cc b/rtc_base/base64_unittest.cc
index dcc4d1b..6722a1f 100644
--- a/rtc_base/base64_unittest.cc
+++ b/rtc_base/base64_unittest.cc

@@ -12,6 +12,7 @@
 
 #include <stdio.h>
 #include <string.h>
+
 #include <algorithm>
 
 #include "rtc_base/logging.h"

diff --git a/rtc_base/bind_unittest.cc b/rtc_base/bind_unittest.cc
index a62e547..a97d2be 100644
--- a/rtc_base/bind_unittest.cc
+++ b/rtc_base/bind_unittest.cc

@@ -8,9 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/bind.h"
+
 #include <string>
 
-#include "rtc_base/bind.h"
 #include "rtc_base/ref_count.h"
 #include "rtc_base/ref_counted_object.h"
 #include "test/gtest.h"

diff --git a/rtc_base/bitrate_allocation_strategy.h b/rtc_base/bitrate_allocation_strategy.h
index fc54373..def7736 100644
--- a/rtc_base/bitrate_allocation_strategy.h
+++ b/rtc_base/bitrate_allocation_strategy.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_BITRATE_ALLOCATION_STRATEGY_H_
 
 #include <stdint.h>
+
 #include <string>
 #include <vector>
 

diff --git a/rtc_base/buffer.h b/rtc_base/buffer.h
index e95636a..34ef885 100644
--- a/rtc_base/buffer.h
+++ b/rtc_base/buffer.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_BUFFER_H_
 
 #include <stdint.h>
+
 #include <algorithm>
 #include <cstring>
 #include <memory>

diff --git a/rtc_base/buffer_queue.cc b/rtc_base/buffer_queue.cc
index 8f3ead9..445045c 100644
--- a/rtc_base/buffer_queue.cc
+++ b/rtc_base/buffer_queue.cc

@@ -12,6 +12,7 @@
 
 #include <stdint.h>
 #include <string.h>
+
 #include <algorithm>
 
 namespace rtc {

diff --git a/rtc_base/buffer_queue.h b/rtc_base/buffer_queue.h
index bce3c8a..5cb18d0 100644
--- a/rtc_base/buffer_queue.h
+++ b/rtc_base/buffer_queue.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_BUFFER_QUEUE_H_
 
 #include <stddef.h>
+
 #include <deque>
 #include <vector>
 

diff --git a/rtc_base/byte_buffer.h b/rtc_base/byte_buffer.h
index 73e9040..e48d708 100644
--- a/rtc_base/byte_buffer.h
+++ b/rtc_base/byte_buffer.h

@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <string>
 
 #include "rtc_base/buffer.h"

diff --git a/rtc_base/byte_order_unittest.cc b/rtc_base/byte_order_unittest.cc
index 82b5fe9..0db230f 100644
--- a/rtc_base/byte_order_unittest.cc
+++ b/rtc_base/byte_order_unittest.cc

@@ -8,9 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/byte_order.h"
+
 #include <stdint.h>
 
-#include "rtc_base/byte_order.h"
 #include "test/gtest.h"
 
 namespace rtc {

diff --git a/rtc_base/checks.cc b/rtc_base/checks.cc
index d541307..1bddf22 100644
--- a/rtc_base/checks.cc
+++ b/rtc_base/checks.cc

@@ -164,7 +164,8 @@
 }  // namespace rtc
 
 // Function to call from the C version of the RTC_CHECK and RTC_DCHECK macros.
-RTC_NORETURN void rtc_FatalMessage(const char* file, int line,
+RTC_NORETURN void rtc_FatalMessage(const char* file,
+                                   int line,
                                    const char* msg) {
   static constexpr rtc::webrtc_checks_impl::CheckArgType t[] = {
       rtc::webrtc_checks_impl::CheckArgType::kEnd};

diff --git a/rtc_base/checks.h b/rtc_base/checks.h
index 3bfa759..627e301 100644
--- a/rtc_base/checks.h
+++ b/rtc_base/checks.h

@@ -24,7 +24,7 @@
 #if defined(_MSC_VER)
 #define RTC_NORETURN __declspec(noreturn)
 #elif defined(__GNUC__)
-#define RTC_NORETURN __attribute__ ((__noreturn__))
+#define RTC_NORETURN __attribute__((__noreturn__))
 #else
 #define RTC_NORETURN
 #endif

diff --git a/rtc_base/copy_on_write_buffer.h b/rtc_base/copy_on_write_buffer.h
index c7df325..c60e78b 100644
--- a/rtc_base/copy_on_write_buffer.h
+++ b/rtc_base/copy_on_write_buffer.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_COPY_ON_WRITE_BUFFER_H_
 
 #include <stdint.h>
+
 #include <algorithm>
 #include <cstring>
 #include <string>

diff --git a/rtc_base/critical_section_unittest.cc b/rtc_base/critical_section_unittest.cc
index cf9dfaf..04af949 100644
--- a/rtc_base/critical_section_unittest.cc
+++ b/rtc_base/critical_section_unittest.cc

@@ -8,8 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/critical_section.h"
+
 #include <stddef.h>
 #include <stdint.h>
+
 #include <memory>
 #include <set>
 #include <utility>
@@ -18,7 +21,6 @@
 #include "rtc_base/arraysize.h"
 #include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/location.h"
 #include "rtc_base/message_handler.h"

diff --git a/rtc_base/event_tracer.cc b/rtc_base/event_tracer.cc
index d3f6ebf..d23af21 100644
--- a/rtc_base/event_tracer.cc
+++ b/rtc_base/event_tracer.cc

@@ -13,6 +13,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+
 #include <string>
 #include <vector>
 

diff --git a/rtc_base/experiments/alr_experiment.cc b/rtc_base/experiments/alr_experiment.cc
index d805cb3..119a401 100644
--- a/rtc_base/experiments/alr_experiment.cc
+++ b/rtc_base/experiments/alr_experiment.cc

@@ -12,6 +12,7 @@
 
 #include <inttypes.h>
 #include <stdio.h>
+
 #include <string>
 
 #include "api/transport/field_trial_based_config.h"

diff --git a/rtc_base/experiments/balanced_degradation_settings.cc b/rtc_base/experiments/balanced_degradation_settings.cc
index 884a669..3205550 100644
--- a/rtc_base/experiments/balanced_degradation_settings.cc
+++ b/rtc_base/experiments/balanced_degradation_settings.cc

@@ -9,6 +9,7 @@
  */
 
 #include "rtc_base/experiments/balanced_degradation_settings.h"
+
 #include <limits>
 
 #include "rtc_base/experiments/field_trial_list.h"

diff --git a/rtc_base/experiments/cpu_speed_experiment.cc b/rtc_base/experiments/cpu_speed_experiment.cc
index 114c27f..6d5650a 100644
--- a/rtc_base/experiments/cpu_speed_experiment.cc
+++ b/rtc_base/experiments/cpu_speed_experiment.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/experiments/cpu_speed_experiment.h"
 
 #include <stdio.h>
+
 #include <string>
 
 #include "rtc_base/logging.h"

diff --git a/rtc_base/experiments/field_trial_units.cc b/rtc_base/experiments/field_trial_units.cc
index 5311a3a..a7cd13f 100644
--- a/rtc_base/experiments/field_trial_units.cc
+++ b/rtc_base/experiments/field_trial_units.cc

@@ -10,6 +10,7 @@
 #include "rtc_base/experiments/field_trial_units.h"
 
 #include <stdio.h>
+
 #include <limits>
 #include <string>
 

diff --git a/rtc_base/experiments/field_trial_units.h b/rtc_base/experiments/field_trial_units.h
index af88f4a..353c87b 100644
--- a/rtc_base/experiments/field_trial_units.h
+++ b/rtc_base/experiments/field_trial_units.h

@@ -10,11 +10,10 @@
 #ifndef RTC_BASE_EXPERIMENTS_FIELD_TRIAL_UNITS_H_
 #define RTC_BASE_EXPERIMENTS_FIELD_TRIAL_UNITS_H_
 
-#include "rtc_base/experiments/field_trial_parser.h"
-
 #include "api/units/data_rate.h"
 #include "api/units/data_size.h"
 #include "api/units/time_delta.h"
+#include "rtc_base/experiments/field_trial_parser.h"
 
 namespace webrtc {
 extern template class FieldTrialParameter<DataRate>;

diff --git a/rtc_base/experiments/field_trial_units_unittest.cc b/rtc_base/experiments/field_trial_units_unittest.cc
index 94cbdb8..189fd10 100644
--- a/rtc_base/experiments/field_trial_units_unittest.cc
+++ b/rtc_base/experiments/field_trial_units_unittest.cc

@@ -7,11 +7,12 @@
  *  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/experiments/field_trial_units.h"
+
 #include <string>
 
 #include "absl/types/optional.h"
 #include "rtc_base/experiments/field_trial_parser.h"
-#include "rtc_base/experiments/field_trial_units.h"
 #include "test/gtest.h"
 
 namespace webrtc {

diff --git a/rtc_base/experiments/jitter_upper_bound_experiment.cc b/rtc_base/experiments/jitter_upper_bound_experiment.cc
index 84a17bf..ea95e84d 100644
--- a/rtc_base/experiments/jitter_upper_bound_experiment.cc
+++ b/rtc_base/experiments/jitter_upper_bound_experiment.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/experiments/jitter_upper_bound_experiment.h"
 
 #include <stdio.h>
+
 #include <string>
 
 #include "rtc_base/logging.h"

diff --git a/rtc_base/experiments/keyframe_interval_settings_unittest.cc b/rtc_base/experiments/keyframe_interval_settings_unittest.cc
index 5457dc4..7d89a4c 100644
--- a/rtc_base/experiments/keyframe_interval_settings_unittest.cc
+++ b/rtc_base/experiments/keyframe_interval_settings_unittest.cc

@@ -9,6 +9,7 @@
  */
 
 #include "rtc_base/experiments/keyframe_interval_settings.h"
+
 #include "test/field_trial.h"
 #include "test/gtest.h"
 

diff --git a/rtc_base/experiments/normalize_simulcast_size_experiment.cc b/rtc_base/experiments/normalize_simulcast_size_experiment.cc
index ddf0683..ce817a0 100644
--- a/rtc_base/experiments/normalize_simulcast_size_experiment.cc
+++ b/rtc_base/experiments/normalize_simulcast_size_experiment.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/experiments/normalize_simulcast_size_experiment.h"
 
 #include <stdio.h>
+
 #include <string>
 
 #include "rtc_base/logging.h"

diff --git a/rtc_base/experiments/quality_scaling_experiment.cc b/rtc_base/experiments/quality_scaling_experiment.cc
index 4a50115..ca58ba8 100644
--- a/rtc_base/experiments/quality_scaling_experiment.cc
+++ b/rtc_base/experiments/quality_scaling_experiment.cc

@@ -10,6 +10,7 @@
 #include "rtc_base/experiments/quality_scaling_experiment.h"
 
 #include <stdio.h>
+
 #include <string>
 
 #include "rtc_base/logging.h"

diff --git a/rtc_base/experiments/rtt_mult_experiment.cc b/rtc_base/experiments/rtt_mult_experiment.cc
index ed26262..b4c9c31 100644
--- a/rtc_base/experiments/rtt_mult_experiment.cc
+++ b/rtc_base/experiments/rtt_mult_experiment.cc

@@ -10,6 +10,7 @@
 #include "rtc_base/experiments/rtt_mult_experiment.h"
 
 #include <stdio.h>
+
 #include <algorithm>
 #include <string>
 

diff --git a/rtc_base/fake_clock_unittest.cc b/rtc_base/fake_clock_unittest.cc
index 74073d0..0cabce8 100644
--- a/rtc_base/fake_clock_unittest.cc
+++ b/rtc_base/fake_clock_unittest.cc

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "test/gtest.h"
-
 #include "rtc_base/fake_clock.h"
 
+#include "test/gtest.h"
+
 namespace rtc {
 TEST(ScopedFakeClockTest, OverridesGlobalClock) {
   const int64_t kFixedTimeUs = 100000;

diff --git a/rtc_base/fake_network.h b/rtc_base/fake_network.h
index 5913cc3..040b242 100644
--- a/rtc_base/fake_network.h
+++ b/rtc_base/fake_network.h

@@ -82,8 +82,8 @@
   // MessageHandler interface.
   void OnMessage(Message* msg) override { DoUpdateNetworks(); }
 
-  using NetworkManagerBase::set_enumeration_permission;
   using NetworkManagerBase::set_default_local_addresses;
+  using NetworkManagerBase::set_enumeration_permission;
 
   // rtc::NetworkManager override.
   webrtc::MdnsResponderInterface* GetMdnsResponder() const override {

diff --git a/rtc_base/file_rotating_stream.cc b/rtc_base/file_rotating_stream.cc
index 98e817b..826e674 100644
--- a/rtc_base/file_rotating_stream.cc
+++ b/rtc_base/file_rotating_stream.cc

@@ -16,6 +16,7 @@
 
 #if defined(WEBRTC_WIN)
 #include <windows.h>
+
 #include "rtc_base/string_utils.h"
 #else
 #include <dirent.h>

diff --git a/rtc_base/file_rotating_stream.h b/rtc_base/file_rotating_stream.h
index 78e2983..117cf20 100644
--- a/rtc_base/file_rotating_stream.h
+++ b/rtc_base/file_rotating_stream.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_FILE_ROTATING_STREAM_H_
 
 #include <stddef.h>
+
 #include <memory>
 #include <string>
 #include <vector>

diff --git a/rtc_base/file_rotating_stream_unittest.cc b/rtc_base/file_rotating_stream_unittest.cc
index 22e247f..c2ba067 100644
--- a/rtc_base/file_rotating_stream_unittest.cc
+++ b/rtc_base/file_rotating_stream_unittest.cc

@@ -8,12 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/file_rotating_stream.h"
+
 #include <string.h>
+
 #include <cstdint>
 #include <memory>
 
 #include "rtc_base/arraysize.h"
-#include "rtc_base/file_rotating_stream.h"
 #include "test/gtest.h"
 #include "test/testsupport/file_utils.h"
 

diff --git a/rtc_base/firewall_socket_server.cc b/rtc_base/firewall_socket_server.cc
index f73da99..6490f34 100644
--- a/rtc_base/firewall_socket_server.cc
+++ b/rtc_base/firewall_socket_server.cc

@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
+
 #include <string>
 
 #include "absl/algorithm/container.h"

diff --git a/rtc_base/helpers.cc b/rtc_base/helpers.cc
index d8ea89f..64cab10 100644
--- a/rtc_base/helpers.cc
+++ b/rtc_base/helpers.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/helpers.h"
 
 #include <openssl/rand.h>
+
 #include <cstdint>
 #include <limits>
 #include <memory>

diff --git a/rtc_base/helpers.h b/rtc_base/helpers.h
index a93b321..29c4ab0 100644
--- a/rtc_base/helpers.h
+++ b/rtc_base/helpers.h

@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <string>
 
 namespace rtc {

diff --git a/rtc_base/helpers_unittest.cc b/rtc_base/helpers_unittest.cc
index 8d8f900..b855872 100644
--- a/rtc_base/helpers_unittest.cc
+++ b/rtc_base/helpers_unittest.cc

@@ -8,11 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/helpers.h"
+
 #include <string.h>
+
 #include <string>
 
 #include "rtc_base/buffer.h"
-#include "rtc_base/helpers.h"
 #include "test/gtest.h"
 
 namespace rtc {

diff --git a/rtc_base/http_common.cc b/rtc_base/http_common.cc
index 10cfb3a..1dd4a20 100644
--- a/rtc_base/http_common.cc
+++ b/rtc_base/http_common.cc

@@ -21,6 +21,7 @@
 
 #include <ctype.h>  // for isspace
 #include <stdio.h>  // for sprintf
+
 #include <utility>  // for pair
 #include <vector>
 

diff --git a/rtc_base/ifaddrs_android.cc b/rtc_base/ifaddrs_android.cc
index 94b8669..1cc63fe 100644
--- a/rtc_base/ifaddrs_android.cc
+++ b/rtc_base/ifaddrs_android.cc

@@ -10,6 +10,7 @@
 
 #if defined(WEBRTC_ANDROID)
 #include "rtc_base/ifaddrs_android.h"
+
 #include <errno.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>

diff --git a/rtc_base/ifaddrs_converter.cc b/rtc_base/ifaddrs_converter.cc
index 586b4e9..d963efd 100644
--- a/rtc_base/ifaddrs_converter.cc
+++ b/rtc_base/ifaddrs_converter.cc

@@ -40,7 +40,9 @@
           reinterpret_cast<sockaddr_in6*>(interface->ifa_netmask)->sin6_addr);
       return true;
     }
-    default: { return false; }
+    default: {
+      return false;
+    }
   }
 }
 

diff --git a/rtc_base/log_sinks.cc b/rtc_base/log_sinks.cc
index db12e9f..a3019b9 100644
--- a/rtc_base/log_sinks.cc
+++ b/rtc_base/log_sinks.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/log_sinks.h"
 
 #include <string.h>
+
 #include <cstdio>
 #include <string>
 

diff --git a/rtc_base/log_sinks.h b/rtc_base/log_sinks.h
index 9e35748..70d0299 100644
--- a/rtc_base/log_sinks.h
+++ b/rtc_base/log_sinks.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_LOG_SINKS_H_
 
 #include <stddef.h>
+
 #include <memory>
 #include <string>
 

diff --git a/rtc_base/logging.cc b/rtc_base/logging.cc
index b842b38..a4aea28 100644
--- a/rtc_base/logging.cc
+++ b/rtc_base/logging.cc

@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
+
 #include <algorithm>
 #include <cstdarg>
 #include <vector>

diff --git a/rtc_base/logging.h b/rtc_base/logging.h
index 7931daa..17c6c24b 100644
--- a/rtc_base/logging.h
+++ b/rtc_base/logging.h

@@ -91,12 +91,12 @@
 // LogErrorContext assists in interpreting the meaning of an error value.
 enum LogErrorContext {
   ERRCTX_NONE,
-  ERRCTX_ERRNO,     // System-local errno
-  ERRCTX_HRESULT,   // Windows HRESULT
+  ERRCTX_ERRNO,    // System-local errno
+  ERRCTX_HRESULT,  // Windows HRESULT
 
   // Abbreviations for LOG_E macro
-  ERRCTX_EN = ERRCTX_ERRNO,     // LOG_E(sev, EN, x)
-  ERRCTX_HR = ERRCTX_HRESULT,   // LOG_E(sev, HR, x)
+  ERRCTX_EN = ERRCTX_ERRNO,    // LOG_E(sev, EN, x)
+  ERRCTX_HR = ERRCTX_HRESULT,  // LOG_E(sev, HR, x)
 };
 
 // Virtual sink interface that can receive log messages.
@@ -541,12 +541,12 @@
   return (LogMessage::GetMinLogSeverity() <= sev);
 }
 
-#define RTC_LOG_E(sev, ctx, err)                                    \
-    rtc::webrtc_logging_impl::LogCall() &                           \
-        rtc::webrtc_logging_impl::LogStreamer<>()                   \
-            << rtc::webrtc_logging_impl::LogMetadataErr {           \
-      {__FILE__, __LINE__, rtc::sev}, rtc::ERRCTX_##ctx, (err)      \
-    }
+#define RTC_LOG_E(sev, ctx, err)                             \
+  rtc::webrtc_logging_impl::LogCall() &                      \
+      rtc::webrtc_logging_impl::LogStreamer<>()              \
+          << rtc::webrtc_logging_impl::LogMetadataErr {      \
+    {__FILE__, __LINE__, rtc::sev}, rtc::ERRCTX_##ctx, (err) \
+  }
 
 #define RTC_LOG_T(sev) RTC_LOG(sev) << this << ": "
 
@@ -578,12 +578,12 @@
 }
 }  // namespace webrtc_logging_impl
 
-#define RTC_LOG_TAG(sev, tag)                                                \
-    rtc::webrtc_logging_impl::LogCall() &                                    \
-        rtc::webrtc_logging_impl::LogStreamer<>()                            \
-            << rtc::webrtc_logging_impl::LogMetadataTag {                    \
-      sev, rtc::webrtc_logging_impl::AdaptString(tag)                        \
-    }
+#define RTC_LOG_TAG(sev, tag)                           \
+  rtc::webrtc_logging_impl::LogCall() &                 \
+      rtc::webrtc_logging_impl::LogStreamer<>()         \
+          << rtc::webrtc_logging_impl::LogMetadataTag { \
+    sev, rtc::webrtc_logging_impl::AdaptString(tag)     \
+  }
 
 #else
 

diff --git a/rtc_base/logging_unittest.cc b/rtc_base/logging_unittest.cc
index 54f6549..637d2e0 100644
--- a/rtc_base/logging_unittest.cc
+++ b/rtc_base/logging_unittest.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/logging.h"
 
 #include <string.h>
+
 #include <algorithm>
 
 #include "rtc_base/arraysize.h"

diff --git a/rtc_base/mac_ifaddrs_converter.cc b/rtc_base/mac_ifaddrs_converter.cc
index 254be9b..eb82cf2 100644
--- a/rtc_base/mac_ifaddrs_converter.cc
+++ b/rtc_base/mac_ifaddrs_converter.cc

@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include <memory>
-
 #include <net/if.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
 
+#include <memory>
+
 #include "rtc_base/checks.h"
 #include "rtc_base/ifaddrs_converter.h"
 #include "rtc_base/logging.h"

diff --git a/rtc_base/mac_utils.cc b/rtc_base/mac_utils.cc
index 390f183..d2428b4 100644
--- a/rtc_base/mac_utils.cc
+++ b/rtc_base/mac_utils.cc

@@ -8,14 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include <cstring>
-#include <memory>
+#include "rtc_base/mac_utils.h"
 
 #include <sys/utsname.h>
 
+#include <cstring>
+#include <memory>
+
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/mac_utils.h"
 
 namespace rtc {
 

diff --git a/rtc_base/mac_utils.h b/rtc_base/mac_utils.h
index ae97c3a..5f5b836 100644
--- a/rtc_base/mac_utils.h
+++ b/rtc_base/mac_utils.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_MAC_UTILS_H_
 
 #include <CoreFoundation/CoreFoundation.h>
+
 #include <string>
 
 namespace rtc {

diff --git a/rtc_base/memory/aligned_malloc.cc b/rtc_base/memory/aligned_malloc.cc
index 5de8dab..b00fab2 100644
--- a/rtc_base/memory/aligned_malloc.cc
+++ b/rtc_base/memory/aligned_malloc.cc

@@ -10,11 +10,11 @@
 
 #include "rtc_base/memory/aligned_malloc.h"
 
-#include "rtc_base/checks.h"
-
 #include <stdlib.h>  // for free, malloc
 #include <string.h>  // for memcpy
 
+#include "rtc_base/checks.h"
+
 #ifdef _WIN32
 #include <windows.h>
 #else

diff --git a/rtc_base/memory/fifo_buffer_unittest.cc b/rtc_base/memory/fifo_buffer_unittest.cc
index c2926b3..14cb4a5 100644
--- a/rtc_base/memory/fifo_buffer_unittest.cc
+++ b/rtc_base/memory/fifo_buffer_unittest.cc

@@ -8,9 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/memory/fifo_buffer.h"
+
 #include <string.h>
 
-#include "rtc_base/memory/fifo_buffer.h"
 #include "test/gtest.h"
 
 namespace rtc {

diff --git a/rtc_base/memory_stream.cc b/rtc_base/memory_stream.cc
index a30aacd..ed9c14a 100644
--- a/rtc_base/memory_stream.cc
+++ b/rtc_base/memory_stream.cc

@@ -8,12 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/memory_stream.h"
+
 #include <errno.h>
 #include <string.h>
+
 #include <algorithm>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/memory_stream.h"
 
 namespace rtc {
 

diff --git a/rtc_base/memory_usage.cc b/rtc_base/memory_usage.cc
index 20db9f3..4284e4f 100644
--- a/rtc_base/memory_usage.cc
+++ b/rtc_base/memory_usage.cc

@@ -12,6 +12,7 @@
 
 #if defined(WEBRTC_LINUX)
 #include <unistd.h>
+
 #include <cstdio>
 #elif defined(WEBRTC_MAC)
 #include <mach/mach.h>

diff --git a/rtc_base/message_digest.cc b/rtc_base/message_digest.cc
index b1d4a48..62b4a6b 100644
--- a/rtc_base/message_digest.cc
+++ b/rtc_base/message_digest.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/message_digest.h"
 
 #include <string.h>
+
 #include <cstdint>
 #include <memory>
 

diff --git a/rtc_base/message_digest.h b/rtc_base/message_digest.h
index bbb22cf..36f00b5 100644
--- a/rtc_base/message_digest.h
+++ b/rtc_base/message_digest.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_MESSAGE_DIGEST_H_
 
 #include <stddef.h>
+
 #include <string>
 
 namespace rtc {

diff --git a/rtc_base/message_handler.cc b/rtc_base/message_handler.cc
index 0e6c237..dd86e59 100644
--- a/rtc_base/message_handler.cc
+++ b/rtc_base/message_handler.cc

@@ -9,6 +9,7 @@
  */
 
 #include "rtc_base/message_handler.h"
+
 #include "rtc_base/message_queue.h"
 
 namespace rtc {

diff --git a/rtc_base/message_queue.cc b/rtc_base/message_queue.cc
index f827db4..ffa8a56 100644
--- a/rtc_base/message_queue.cc
+++ b/rtc_base/message_queue.cc

@@ -7,6 +7,8 @@
  *  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/message_queue.h"
+
 #include <string>
 #include <utility>
 
@@ -14,7 +16,6 @@
 #include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/message_queue.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"

diff --git a/rtc_base/nat_server.cc b/rtc_base/nat_server.cc
index 2b614e8..323a787 100644
--- a/rtc_base/nat_server.cc
+++ b/rtc_base/nat_server.cc

@@ -8,11 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/nat_server.h"
+
 #include <memory>
 
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/nat_server.h"
 #include "rtc_base/nat_socket_factory.h"
 #include "rtc_base/socket_adapters.h"
 

diff --git a/rtc_base/nat_socket_factory.h b/rtc_base/nat_socket_factory.h
index 9b5cb5a..bbc109e 100644
--- a/rtc_base/nat_socket_factory.h
+++ b/rtc_base/nat_socket_factory.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_NAT_SOCKET_FACTORY_H_
 
 #include <stddef.h>
+
 #include <map>
 #include <memory>
 #include <set>

diff --git a/rtc_base/nat_unittest.cc b/rtc_base/nat_unittest.cc
index 79f6ea2..374e68c 100644
--- a/rtc_base/nat_unittest.cc
+++ b/rtc_base/nat_unittest.cc

@@ -9,6 +9,7 @@
  */
 
 #include <string.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>

diff --git a/rtc_base/net_helpers.cc b/rtc_base/net_helpers.cc
index c662f1a..6ff3791 100644
--- a/rtc_base/net_helpers.cc
+++ b/rtc_base/net_helpers.cc

@@ -15,6 +15,7 @@
 #if defined(WEBRTC_WIN)
 #include <ws2spi.h>
 #include <ws2tcpip.h>
+
 #include "rtc_base/win32.h"
 #endif
 #if defined(WEBRTC_POSIX) && !defined(__native_client__)

diff --git a/rtc_base/network.cc b/rtc_base/network.cc
index 6dddbc0..4670ab0 100644
--- a/rtc_base/network.cc
+++ b/rtc_base/network.cc

@@ -24,6 +24,7 @@
 
 #if defined(WEBRTC_WIN)
 #include <iphlpapi.h>
+
 #include "rtc_base/win32.h"
 #elif !defined(__native_client__)
 #include "rtc_base/ifaddrs_converter.h"

diff --git a/rtc_base/network_unittest.cc b/rtc_base/network_unittest.cc
index b35b9f4..d07feb6 100644
--- a/rtc_base/network_unittest.cc
+++ b/rtc_base/network_unittest.cc

@@ -21,6 +21,7 @@
 #if defined(WEBRTC_POSIX)
 #include <net/if.h>
 #include <sys/types.h>
+
 #include "rtc_base/ifaddrs_converter.h"
 #endif  // defined(WEBRTC_POSIX)
 #include "rtc_base/gunit.h"

diff --git a/rtc_base/null_socket_server.cc b/rtc_base/null_socket_server.cc
index b2071e3..a7ee4f9 100644
--- a/rtc_base/null_socket_server.cc
+++ b/rtc_base/null_socket_server.cc

@@ -9,6 +9,7 @@
  */
 
 #include "rtc_base/null_socket_server.h"
+
 #include "rtc_base/checks.h"
 
 namespace rtc {

diff --git a/rtc_base/null_socket_server_unittest.cc b/rtc_base/null_socket_server_unittest.cc
index 961ab6a..62c95a4 100644
--- a/rtc_base/null_socket_server_unittest.cc
+++ b/rtc_base/null_socket_server_unittest.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/null_socket_server.h"
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "rtc_base/gunit.h"

diff --git a/rtc_base/numerics/exp_filter_unittest.cc b/rtc_base/numerics/exp_filter_unittest.cc
index 46f01c8..f5b436f 100644
--- a/rtc_base/numerics/exp_filter_unittest.cc
+++ b/rtc_base/numerics/exp_filter_unittest.cc

@@ -8,9 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/numerics/exp_filter.h"
+
 #include <cmath>
 
-#include "rtc_base/numerics/exp_filter.h"
 #include "test/gtest.h"
 
 namespace rtc {

diff --git a/rtc_base/numerics/histogram_percentile_counter.h b/rtc_base/numerics/histogram_percentile_counter.h
index f52513c..a708c2da 100644
--- a/rtc_base/numerics/histogram_percentile_counter.h
+++ b/rtc_base/numerics/histogram_percentile_counter.h

@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <map>
 #include <vector>
 

diff --git a/rtc_base/numerics/moving_average.h b/rtc_base/numerics/moving_average.h
index 1ae26ff..dfaf6ce 100644
--- a/rtc_base/numerics/moving_average.h
+++ b/rtc_base/numerics/moving_average.h

@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <vector>
 
 #include "absl/types/optional.h"

diff --git a/rtc_base/numerics/moving_max_counter_unittest.cc b/rtc_base/numerics/moving_max_counter_unittest.cc
index 4e74d6d..0e3195f 100644
--- a/rtc_base/numerics/moving_max_counter_unittest.cc
+++ b/rtc_base/numerics/moving_max_counter_unittest.cc

@@ -9,6 +9,7 @@
  */
 
 #include "rtc_base/numerics/moving_max_counter.h"
+
 #include "test/gtest.h"
 
 TEST(MovingMaxCounter, ReportsMaximumInTheWindow) {

diff --git a/rtc_base/numerics/moving_median_filter.h b/rtc_base/numerics/moving_median_filter.h
index b4d8741..723679e 100644
--- a/rtc_base/numerics/moving_median_filter.h
+++ b/rtc_base/numerics/moving_median_filter.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_NUMERICS_MOVING_MEDIAN_FILTER_H_
 
 #include <stddef.h>
+
 #include <list>
 
 #include "rtc_base/checks.h"

diff --git a/rtc_base/numerics/percentile_filter.h b/rtc_base/numerics/percentile_filter.h
index 4781963..cba4463 100644
--- a/rtc_base/numerics/percentile_filter.h
+++ b/rtc_base/numerics/percentile_filter.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_NUMERICS_PERCENTILE_FILTER_H_
 
 #include <stdint.h>
+
 #include <iterator>
 #include <set>
 

diff --git a/rtc_base/numerics/percentile_filter_unittest.cc b/rtc_base/numerics/percentile_filter_unittest.cc
index 456cb4c..2655cc2 100644
--- a/rtc_base/numerics/percentile_filter_unittest.cc
+++ b/rtc_base/numerics/percentile_filter_unittest.cc

@@ -8,7 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/numerics/percentile_filter.h"
+
 #include <stdlib.h>
+
 #include <array>
 #include <climits>
 #include <cstdint>
@@ -16,7 +19,6 @@
 
 #include "absl/algorithm/container.h"
 #include "rtc_base/constructor_magic.h"
-#include "rtc_base/numerics/percentile_filter.h"
 #include "test/gtest.h"
 
 namespace webrtc {

diff --git a/rtc_base/numerics/running_statistics.h b/rtc_base/numerics/running_statistics.h
index f3aa8e3..4a3516d3 100644
--- a/rtc_base/numerics/running_statistics.h
+++ b/rtc_base/numerics/running_statistics.h

@@ -16,7 +16,6 @@
 #include <limits>
 
 #include "absl/types/optional.h"
-
 #include "rtc_base/checks.h"
 #include "rtc_base/numerics/math_utils.h"
 

diff --git a/rtc_base/numerics/running_statistics_unittest.cc b/rtc_base/numerics/running_statistics_unittest.cc
index d77280a..8ef30f1 100644
--- a/rtc_base/numerics/running_statistics_unittest.cc
+++ b/rtc_base/numerics/running_statistics_unittest.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/numerics/running_statistics.h"
 
 #include <math.h>
+
 #include <random>
 #include <vector>
 

diff --git a/rtc_base/numerics/safe_compare_unittest.cc b/rtc_base/numerics/safe_compare_unittest.cc
index e7a251f..92bde68 100644
--- a/rtc_base/numerics/safe_compare_unittest.cc
+++ b/rtc_base/numerics/safe_compare_unittest.cc

@@ -8,9 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/numerics/safe_compare.h"
+
 #include <limits>
 
-#include "rtc_base/numerics/safe_compare.h"
 #include "test/gtest.h"
 
 namespace rtc {

diff --git a/rtc_base/numerics/safe_minmax_unittest.cc b/rtc_base/numerics/safe_minmax_unittest.cc
index 72d23b6..c52b3f9 100644
--- a/rtc_base/numerics/safe_minmax_unittest.cc
+++ b/rtc_base/numerics/safe_minmax_unittest.cc

@@ -8,10 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/numerics/safe_minmax.h"
+
 #include <algorithm>
 #include <limits>
 
-#include "rtc_base/numerics/safe_minmax.h"
 #include "test/gtest.h"
 
 namespace rtc {

diff --git a/rtc_base/numerics/sample_counter.cc b/rtc_base/numerics/sample_counter.cc
index 7f76b74..16a8e25 100644
--- a/rtc_base/numerics/sample_counter.cc
+++ b/rtc_base/numerics/sample_counter.cc

@@ -8,11 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/numerics/sample_counter.h"
+
 #include <limits>
 
 #include "rtc_base/checks.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/numerics/sample_counter.h"
 
 namespace rtc {
 

diff --git a/rtc_base/numerics/samples_stats_counter_unittest.cc b/rtc_base/numerics/samples_stats_counter_unittest.cc
index 7760b42..a20a3d9 100644
--- a/rtc_base/numerics/samples_stats_counter_unittest.cc
+++ b/rtc_base/numerics/samples_stats_counter_unittest.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/numerics/samples_stats_counter.h"
 
 #include <math.h>
+
 #include <random>
 #include <vector>
 

diff --git a/rtc_base/numerics/sequence_number_util.h b/rtc_base/numerics/sequence_number_util.h
index 57efb51..96a4974 100644
--- a/rtc_base/numerics/sequence_number_util.h
+++ b/rtc_base/numerics/sequence_number_util.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_NUMERICS_SEQUENCE_NUMBER_UTIL_H_
 
 #include <stdint.h>
+
 #include <limits>
 #include <type_traits>
 

diff --git a/rtc_base/numerics/sequence_number_util_unittest.cc b/rtc_base/numerics/sequence_number_util_unittest.cc
index 09a4514..d7fa0b1 100644
--- a/rtc_base/numerics/sequence_number_util_unittest.cc
+++ b/rtc_base/numerics/sequence_number_util_unittest.cc

@@ -8,11 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/numerics/sequence_number_util.h"
+
 #include <cstdint>
 #include <iterator>
 #include <set>
 
-#include "rtc_base/numerics/sequence_number_util.h"
 #include "test/gtest.h"
 
 namespace webrtc {

diff --git a/rtc_base/openssl_adapter.cc b/rtc_base/openssl_adapter.cc
index 388b9a0..2c93118 100644
--- a/rtc_base/openssl_adapter.cc
+++ b/rtc_base/openssl_adapter.cc

@@ -11,13 +11,10 @@
 #include "rtc_base/openssl_adapter.h"
 
 #include <errno.h>
-
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
 #include <openssl/x509.h>
-#include "rtc_base/openssl.h"
-
 #include <string.h>
 #include <time.h>
 
@@ -26,6 +23,7 @@
 #include "rtc_base/location.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
+#include "rtc_base/openssl.h"
 #include "rtc_base/openssl_certificate.h"
 #include "rtc_base/openssl_utility.h"
 #include "rtc_base/string_encode.h"

diff --git a/rtc_base/openssl_adapter.h b/rtc_base/openssl_adapter.h
index 7219671..26b58be 100644
--- a/rtc_base/openssl_adapter.h
+++ b/rtc_base/openssl_adapter.h

@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 #include <vector>

diff --git a/rtc_base/openssl_adapter_unittest.cc b/rtc_base/openssl_adapter_unittest.cc
index 2b171e6..77603e0 100644
--- a/rtc_base/openssl_adapter_unittest.cc
+++ b/rtc_base/openssl_adapter_unittest.cc

@@ -8,6 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/openssl_adapter.h"
+
 #include <sstream>
 #include <string>
 #include <vector>
@@ -15,7 +17,6 @@
 #include "absl/memory/memory.h"
 #include "rtc_base/async_socket.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/openssl_adapter.h"
 #include "test/gmock.h"
 
 namespace rtc {

diff --git a/rtc_base/openssl_certificate.h b/rtc_base/openssl_certificate.h
index 9b61eee..c317a72 100644
--- a/rtc_base/openssl_certificate.h
+++ b/rtc_base/openssl_certificate.h

@@ -12,9 +12,9 @@
 #define RTC_BASE_OPENSSL_CERTIFICATE_H_
 
 #include <openssl/ossl_typ.h>
-
 #include <stddef.h>
 #include <stdint.h>
+
 #include <string>
 
 #include "rtc_base/buffer.h"

diff --git a/rtc_base/openssl_digest.h b/rtc_base/openssl_digest.h
index ee39eb8..7fcb71c 100644
--- a/rtc_base/openssl_digest.h
+++ b/rtc_base/openssl_digest.h

@@ -13,6 +13,7 @@
 
 #include <openssl/ossl_typ.h>
 #include <stddef.h>
+
 #include <string>
 
 #include "rtc_base/message_digest.h"

diff --git a/rtc_base/openssl_identity.cc b/rtc_base/openssl_identity.cc
index 531c971..81357a8 100644
--- a/rtc_base/openssl_identity.cc
+++ b/rtc_base/openssl_identity.cc

@@ -24,7 +24,6 @@
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
-
 #include <stdint.h>
 
 #include "absl/memory/memory.h"

diff --git a/rtc_base/openssl_session_cache.cc b/rtc_base/openssl_session_cache.cc
index 270abe8..f8fcd47 100644
--- a/rtc_base/openssl_session_cache.cc
+++ b/rtc_base/openssl_session_cache.cc

@@ -9,6 +9,7 @@
  */
 
 #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 e53e41a..b049e64 100644
--- a/rtc_base/openssl_session_cache.h
+++ b/rtc_base/openssl_session_cache.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_OPENSSL_SESSION_CACHE_H_
 
 #include <openssl/ossl_typ.h>
+
 #include <map>
 #include <string>
 

diff --git a/rtc_base/openssl_session_cache_unittest.cc b/rtc_base/openssl_session_cache_unittest.cc
index 366fc26..1d3084b 100644
--- a/rtc_base/openssl_session_cache_unittest.cc
+++ b/rtc_base/openssl_session_cache_unittest.cc

@@ -8,6 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/openssl_session_cache.h"
+
 #include <openssl/ssl.h>
 #include <stdlib.h>
 
@@ -16,7 +18,6 @@
 
 #include "rtc_base/gunit.h"
 #include "rtc_base/openssl.h"
-#include "rtc_base/openssl_session_cache.h"
 
 namespace rtc {
 

diff --git a/rtc_base/openssl_stream_adapter.h b/rtc_base/openssl_stream_adapter.h
index 40d1779..5d99e32 100644
--- a/rtc_base/openssl_stream_adapter.h
+++ b/rtc_base/openssl_stream_adapter.h

@@ -12,9 +12,9 @@
 #define RTC_BASE_OPENSSL_STREAM_ADAPTER_H_
 
 #include <openssl/ossl_typ.h>
-
 #include <stddef.h>
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 #include <vector>

diff --git a/rtc_base/openssl_utility.cc b/rtc_base/openssl_utility.cc
index 9749912..1984eb0 100644
--- a/rtc_base/openssl_utility.cc
+++ b/rtc_base/openssl_utility.cc

@@ -17,13 +17,12 @@
 #include <openssl/err.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
-#include "rtc_base/openssl.h"
-
 #include <stddef.h>
 
 #include "rtc_base/arraysize.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
+#include "rtc_base/openssl.h"
 #include "rtc_base/openssl_certificate.h"
 #ifndef WEBRTC_EXCLUDE_BUILT_IN_SSL_ROOT_CERTS
 #include "rtc_base/ssl_roots.h"

diff --git a/rtc_base/openssl_utility.h b/rtc_base/openssl_utility.h
index a2e49df..022294d 100644
--- a/rtc_base/openssl_utility.h
+++ b/rtc_base/openssl_utility.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_OPENSSL_UTILITY_H_
 
 #include <openssl/ossl_typ.h>
+
 #include <string>
 
 namespace rtc {

diff --git a/rtc_base/physical_socket_server.cc b/rtc_base/physical_socket_server.cc
index c38d7fd..c1d6d26 100644
--- a/rtc_base/physical_socket_server.cc
+++ b/rtc_base/physical_socket_server.cc

@@ -323,7 +323,7 @@
 #else
       0
 #endif
-      );
+  );
   UpdateLastError();
   MaybeRemapSendError();
   // We have seen minidumps where this may be false.

diff --git a/rtc_base/physical_socket_server_unittest.cc b/rtc_base/physical_socket_server_unittest.cc
index 3987a59..5083ca1 100644
--- a/rtc_base/physical_socket_server_unittest.cc
+++ b/rtc_base/physical_socket_server_unittest.cc

@@ -8,7 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/physical_socket_server.h"
+
 #include <signal.h>
+
 #include <algorithm>
 #include <memory>
 
@@ -16,7 +19,6 @@
 #include "rtc_base/ip_address.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/network_monitor.h"
-#include "rtc_base/physical_socket_server.h"
 #include "rtc_base/socket_unittest.h"
 #include "rtc_base/test_utils.h"
 #include "rtc_base/thread.h"

diff --git a/rtc_base/platform_file.h b/rtc_base/platform_file.h
index 52fbaff..303d9f5 100644
--- a/rtc_base/platform_file.h
+++ b/rtc_base/platform_file.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_PLATFORM_FILE_H_
 
 #include <stdio.h>
+
 #include <string>
 
 #if defined(WEBRTC_WIN)

diff --git a/rtc_base/platform_file_unittest.cc b/rtc_base/platform_file_unittest.cc
index 396286a..26cf6a1 100644
--- a/rtc_base/platform_file_unittest.cc
+++ b/rtc_base/platform_file_unittest.cc

@@ -9,6 +9,7 @@
  */
 
 #include "rtc_base/platform_file.h"
+
 #include "test/gtest.h"
 #include "test/testsupport/file_utils.h"
 

diff --git a/rtc_base/platform_thread.cc b/rtc_base/platform_thread.cc
index cb5eb8b..8a5f2c9 100644
--- a/rtc_base/platform_thread.cc
+++ b/rtc_base/platform_thread.cc

@@ -15,6 +15,7 @@
 #endif
 #include <stdint.h>
 #include <time.h>
+
 #include <algorithm>
 
 #include "rtc_base/checks.h"
@@ -29,7 +30,7 @@
   pthread_attr_t attr;
 };
 #endif  // defined(WEBRTC_WIN)
-}
+}  // namespace
 
 PlatformThread::PlatformThread(ThreadRunFunction func,
                                void* obj,

diff --git a/rtc_base/proxy_info.h b/rtc_base/proxy_info.h
index 6fded09..e614692 100644
--- a/rtc_base/proxy_info.h
+++ b/rtc_base/proxy_info.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_PROXY_INFO_H_
 
 #include <string>
+
 #include "rtc_base/crypt_string.h"
 #include "rtc_base/socket_address.h"
 

diff --git a/rtc_base/proxy_unittest.cc b/rtc_base/proxy_unittest.cc
index 59d637a..d73d9de 100644
--- a/rtc_base/proxy_unittest.cc
+++ b/rtc_base/proxy_unittest.cc

@@ -10,6 +10,7 @@
 
 #include <memory>
 #include <string>
+
 #include "rtc_base/gunit.h"
 #include "rtc_base/proxy_server.h"
 #include "rtc_base/socket_adapters.h"

diff --git a/rtc_base/random.h b/rtc_base/random.h
index 31de6e1..93241a3 100644
--- a/rtc_base/random.h
+++ b/rtc_base/random.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_RANDOM_H_
 
 #include <stdint.h>
+
 #include <limits>
 
 #include "rtc_base/checks.h"

diff --git a/rtc_base/random_unittest.cc b/rtc_base/random_unittest.cc
index 8f32657..f94b0c1 100644
--- a/rtc_base/random_unittest.cc
+++ b/rtc_base/random_unittest.cc

@@ -8,13 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/random.h"
+
 #include <math.h>
 
 #include <limits>
 #include <vector>
 
 #include "rtc_base/numerics/math_utils.h"  // unsigned difference
-#include "rtc_base/random.h"
 #include "test/gtest.h"
 
 namespace webrtc {

diff --git a/rtc_base/rate_limiter_unittest.cc b/rtc_base/rate_limiter_unittest.cc
index cb9b5b4..8ebf8aa 100644
--- a/rtc_base/rate_limiter_unittest.cc
+++ b/rtc_base/rate_limiter_unittest.cc

@@ -8,11 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/rate_limiter.h"
+
 #include <memory>
 
 #include "rtc_base/event.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/rate_limiter.h"
 #include "system_wrappers/include/clock.h"
 #include "test/gtest.h"
 

diff --git a/rtc_base/rate_statistics.h b/rtc_base/rate_statistics.h
index d4ccc59..a423654 100644
--- a/rtc_base/rate_statistics.h
+++ b/rtc_base/rate_statistics.h

@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"

diff --git a/rtc_base/rate_statistics_unittest.cc b/rtc_base/rate_statistics_unittest.cc
index 822767e..9dd8232 100644
--- a/rtc_base/rate_statistics_unittest.cc
+++ b/rtc_base/rate_statistics_unittest.cc

@@ -8,9 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/rate_statistics.h"
+
 #include <cstdlib>
 
-#include "rtc_base/rate_statistics.h"
 #include "test/gtest.h"
 
 namespace {

diff --git a/rtc_base/ref_counted_object_unittest.cc b/rtc_base/ref_counted_object_unittest.cc
index 00a9295..eacf731 100644
--- a/rtc_base/ref_counted_object_unittest.cc
+++ b/rtc_base/ref_counted_object_unittest.cc

@@ -8,13 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/ref_counted_object.h"
+
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "api/scoped_refptr.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/rolling_accumulator.h b/rtc_base/rolling_accumulator.h
index b630554..015229b 100644
--- a/rtc_base/rolling_accumulator.h
+++ b/rtc_base/rolling_accumulator.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_ROLLING_ACCUMULATOR_H_
 
 #include <stddef.h>
+
 #include <algorithm>
 #include <vector>
 

diff --git a/rtc_base/rolling_accumulator_unittest.cc b/rtc_base/rolling_accumulator_unittest.cc
index f6835aa..83013ca 100644
--- a/rtc_base/rolling_accumulator_unittest.cc
+++ b/rtc_base/rolling_accumulator_unittest.cc

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include <random>
-
 #include "rtc_base/rolling_accumulator.h"
 
+#include <random>
+
 #include "test/gtest.h"
 
 namespace rtc {

diff --git a/rtc_base/rtc_certificate.cc b/rtc_base/rtc_certificate.cc
index 46f6c31..1edc393 100644
--- a/rtc_base/rtc_certificate.cc
+++ b/rtc_base/rtc_certificate.cc

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include <memory>
-
 #include "rtc_base/rtc_certificate.h"
 
+#include <memory>
+
 #include "rtc_base/checks.h"
 #include "rtc_base/ref_counted_object.h"
 #include "rtc_base/ssl_certificate.h"

diff --git a/rtc_base/rtc_certificate.h b/rtc_base/rtc_certificate.h
index d98c4ea..0a744c4 100644
--- a/rtc_base/rtc_certificate.h
+++ b/rtc_base/rtc_certificate.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_RTC_CERTIFICATE_H_
 
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 

diff --git a/rtc_base/rtc_certificate_generator.cc b/rtc_base/rtc_certificate_generator.cc
index 08cd19946..2a84fbd 100644
--- a/rtc_base/rtc_certificate_generator.cc
+++ b/rtc_base/rtc_certificate_generator.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/rtc_certificate_generator.h"
 
 #include <time.h>
+
 #include <algorithm>
 #include <memory>
 #include <utility>

diff --git a/rtc_base/rtc_certificate_unittest.cc b/rtc_base/rtc_certificate_unittest.cc
index 62e9e2c..1150eee 100644
--- a/rtc_base/rtc_certificate_unittest.cc
+++ b/rtc_base/rtc_certificate_unittest.cc

@@ -8,13 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/rtc_certificate.h"
+
 #include <time.h>
+
 #include <memory>
 #include <utility>
 
 #include "rtc_base/checks.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/rtc_certificate.h"
 #include "rtc_base/ssl_identity.h"
 #include "rtc_base/time_utils.h"
 #include "test/gtest.h"

diff --git a/rtc_base/server_socket_adapters.cc b/rtc_base/server_socket_adapters.cc
index 887ca87..ebe420c 100644
--- a/rtc_base/server_socket_adapters.cc
+++ b/rtc_base/server_socket_adapters.cc

@@ -8,10 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/server_socket_adapters.h"
+
 #include <string>
 
 #include "rtc_base/byte_buffer.h"
-#include "rtc_base/server_socket_adapters.h"
 
 namespace rtc {
 

diff --git a/rtc_base/signal_thread_unittest.cc b/rtc_base/signal_thread_unittest.cc
index f03991b..d9304d4 100644
--- a/rtc_base/signal_thread_unittest.cc
+++ b/rtc_base/signal_thread_unittest.cc

@@ -8,13 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/signal_thread.h"
+
 #include <memory>
 
 #include "absl/memory/memory.h"
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/null_socket_server.h"
-#include "rtc_base/signal_thread.h"
 #include "rtc_base/thread.h"
 #include "test/gtest.h"
 

diff --git a/rtc_base/socket.cc b/rtc_base/socket.cc
index f19b344..bcd62ad 100644
--- a/rtc_base/socket.cc
+++ b/rtc_base/socket.cc

@@ -10,6 +10,4 @@
 
 #include "rtc_base/socket.h"
 
-namespace rtc {
-
-}  // namespace rtc
+namespace rtc {}  // namespace rtc

diff --git a/rtc_base/socket_address.cc b/rtc_base/socket_address.cc
index 3b22a05..3ea045e 100644
--- a/rtc_base/socket_address.cc
+++ b/rtc_base/socket_address.cc

@@ -9,6 +9,7 @@
  */
 
 #include "rtc_base/socket_address.h"
+
 #include "rtc_base/numerics/safe_conversions.h"
 
 #if defined(WEBRTC_POSIX)

diff --git a/rtc_base/socket_server.h b/rtc_base/socket_server.h
index 348d099..2b49524 100644
--- a/rtc_base/socket_server.h
+++ b/rtc_base/socket_server.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_SOCKET_SERVER_H_
 
 #include <memory>
+
 #include "rtc_base/socket_factory.h"
 
 namespace rtc {

diff --git a/rtc_base/socket_unittest.cc b/rtc_base/socket_unittest.cc
index 3166ec7..7d91cbe 100644
--- a/rtc_base/socket_unittest.cc
+++ b/rtc_base/socket_unittest.cc

@@ -8,9 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/socket.h"
+
 #include <errno.h>
 #include <stdint.h>
 #include <string.h>
+
 #include <memory>
 
 #include "absl/memory/memory.h"
@@ -25,7 +28,6 @@
 #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"

diff --git a/rtc_base/stream.cc b/rtc_base/stream.cc
index 98fd175..ec75b61 100644
--- a/rtc_base/stream.cc
+++ b/rtc_base/stream.cc

@@ -7,15 +7,17 @@
  *  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/stream.h"
+
 #include <errno.h>
 #include <string.h>
+
 #include <algorithm>
 #include <string>
 
 #include "rtc_base/checks.h"
 #include "rtc_base/location.h"
 #include "rtc_base/message_queue.h"
-#include "rtc_base/stream.h"
 #include "rtc_base/thread.h"
 
 namespace rtc {
@@ -130,5 +132,4 @@
   SignalEvent(this, events, err);
 }
 
-
 }  // namespace rtc

diff --git a/rtc_base/string_encode.h b/rtc_base/string_encode.h
index 2ea09e2..c1401b9 100644
--- a/rtc_base/string_encode.h
+++ b/rtc_base/string_encode.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_STRING_ENCODE_H_
 
 #include <stddef.h>
+
 #include <string>
 #include <type_traits>
 #include <vector>

diff --git a/rtc_base/string_encode_unittest.cc b/rtc_base/string_encode_unittest.cc
index 4854299..19d293b 100644
--- a/rtc_base/string_encode_unittest.cc
+++ b/rtc_base/string_encode_unittest.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/string_encode.h"
 
 #include <string.h>
+
 #include <sstream>  // no-presubmit-check TODO(webrtc:8982)
 
 #include "test/gtest.h"

diff --git a/rtc_base/string_to_number.cc b/rtc_base/string_to_number.cc
index 634652b..351610f 100644
--- a/rtc_base/string_to_number.cc
+++ b/rtc_base/string_to_number.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/string_to_number.h"
 
 #include <ctype.h>
+
 #include <cerrno>
 #include <cstdlib>
 

diff --git a/rtc_base/string_to_number_unittest.cc b/rtc_base/string_to_number_unittest.cc
index 2c2dfcc..f460b15 100644
--- a/rtc_base/string_to_number_unittest.cc
+++ b/rtc_base/string_to_number_unittest.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/string_to_number.h"
 
 #include <stdint.h>
+
 #include <limits>
 #include <string>
 

diff --git a/rtc_base/strings/string_builder.cc b/rtc_base/strings/string_builder.cc
index a204e52..caa931b 100644
--- a/rtc_base/strings/string_builder.cc
+++ b/rtc_base/strings/string_builder.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/strings/string_builder.h"
 
 #include <stdarg.h>
+
 #include <cstdio>
 #include <cstring>
 

diff --git a/rtc_base/swap_queue.h b/rtc_base/swap_queue.h
index 8dd2a28..8914548 100644
--- a/rtc_base/swap_queue.h
+++ b/rtc_base/swap_queue.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_SWAP_QUEUE_H_
 
 #include <stddef.h>
+
 #include <atomic>
 #include <utility>
 #include <vector>

diff --git a/rtc_base/synchronization/rw_lock_win.h b/rtc_base/synchronization/rw_lock_win.h
index 52ad9bb..02d0930 100644
--- a/rtc_base/synchronization/rw_lock_win.h
+++ b/rtc_base/synchronization/rw_lock_win.h

@@ -11,10 +11,10 @@
 #ifndef RTC_BASE_SYNCHRONIZATION_RW_LOCK_WIN_H_
 #define RTC_BASE_SYNCHRONIZATION_RW_LOCK_WIN_H_
 
-#include "rtc_base/synchronization/rw_lock_wrapper.h"
-
 #include <Windows.h>
 
+#include "rtc_base/synchronization/rw_lock_wrapper.h"
+
 namespace webrtc {
 
 class RWLockWin : public RWLockWrapper {

diff --git a/rtc_base/synchronization/yield_policy_unittest.cc b/rtc_base/synchronization/yield_policy_unittest.cc
index 1220808..e0c6225 100644
--- a/rtc_base/synchronization/yield_policy_unittest.cc
+++ b/rtc_base/synchronization/yield_policy_unittest.cc

@@ -8,10 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/synchronization/yield_policy.h"
+
 #include <thread>  // Not allowed in production per Chromium style guide.
 
 #include "rtc_base/event.h"
-#include "rtc_base/synchronization/yield_policy.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 

diff --git a/rtc_base/task_queue.h b/rtc_base/task_queue.h
index 01fcb78..2f7c44d 100644
--- a/rtc_base/task_queue.h
+++ b/rtc_base/task_queue.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_TASK_QUEUE_H_
 
 #include <stdint.h>
+
 #include <memory>
 #include <utility>
 

diff --git a/rtc_base/task_queue_gcd.cc b/rtc_base/task_queue_gcd.cc
index c131d82..35c7221 100644
--- a/rtc_base/task_queue_gcd.cc
+++ b/rtc_base/task_queue_gcd.cc

@@ -14,9 +14,8 @@
 
 #include "rtc_base/task_queue_gcd.h"
 
-#include <string.h>
-
 #include <dispatch/dispatch.h>
+#include <string.h>
 
 #include "absl/memory/memory.h"
 #include "absl/strings/string_view.h"

diff --git a/rtc_base/task_queue_libevent.cc b/rtc_base/task_queue_libevent.cc
index 9a01f46..df10efd 100644
--- a/rtc_base/task_queue_libevent.cc
+++ b/rtc_base/task_queue_libevent.cc

@@ -17,6 +17,7 @@
 #include <stdint.h>
 #include <time.h>
 #include <unistd.h>
+
 #include <list>
 #include <memory>
 #include <type_traits>

diff --git a/rtc_base/task_queue_stdlib.cc b/rtc_base/task_queue_stdlib.cc
index 88128b5..415c14d 100644
--- a/rtc_base/task_queue_stdlib.cc
+++ b/rtc_base/task_queue_stdlib.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/task_queue_stdlib.h"
 
 #include <string.h>
+
 #include <algorithm>
 #include <map>
 #include <queue>

diff --git a/rtc_base/task_utils/repeating_task.cc b/rtc_base/task_utils/repeating_task.cc
index cdabf2f..1705918 100644
--- a/rtc_base/task_utils/repeating_task.cc
+++ b/rtc_base/task_utils/repeating_task.cc

@@ -35,7 +35,7 @@
   // destruct this object.
   if (next_run_time_.IsPlusInfinity())
     return true;
-  
+
   RTC_DCHECK(delay.IsFinite());
   TimeDelta lost_time = Timestamp::us(rtc::TimeMicros()) - next_run_time_;
   next_run_time_ += delay;

diff --git a/rtc_base/task_utils/repeating_task_unittest.cc b/rtc_base/task_utils/repeating_task_unittest.cc
index c903bc9..471914c 100644
--- a/rtc_base/task_utils/repeating_task_unittest.cc
+++ b/rtc_base/task_utils/repeating_task_unittest.cc

@@ -8,6 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/task_utils/repeating_task.h"
+
 #include <atomic>
 #include <chrono>  // Not allowed in production per Chromium style guide.
 #include <memory>
@@ -16,7 +18,6 @@
 #include "absl/memory/memory.h"
 #include "rtc_base/event.h"
 #include "rtc_base/task_queue_for_test.h"
-#include "rtc_base/task_utils/repeating_task.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 

diff --git a/rtc_base/test_client.cc b/rtc_base/test_client.cc
index 1264602..e287201 100644
--- a/rtc_base/test_client.cc
+++ b/rtc_base/test_client.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/test_client.h"
 
 #include <string.h>
+
 #include <utility>
 
 #include "absl/memory/memory.h"

diff --git a/rtc_base/test_client.h b/rtc_base/test_client.h
index bbae12c..b45cf00 100644
--- a/rtc_base/test_client.h
+++ b/rtc_base/test_client.h

@@ -13,6 +13,7 @@
 
 #include <memory>
 #include <vector>
+
 #include "rtc_base/async_udp_socket.h"
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/critical_section.h"

diff --git a/rtc_base/test_echo_server.h b/rtc_base/test_echo_server.h
index 5f06a0e..da40ac4 100644
--- a/rtc_base/test_echo_server.h
+++ b/rtc_base/test_echo_server.h

@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <list>
 #include <memory>
 

diff --git a/rtc_base/third_party/base64/base64.h b/rtc_base/third_party/base64/base64.h
index bbc93c8..ba26329 100644
--- a/rtc_base/third_party/base64/base64.h
+++ b/rtc_base/third_party/base64/base64.h

@@ -120,4 +120,4 @@
 
 }  // namespace rtc
 
-#endif  /* RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ */
+#endif /* RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ */

diff --git a/rtc_base/third_party/sigslot/sigslot.h b/rtc_base/third_party/sigslot/sigslot.h
index 8bd1c70..6dc62c5 100644
--- a/rtc_base/third_party/sigslot/sigslot.h
+++ b/rtc_base/third_party/sigslot/sigslot.h

@@ -640,4 +640,4 @@
 
 }  // namespace sigslot
 
-#endif  /* RTC_BASE_THIRD_PARTY_SIGSLOT_SIGSLOT_H_ */
+#endif /* RTC_BASE_THIRD_PARTY_SIGSLOT_SIGSLOT_H_ */

diff --git a/rtc_base/thread.cc b/rtc_base/thread.cc
index 5df5ede..20f58b2 100644
--- a/rtc_base/thread.cc
+++ b/rtc_base/thread.cc

@@ -25,6 +25,7 @@
 #endif
 
 #include <stdio.h>
+
 #include <utility>
 
 #include "rtc_base/checks.h"
@@ -345,7 +346,7 @@
 #else
   return nullptr;
 #endif
-}
+}  // namespace rtc
 
 void Thread::Run() {
   ProcessMessages(kForever);

diff --git a/rtc_base/thread.h b/rtc_base/thread.h
index 7d29fbf..58df2536 100644
--- a/rtc_base/thread.h
+++ b/rtc_base/thread.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_THREAD_H_
 
 #include <stdint.h>
+
 #include <list>
 #include <memory>
 #include <string>
@@ -359,8 +360,8 @@
   std::list<_SendMessage> sendlist_;
   std::string name_;
 
-// TODO(tommi): Add thread checks for proper use of control methods.
-// Ideally we should be able to just use PlatformThread.
+  // TODO(tommi): Add thread checks for proper use of control methods.
+  // Ideally we should be able to just use PlatformThread.
 
 #if defined(WEBRTC_POSIX)
   pthread_t thread_ = 0;

diff --git a/rtc_base/thread_annotations_unittest.cc b/rtc_base/thread_annotations_unittest.cc
index 949f042..1b296da 100644
--- a/rtc_base/thread_annotations_unittest.cc
+++ b/rtc_base/thread_annotations_unittest.cc

@@ -9,6 +9,7 @@
  */
 
 #include "rtc_base/thread_annotations.h"
+
 #include "test/gtest.h"
 
 namespace {

diff --git a/rtc_base/thread_checker_unittest.cc b/rtc_base/thread_checker_unittest.cc
index c3a64ac..b592704 100644
--- a/rtc_base/thread_checker_unittest.cc
+++ b/rtc_base/thread_checker_unittest.cc

@@ -10,6 +10,8 @@
 
 // Borrowed from Chromium's src/base/threading/thread_checker_unittest.cc.
 
+#include "rtc_base/thread_checker.h"
+
 #include <memory>
 #include <utility>
 
@@ -19,7 +21,6 @@
 #include "rtc_base/socket_server.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/thread_checker.h"
 #include "test/gtest.h"
 
 // Duplicated from base/threading/thread_checker.h so that we can be

diff --git a/rtc_base/thread_unittest.cc b/rtc_base/thread_unittest.cc
index 55a0e2d..56af8a5 100644
--- a/rtc_base/thread_unittest.cc
+++ b/rtc_base/thread_unittest.cc

@@ -8,6 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/thread.h"
+
 #include <memory>
 
 #include "absl/memory/memory.h"
@@ -19,7 +21,6 @@
 #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"
 
 #if defined(WEBRTC_WIN)
 #include <comdef.h>  // NOLINT

diff --git a/rtc_base/time_utils.cc b/rtc_base/time_utils.cc
index 53f8b36..7a72173 100644
--- a/rtc_base/time_utils.cc
+++ b/rtc_base/time_utils.cc

@@ -14,6 +14,7 @@
 #include <sys/time.h>
 #if defined(WEBRTC_MAC)
 #include <mach/mach_time.h>
+
 #include "rtc_base/numerics/safe_conversions.h"
 #endif
 #endif

diff --git a/rtc_base/time_utils.h b/rtc_base/time_utils.h
index d1d8b05..7862959 100644
--- a/rtc_base/time_utils.h
+++ b/rtc_base/time_utils.h

@@ -13,6 +13,7 @@
 
 #include <stdint.h>
 #include <time.h>
+
 #include <string>
 
 #include "rtc_base/checks.h"

diff --git a/rtc_base/timestamp_aligner.cc b/rtc_base/timestamp_aligner.cc
index 3d92dd8..2896f9c 100644
--- a/rtc_base/timestamp_aligner.cc
+++ b/rtc_base/timestamp_aligner.cc

@@ -8,13 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/timestamp_aligner.h"
+
 #include <cstdlib>
 #include <limits>
 
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/time_utils.h"
-#include "rtc_base/timestamp_aligner.h"
 
 namespace rtc {
 

diff --git a/rtc_base/timestamp_aligner_unittest.cc b/rtc_base/timestamp_aligner_unittest.cc
index f92cd96..17d9e06 100644
--- a/rtc_base/timestamp_aligner_unittest.cc
+++ b/rtc_base/timestamp_aligner_unittest.cc

@@ -8,13 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/timestamp_aligner.h"
+
 #include <math.h>
+
 #include <algorithm>
 #include <limits>
 
 #include "rtc_base/random.h"
 #include "rtc_base/time_utils.h"
-#include "rtc_base/timestamp_aligner.h"
 #include "test/gtest.h"
 
 namespace rtc {
@@ -43,8 +45,8 @@
 class TimestampAlignerForTest : public TimestampAligner {
   // Make internal methods accessible to testing.
  public:
-  using TimestampAligner::UpdateOffset;
   using TimestampAligner::ClipTimestamp;
+  using TimestampAligner::UpdateOffset;
 };
 
 void TestTimestampFilter(double rel_freq_error) {

diff --git a/rtc_base/unique_id_generator_unittest.cc b/rtc_base/unique_id_generator_unittest.cc
index a8d7b9e..868b348 100644
--- a/rtc_base/unique_id_generator_unittest.cc
+++ b/rtc_base/unique_id_generator_unittest.cc

@@ -8,6 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/unique_id_generator.h"
+
 #include <string>
 #include <vector>
 
@@ -15,7 +17,6 @@
 #include "api/array_view.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/helpers.h"
-#include "rtc_base/unique_id_generator.h"
 #include "test/gmock.h"
 
 using ::testing::IsEmpty;

diff --git a/rtc_base/units/unit_base.h b/rtc_base/units/unit_base.h
index 5bcc0d8..533d355 100644
--- a/rtc_base/units/unit_base.h
+++ b/rtc_base/units/unit_base.h

@@ -11,6 +11,7 @@
 #define RTC_BASE_UNITS_UNIT_BASE_H_
 
 #include <stdint.h>
+
 #include <algorithm>
 #include <cmath>
 #include <limits>

diff --git a/rtc_base/weak_ptr.h b/rtc_base/weak_ptr.h
index 80cb7ee..3e63a75 100644
--- a/rtc_base/weak_ptr.h
+++ b/rtc_base/weak_ptr.h

@@ -12,7 +12,6 @@
 #define RTC_BASE_WEAK_PTR_H_
 
 #include <memory>
-
 #include <utility>
 
 #include "api/scoped_refptr.h"

diff --git a/rtc_base/weak_ptr_unittest.cc b/rtc_base/weak_ptr_unittest.cc
index 1fdd9fea..3906fe7 100644
--- a/rtc_base/weak_ptr_unittest.cc
+++ b/rtc_base/weak_ptr_unittest.cc

@@ -8,13 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/weak_ptr.h"
+
 #include <memory>
 #include <string>
 
 #include "absl/memory/memory.h"
 #include "rtc_base/event.h"
 #include "rtc_base/task_queue_for_test.h"
-#include "rtc_base/weak_ptr.h"
 #include "test/gtest.h"
 
 namespace rtc {

diff --git a/rtc_base/win/windows_version.cc b/rtc_base/win/windows_version.cc
index a1ba2c6..2e6c157 100644
--- a/rtc_base/win/windows_version.cc
+++ b/rtc_base/win/windows_version.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/win/windows_version.h"
 
 #include <windows.h>
+
 #include <memory>
 
 #include "rtc_base/checks.h"

diff --git a/rtc_base/win/windows_version.h b/rtc_base/win/windows_version.h
index fa0a767..1ad319e 100644
--- a/rtc_base/win/windows_version.h
+++ b/rtc_base/win/windows_version.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_WIN_WINDOWS_VERSION_H_
 
 #include <stddef.h>
+
 #include <string>
 
 #include "rtc_base/constructor_magic.h"

diff --git a/rtc_base/win32.cc b/rtc_base/win32.cc
index 67c987f..1a99c4f 100644
--- a/rtc_base/win32.cc
+++ b/rtc_base/win32.cc

@@ -12,6 +12,7 @@
 
 #include <winsock2.h>
 #include <ws2tcpip.h>
+
 #include <algorithm>
 
 #include "rtc_base/arraysize.h"

diff --git a/rtc_base/win32_socket_server.cc b/rtc_base/win32_socket_server.cc
index 585cd19..1ae4132 100644
--- a/rtc_base/win32_socket_server.cc
+++ b/rtc_base/win32_socket_server.cc

@@ -11,6 +11,7 @@
 #include "rtc_base/win32_socket_server.h"
 
 #include <ws2tcpip.h>  // NOLINT
+
 #include <algorithm>
 
 #include "rtc_base/byte_order.h"

diff --git a/rtc_base/win32_socket_server_unittest.cc b/rtc_base/win32_socket_server_unittest.cc
index d8484d1..e545460 100644
--- a/rtc_base/win32_socket_server_unittest.cc
+++ b/rtc_base/win32_socket_server_unittest.cc

@@ -8,6 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #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 0e2abaa..b2955e5 100644
--- a/rtc_base/win32_unittest.cc
+++ b/rtc_base/win32_unittest.cc

@@ -8,11 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "rtc_base/win32.h"
+
 #include <string>
 
 #include "rtc_base/gunit.h"
 #include "rtc_base/net_helpers.h"
-#include "rtc_base/win32.h"
 
 #if !defined(WEBRTC_WIN)
 #error Only for Windows

diff --git a/rtc_base/win32_window.cc b/rtc_base/win32_window.cc
index b0eb605..b4d919d 100644
--- a/rtc_base/win32_window.cc
+++ b/rtc_base/win32_window.cc

@@ -9,6 +9,7 @@
  */
 
 #include "rtc_base/win32_window.h"
+
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 

diff --git a/rtc_base/win32_window_unittest.cc b/rtc_base/win32_window_unittest.cc
index 62430bb..665b5c6 100644
--- a/rtc_base/win32_window_unittest.cc
+++ b/rtc_base/win32_window_unittest.cc

@@ -9,6 +9,7 @@
  */
 
 #include "rtc_base/win32_window.h"
+
 #include "rtc_base/gunit.h"
 #include "rtc_base/logging.h"
 

diff --git a/rtc_base/zero_memory.h b/rtc_base/zero_memory.h
index f697bcb..b92f52f 100644
--- a/rtc_base/zero_memory.h
+++ b/rtc_base/zero_memory.h

@@ -12,6 +12,7 @@
 #define RTC_BASE_ZERO_MEMORY_H_
 
 #include <stddef.h>
+
 #include <type_traits>
 
 #include "api/array_view.h"