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/pc/audio_rtp_receiver.cc b/pc/audio_rtp_receiver.cc
index a470707..9bf6659 100644
--- a/pc/audio_rtp_receiver.cc
+++ b/pc/audio_rtp_receiver.cc

@@ -11,6 +11,7 @@
 #include "pc/audio_rtp_receiver.h"
 
 #include <stddef.h>
+
 #include <utility>
 #include <vector>
 

diff --git a/pc/audio_rtp_receiver.h b/pc/audio_rtp_receiver.h
index bc80fbe..cef6081 100644
--- a/pc/audio_rtp_receiver.h
+++ b/pc/audio_rtp_receiver.h

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

diff --git a/pc/channel_manager_unittest.cc b/pc/channel_manager_unittest.cc
index 3d7e01a..c721614 100644
--- a/pc/channel_manager_unittest.cc
+++ b/pc/channel_manager_unittest.cc

@@ -36,11 +36,14 @@
 namespace cricket {
 
 static const AudioCodec kAudioCodecs[] = {
-    AudioCodec(97, "voice", 1, 2, 3), AudioCodec(111, "OPUS", 48000, 32000, 2),
+    AudioCodec(97, "voice", 1, 2, 3),
+    AudioCodec(111, "OPUS", 48000, 32000, 2),
 };
 
 static const VideoCodec kVideoCodecs[] = {
-    VideoCodec(99, "H264"), VideoCodec(100, "VP8"), VideoCodec(96, "rtx"),
+    VideoCodec(99, "H264"),
+    VideoCodec(100, "VP8"),
+    VideoCodec(96, "rtx"),
 };
 
 class ChannelManagerTest : public ::testing::Test {

diff --git a/pc/composite_rtp_transport.cc b/pc/composite_rtp_transport.cc
index 61d9990..641d1d0 100644
--- a/pc/composite_rtp_transport.cc
+++ b/pc/composite_rtp_transport.cc

@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/composite_rtp_transport.h"
+
 #include <string>
 #include <utility>
 
-#include "pc/composite_rtp_transport.h"
-
 #include "absl/memory/memory.h"
 #include "p2p/base/packet_transport_internal.h"
 

diff --git a/pc/data_channel_unittest.cc b/pc/data_channel_unittest.cc
index 52c54e7..ad0e9b6 100644
--- a/pc/data_channel_unittest.cc
+++ b/pc/data_channel_unittest.cc

@@ -8,11 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/data_channel.h"
+
 #include <string.h>
+
 #include <memory>
 #include <vector>
 
-#include "pc/data_channel.h"
 #include "pc/sctp_utils.h"
 #include "pc/test/fake_data_channel_provider.h"
 #include "rtc_base/gunit.h"
@@ -232,8 +234,10 @@
   AddObserver();
   SetChannelReady();
   std::vector<webrtc::DataBuffer> buffers({
-      webrtc::DataBuffer("message 1"), webrtc::DataBuffer("msg 2"),
-      webrtc::DataBuffer("message three"), webrtc::DataBuffer("quadra message"),
+      webrtc::DataBuffer("message 1"),
+      webrtc::DataBuffer("msg 2"),
+      webrtc::DataBuffer("message three"),
+      webrtc::DataBuffer("quadra message"),
       webrtc::DataBuffer("fifthmsg"),
       webrtc::DataBuffer("message of the beast"),
   });
@@ -454,8 +458,10 @@
 TEST_F(SctpDataChannelTest, VerifyMessagesAndBytesReceived) {
   AddObserver();
   std::vector<webrtc::DataBuffer> buffers({
-      webrtc::DataBuffer("message 1"), webrtc::DataBuffer("msg 2"),
-      webrtc::DataBuffer("message three"), webrtc::DataBuffer("quadra message"),
+      webrtc::DataBuffer("message 1"),
+      webrtc::DataBuffer("msg 2"),
+      webrtc::DataBuffer("message three"),
+      webrtc::DataBuffer("quadra message"),
       webrtc::DataBuffer("fifthmsg"),
       webrtc::DataBuffer("message of the beast"),
   });

diff --git a/pc/dtls_srtp_transport.cc b/pc/dtls_srtp_transport.cc
index fcf0727..dacbcb4 100644
--- a/pc/dtls_srtp_transport.cc
+++ b/pc/dtls_srtp_transport.cc

@@ -11,6 +11,7 @@
 #include "pc/dtls_srtp_transport.h"
 
 #include <string.h>
+
 #include <string>
 #include <utility>
 

diff --git a/pc/dtls_srtp_transport_unittest.cc b/pc/dtls_srtp_transport_unittest.cc
index d4ad5fa..38d0458 100644
--- a/pc/dtls_srtp_transport_unittest.cc
+++ b/pc/dtls_srtp_transport_unittest.cc

@@ -11,6 +11,7 @@
 #include "pc/dtls_srtp_transport.h"
 
 #include <string.h>
+
 #include <cstdint>
 #include <memory>
 #include <set>
@@ -34,8 +35,8 @@
 using cricket::FakeDtlsTransport;
 using cricket::FakeIceTransport;
 using webrtc::DtlsSrtpTransport;
-using webrtc::SrtpTransport;
 using webrtc::RtpTransport;
+using webrtc::SrtpTransport;
 
 const int kRtpAuthTagLen = 10;
 

diff --git a/pc/dtmf_sender.cc b/pc/dtmf_sender.cc
index 7c1d3c1..af5b809 100644
--- a/pc/dtmf_sender.cc
+++ b/pc/dtmf_sender.cc

@@ -12,6 +12,7 @@
 
 #include <ctype.h>
 #include <string.h>
+
 #include <string>
 
 #include "rtc_base/checks.h"
@@ -150,8 +151,8 @@
 
 void DtmfSender::QueueInsertDtmf(const rtc::Location& posted_from,
                                  uint32_t delay_ms) {
-  dtmf_driver_.AsyncInvokeDelayed<void>(posted_from, signaling_thread_,
-                                        [this] { DoInsertDtmf(); }, delay_ms);
+  dtmf_driver_.AsyncInvokeDelayed<void>(
+      posted_from, signaling_thread_, [this] { DoInsertDtmf(); }, delay_ms);
 }
 
 void DtmfSender::DoInsertDtmf() {

diff --git a/pc/dtmf_sender_unittest.cc b/pc/dtmf_sender_unittest.cc
index 069833a..3f59af0 100644
--- a/pc/dtmf_sender_unittest.cc
+++ b/pc/dtmf_sender_unittest.cc

@@ -11,6 +11,7 @@
 #include "pc/dtmf_sender.h"
 
 #include <stddef.h>
+
 #include <memory>
 #include <string>
 #include <vector>

diff --git a/pc/ice_server_parsing.cc b/pc/ice_server_parsing.cc
index 3d05d66..2400fd5 100644
--- a/pc/ice_server_parsing.cc
+++ b/pc/ice_server_parsing.cc

@@ -11,6 +11,7 @@
 #include "pc/ice_server_parsing.h"
 
 #include <stddef.h>
+
 #include <cctype>  // For std::isdigit.
 #include <string>
 

diff --git a/pc/ice_server_parsing_unittest.cc b/pc/ice_server_parsing_unittest.cc
index 2262903..2625b24 100644
--- a/pc/ice_server_parsing_unittest.cc
+++ b/pc/ice_server_parsing_unittest.cc

@@ -8,11 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/ice_server_parsing.h"
+
 #include <string>
 #include <vector>
 
 #include "p2p/base/port_interface.h"
-#include "pc/ice_server_parsing.h"
 #include "rtc_base/ip_address.h"
 #include "rtc_base/socket_address.h"
 #include "test/gtest.h"

diff --git a/pc/jitter_buffer_delay_unittest.cc b/pc/jitter_buffer_delay_unittest.cc
index 383a4b7..7edd09a 100644
--- a/pc/jitter_buffer_delay_unittest.cc
+++ b/pc/jitter_buffer_delay_unittest.cc

@@ -8,11 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/jitter_buffer_delay.h"
+
 #include <stdint.h>
 
 #include "absl/types/optional.h"
 #include "api/scoped_refptr.h"
-#include "pc/jitter_buffer_delay.h"
 #include "pc/test/mock_delayable.h"
 #include "rtc_base/ref_counted_object.h"
 #include "rtc_base/thread.h"

diff --git a/pc/jsep_session_description_unittest.cc b/pc/jsep_session_description_unittest.cc
index d2fc6e5..8abb500 100644
--- a/pc/jsep_session_description_unittest.cc
+++ b/pc/jsep_session_description_unittest.cc

@@ -8,8 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "api/jsep_session_description.h"
+
 #include <stddef.h>
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 #include <utility>
@@ -19,7 +22,6 @@
 #include "api/candidate.h"
 #include "api/jsep.h"
 #include "api/jsep_ice_candidate.h"
-#include "api/jsep_session_description.h"
 #include "media/base/codec.h"
 #include "p2p/base/p2p_constants.h"
 #include "p2p/base/port.h"

diff --git a/pc/jsep_transport.cc b/pc/jsep_transport.cc
index 9380341..e32f279 100644
--- a/pc/jsep_transport.cc
+++ b/pc/jsep_transport.cc

@@ -12,6 +12,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <memory>
 #include <type_traits>
 #include <utility>  // for std::pair

diff --git a/pc/jsep_transport_controller_unittest.cc b/pc/jsep_transport_controller_unittest.cc
index 7b91ad8..c4fd8d2 100644
--- a/pc/jsep_transport_controller_unittest.cc
+++ b/pc/jsep_transport_controller_unittest.cc

@@ -8,6 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/jsep_transport_controller.h"
+
 #include <map>
 #include <memory>
 
@@ -20,14 +22,13 @@
 #include "p2p/base/no_op_dtls_transport.h"
 #include "p2p/base/transport_factory_interface.h"
 #include "p2p/base/transport_info.h"
-#include "pc/jsep_transport_controller.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/thread.h"
 #include "test/gtest.h"
 
-using cricket::FakeDtlsTransport;
 using cricket::Candidate;
 using cricket::Candidates;
+using cricket::FakeDtlsTransport;
 using webrtc::SdpType;
 
 static const int kTimeout = 100;

diff --git a/pc/jsep_transport_unittest.cc b/pc/jsep_transport_unittest.cc
index 31a4e92..0680027 100644
--- a/pc/jsep_transport_unittest.cc
+++ b/pc/jsep_transport_unittest.cc

@@ -8,6 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/jsep_transport.h"
+
 #include <memory>
 #include <tuple>
 #include <utility>
@@ -16,7 +18,6 @@
 #include "media/base/fake_rtp.h"
 #include "p2p/base/fake_dtls_transport.h"
 #include "p2p/base/fake_ice_transport.h"
-#include "pc/jsep_transport.h"
 #include "rtc_base/gunit.h"
 
 namespace cricket {

diff --git a/pc/media_session_unittest.cc b/pc/media_session_unittest.cc
index 4cdfb67..a0d9d0c 100644
--- a/pc/media_session_unittest.cc
+++ b/pc/media_session_unittest.cc

@@ -8,6 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/media_session.h"
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -22,7 +24,6 @@
 #include "p2p/base/p2p_constants.h"
 #include "p2p/base/transport_description.h"
 #include "p2p/base/transport_info.h"
-#include "pc/media_session.h"
 #include "pc/rtp_media_utils.h"
 #include "pc/srtp_filter.h"
 #include "rtc_base/checks.h"
@@ -2530,14 +2531,17 @@
   // TODO(wu): |updated_offer| should not include the codec
   // (i.e. |kAudioCodecs2[0]|) the other side doesn't support.
   const AudioCodec kUpdatedAudioCodecOffer[] = {
-      kAudioCodecsAnswer[0], kAudioCodecsAnswer[1], kAudioCodecs2[0],
+      kAudioCodecsAnswer[0],
+      kAudioCodecsAnswer[1],
+      kAudioCodecs2[0],
   };
 
   // The expected video codecs are the common video codecs from the first
   // offer/answer exchange plus the video codecs only |f2_| offer, sorted in
   // preference order.
   const VideoCodec kUpdatedVideoCodecOffer[] = {
-      kVideoCodecsAnswer[0], kVideoCodecs2[1],
+      kVideoCodecsAnswer[0],
+      kVideoCodecs2[1],
   };
 
   const AudioContentDescription* updated_acd =
@@ -3170,14 +3174,16 @@
   // Since the default local extension id |f2_| uses has already been used by
   // |f1_| for another extensions, it is changed to 13.
   const RtpExtension kUpdatedAudioRtpExtensions[] = {
-      kAudioRtpExtensionAnswer[0], RtpExtension(kAudioRtpExtension2[1].uri, 13),
+      kAudioRtpExtensionAnswer[0],
+      RtpExtension(kAudioRtpExtension2[1].uri, 13),
       kAudioRtpExtension2[2],
   };
 
   // Since the default local extension id |f2_| uses has already been used by
   // |f1_| for another extensions, is is changed to 12.
   const RtpExtension kUpdatedVideoRtpExtensions[] = {
-      kVideoRtpExtensionAnswer[0], RtpExtension(kVideoRtpExtension2[1].uri, 12),
+      kVideoRtpExtensionAnswer[0],
+      RtpExtension(kVideoRtpExtension2[1].uri, 12),
       kVideoRtpExtension2[2],
   };
 
@@ -3207,7 +3213,8 @@
   // Since the audio extensions used ID 3 for "both_audio_and_video", so should
   // the video extensions.
   const RtpExtension kExpectedVideoRtpExtension[] = {
-      kVideoRtpExtension3[0], kAudioRtpExtension3[1],
+      kVideoRtpExtension3[0],
+      kAudioRtpExtension3[1],
   };
 
   EXPECT_EQ(

diff --git a/pc/media_stream.cc b/pc/media_stream.cc
index e083b96..00f491b 100644
--- a/pc/media_stream.cc
+++ b/pc/media_stream.cc

@@ -11,6 +11,7 @@
 #include "pc/media_stream.h"
 
 #include <stddef.h>
+
 #include <vector>
 
 #include "rtc_base/checks.h"

diff --git a/pc/media_stream_unittest.cc b/pc/media_stream_unittest.cc
index b49481e..b70171d 100644
--- a/pc/media_stream_unittest.cc
+++ b/pc/media_stream_unittest.cc

@@ -8,11 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/media_stream.h"
+
 #include <stddef.h>
+
 #include <string>
 
 #include "pc/audio_track.h"
-#include "pc/media_stream.h"
 #include "pc/test/fake_video_track_source.h"
 #include "pc/video_track.h"
 #include "rtc_base/thread.h"

diff --git a/pc/peer_connection_crypto_unittest.cc b/pc/peer_connection_crypto_unittest.cc
index f32a124..077ac36 100644
--- a/pc/peer_connection_crypto_unittest.cc
+++ b/pc/peer_connection_crypto_unittest.cc

@@ -30,8 +30,8 @@
 
 using RTCConfiguration = PeerConnectionInterface::RTCConfiguration;
 using RTCOfferAnswerOptions = PeerConnectionInterface::RTCOfferAnswerOptions;
-using ::testing::Values;
 using ::testing::Combine;
+using ::testing::Values;
 
 constexpr int kGenerateCertTimeout = 1000;
 

diff --git a/pc/peer_connection_factory_unittest.cc b/pc/peer_connection_factory_unittest.cc
index a19e430..dd392c5 100644
--- a/pc/peer_connection_factory_unittest.cc
+++ b/pc/peer_connection_factory_unittest.cc

@@ -8,7 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/peer_connection_factory.h"
+
 #include <stddef.h>
+
 #include <memory>
 #include <string>
 #include <utility>
@@ -33,7 +36,6 @@
 #include "p2p/base/fake_port_allocator.h"
 #include "p2p/base/port.h"
 #include "p2p/base/port_interface.h"
-#include "pc/peer_connection_factory.h"
 #include "pc/test/fake_audio_capture_module.h"
 #include "pc/test/fake_video_track_source.h"
 #include "rtc_base/socket_address.h"
@@ -51,8 +53,8 @@
 using webrtc::PeerConnectionFactoryInterface;
 using webrtc::PeerConnectionInterface;
 using webrtc::PeerConnectionObserver;
-using webrtc::VideoTrackSourceInterface;
 using webrtc::VideoTrackInterface;
+using webrtc::VideoTrackSourceInterface;
 
 namespace {
 

diff --git a/pc/peer_connection_interface_unittest.cc b/pc/peer_connection_interface_unittest.cc
index e841399..345c46e 100644
--- a/pc/peer_connection_interface_unittest.cc
+++ b/pc/peer_connection_interface_unittest.cc

@@ -8,9 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "api/peer_connection_interface.h"
+
 #include <limits.h>
 #include <stdint.h>
 #include <string.h>
+
 #include <memory>
 #include <string>
 #include <utility>
@@ -31,7 +34,6 @@
 #include "api/jsep_session_description.h"
 #include "api/media_stream_interface.h"
 #include "api/media_types.h"
-#include "api/peer_connection_interface.h"
 #include "api/rtc_error.h"
 #include "api/rtc_event_log/rtc_event_log.h"
 #include "api/rtc_event_log/rtc_event_log_factory.h"

diff --git a/pc/peer_connection_jsep_unittest.cc b/pc/peer_connection_jsep_unittest.cc
index 161f534..2afb72b 100644
--- a/pc/peer_connection_jsep_unittest.cc
+++ b/pc/peer_connection_jsep_unittest.cc

@@ -35,10 +35,10 @@
 
 using cricket::MediaContentDescription;
 using RTCConfiguration = PeerConnectionInterface::RTCConfiguration;
-using ::testing::Values;
 using ::testing::Combine;
 using ::testing::ElementsAre;
 using ::testing::UnorderedElementsAre;
+using ::testing::Values;
 
 class PeerConnectionFactoryForJsepTest : public PeerConnectionFactory {
  public:

diff --git a/pc/peer_connection_media_unittest.cc b/pc/peer_connection_media_unittest.cc
index 031622f..a980334 100644
--- a/pc/peer_connection_media_unittest.cc
+++ b/pc/peer_connection_media_unittest.cc

@@ -42,8 +42,8 @@
 using RTCOfferAnswerOptions = PeerConnectionInterface::RTCOfferAnswerOptions;
 using ::testing::Bool;
 using ::testing::Combine;
-using ::testing::Values;
 using ::testing::ElementsAre;
+using ::testing::Values;
 
 class PeerConnectionWrapperForMediaTest : public PeerConnectionWrapper {
  public:
@@ -337,9 +337,9 @@
   RTCOfferAnswerOptions options;
   options.num_simulcast_layers = 3;
   auto offer = caller->CreateOffer(options);
-  auto* description = cricket::GetFirstMediaContent(
-      offer->description(),
-      cricket::MEDIA_TYPE_VIDEO)->media_description();
+  auto* description = cricket::GetFirstMediaContent(offer->description(),
+                                                    cricket::MEDIA_TYPE_VIDEO)
+                          ->media_description();
   ASSERT_EQ(1u, description->streams().size());
   ASSERT_TRUE(description->streams()[0].get_ssrc_group("SIM"));
   EXPECT_EQ(3u, description->streams()[0].get_ssrc_group("SIM")->ssrcs.size());
@@ -364,9 +364,9 @@
   RTCOfferAnswerOptions options;
   options.num_simulcast_layers = 3;
   auto answer = callee->CreateAnswer(options);
-  auto* description = cricket::GetFirstMediaContent(
-      answer->description(),
-      cricket::MEDIA_TYPE_VIDEO)->media_description();
+  auto* description = cricket::GetFirstMediaContent(answer->description(),
+                                                    cricket::MEDIA_TYPE_VIDEO)
+                          ->media_description();
   ASSERT_EQ(1u, description->streams().size());
   ASSERT_TRUE(description->streams()[0].get_ssrc_group("SIM"));
   EXPECT_EQ(3u, description->streams()[0].get_ssrc_group("SIM")->ssrcs.size());

diff --git a/pc/peer_connection_rtp_unittest.cc b/pc/peer_connection_rtp_unittest.cc
index 6336f1f..67aa98d 100644
--- a/pc/peer_connection_rtp_unittest.cc
+++ b/pc/peer_connection_rtp_unittest.cc

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

diff --git a/pc/peer_connection_wrapper.cc b/pc/peer_connection_wrapper.cc
index 74089f6..b4b0782 100644
--- a/pc/peer_connection_wrapper.cc
+++ b/pc/peer_connection_wrapper.cc

@@ -11,6 +11,7 @@
 #include "pc/peer_connection_wrapper.h"
 
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 #include <utility>

diff --git a/pc/remote_audio_source.cc b/pc/remote_audio_source.cc
index ed8ef2d..2590f85 100644
--- a/pc/remote_audio_source.cc
+++ b/pc/remote_audio_source.cc

@@ -11,6 +11,7 @@
 #include "pc/remote_audio_source.h"
 
 #include <stddef.h>
+
 #include <string>
 
 #include "absl/algorithm/container.h"

diff --git a/pc/rtc_stats_collector.cc b/pc/rtc_stats_collector.cc
index 0ccfd18..55735c0 100644
--- a/pc/rtc_stats_collector.cc
+++ b/pc/rtc_stats_collector.cc

@@ -71,7 +71,8 @@
 }
 
 std::string RTCTransportStatsIDFromTransportChannel(
-    const std::string& transport_name, int channel_component) {
+    const std::string& transport_name,
+    int channel_component) {
   char buf[1024];
   rtc::SimpleStringBuilder sb(buf);
   sb << "RTCTransport_" << transport_name << "_" << channel_component;
@@ -265,17 +266,16 @@
     const std::string& mid,
     const cricket::VoiceReceiverInfo& voice_receiver_info,
     RTCInboundRTPStreamStats* inbound_audio) {
-  SetInboundRTPStreamStatsFromMediaReceiverInfo(
-      voice_receiver_info, inbound_audio);
+  SetInboundRTPStreamStatsFromMediaReceiverInfo(voice_receiver_info,
+                                                inbound_audio);
   inbound_audio->media_type = "audio";
   inbound_audio->kind = "audio";
   if (voice_receiver_info.codec_payload_type) {
     inbound_audio->codec_id = RTCCodecStatsIDFromMidDirectionAndPayload(
         mid, true, *voice_receiver_info.codec_payload_type);
   }
-  inbound_audio->jitter =
-      static_cast<double>(voice_receiver_info.jitter_ms) /
-          rtc::kNumMillisecsPerSec;
+  inbound_audio->jitter = static_cast<double>(voice_receiver_info.jitter_ms) /
+                          rtc::kNumMillisecsPerSec;
   // |fir_count|, |pli_count| and |sli_count| are only valid for video and are
   // purposefully left undefined for audio.
   if (voice_receiver_info.last_packet_received_timestamp_ms) {
@@ -294,8 +294,8 @@
     const std::string& mid,
     const cricket::VideoReceiverInfo& video_receiver_info,
     RTCInboundRTPStreamStats* inbound_video) {
-  SetInboundRTPStreamStatsFromMediaReceiverInfo(
-      video_receiver_info, inbound_video);
+  SetInboundRTPStreamStatsFromMediaReceiverInfo(video_receiver_info,
+                                                inbound_video);
   inbound_video->media_type = "video";
   inbound_video->kind = "video";
   if (video_receiver_info.codec_payload_type) {
@@ -349,8 +349,8 @@
     const std::string& mid,
     const cricket::VoiceSenderInfo& voice_sender_info,
     RTCOutboundRTPStreamStats* outbound_audio) {
-  SetOutboundRTPStreamStatsFromMediaSenderInfo(
-      voice_sender_info, outbound_audio);
+  SetOutboundRTPStreamStatsFromMediaSenderInfo(voice_sender_info,
+                                               outbound_audio);
   outbound_audio->media_type = "audio";
   outbound_audio->kind = "audio";
   if (voice_sender_info.codec_payload_type) {
@@ -365,8 +365,8 @@
     const std::string& mid,
     const cricket::VideoSenderInfo& video_sender_info,
     RTCOutboundRTPStreamStats* outbound_video) {
-  SetOutboundRTPStreamStatsFromMediaSenderInfo(
-      video_sender_info, outbound_video);
+  SetOutboundRTPStreamStatsFromMediaSenderInfo(video_sender_info,
+                                               outbound_video);
   outbound_video->media_type = "video";
   outbound_video->kind = "video";
   if (video_sender_info.codec_payload_type) {
@@ -466,7 +466,8 @@
 }
 
 void ProduceCertificateStatsFromSSLCertificateStats(
-    int64_t timestamp_us, const rtc::SSLCertificateStats& certificate_stats,
+    int64_t timestamp_us,
+    const rtc::SSLCertificateStats& certificate_stats,
     RTCStatsReport* report) {
   RTCCertificateStats* prev_certificate_stats = nullptr;
   for (const rtc::SSLCertificateStats* s = &certificate_stats; s;
@@ -480,8 +481,8 @@
       RTC_DCHECK_EQ(s, &certificate_stats);
       break;
     }
-    RTCCertificateStats* certificate_stats = new RTCCertificateStats(
-        certificate_stats_id, timestamp_us);
+    RTCCertificateStats* certificate_stats =
+        new RTCCertificateStats(certificate_stats_id, timestamp_us);
     certificate_stats->fingerprint = s->fingerprint;
     certificate_stats->fingerprint_algorithm = s->fingerprint_algorithm;
     certificate_stats->base64_certificate = s->base64_certificate;
@@ -492,9 +493,11 @@
   }
 }
 
-const std::string& ProduceIceCandidateStats(
-    int64_t timestamp_us, const cricket::Candidate& candidate, bool is_local,
-    const std::string& transport_id, RTCStatsReport* report) {
+const std::string& ProduceIceCandidateStats(int64_t timestamp_us,
+                                            const cricket::Candidate& candidate,
+                                            bool is_local,
+                                            const std::string& transport_id,
+                                            RTCStatsReport* report) {
   const std::string& id = "RTCIceCandidate_" + candidate.id();
   const RTCStats* stats = report->Get(id);
   if (!stats) {
@@ -521,8 +524,8 @@
     candidate_stats->ip = candidate.address().ipaddr().ToString();
     candidate_stats->port = static_cast<int32_t>(candidate.address().port());
     candidate_stats->protocol = candidate.protocol();
-    candidate_stats->candidate_type = CandidateTypeToRTCIceCandidateType(
-        candidate.type());
+    candidate_stats->candidate_type =
+        CandidateTypeToRTCIceCandidateType(candidate.type());
     candidate_stats->priority = static_cast<int32_t>(candidate.priority());
 
     stats = candidate_stats.get();
@@ -580,8 +583,8 @@
   audio_track_stats->remote_source = true;
   audio_track_stats->detached = false;
   if (voice_receiver_info.audio_level >= 0) {
-    audio_track_stats->audio_level = DoubleAudioLevelFromIntAudioLevel(
-        voice_receiver_info.audio_level);
+    audio_track_stats->audio_level =
+        DoubleAudioLevelFromIntAudioLevel(voice_receiver_info.audio_level);
   }
   audio_track_stats->jitter_buffer_delay =
       voice_receiver_info.jitter_buffer_delay_seconds;
@@ -636,10 +639,10 @@
                                                  attachment_id);
   video_track_stats->remote_source = false;
   video_track_stats->detached = false;
-  video_track_stats->frame_width = static_cast<uint32_t>(
-      video_sender_info.send_frame_width);
-  video_track_stats->frame_height = static_cast<uint32_t>(
-      video_sender_info.send_frame_height);
+  video_track_stats->frame_width =
+      static_cast<uint32_t>(video_sender_info.send_frame_width);
+  video_track_stats->frame_height =
+      static_cast<uint32_t>(video_sender_info.send_frame_height);
   // TODO(hbos): Will reduce this by frames dropped due to congestion control
   // when available. https://crbug.com/659137
   video_track_stats->frames_sent = video_sender_info.frames_encoded;
@@ -665,10 +668,10 @@
   video_track_stats->detached = false;
   if (video_receiver_info.frame_width > 0 &&
       video_receiver_info.frame_height > 0) {
-    video_track_stats->frame_width = static_cast<uint32_t>(
-        video_receiver_info.frame_width);
-    video_track_stats->frame_height = static_cast<uint32_t>(
-        video_receiver_info.frame_height);
+    video_track_stats->frame_width =
+        static_cast<uint32_t>(video_receiver_info.frame_width);
+    video_track_stats->frame_height =
+        static_cast<uint32_t>(video_receiver_info.frame_height);
   }
   video_track_stats->jitter_buffer_delay =
       video_receiver_info.jitter_buffer_delay_seconds;
@@ -682,8 +685,8 @@
   video_track_stats->frames_decoded = video_receiver_info.frames_decoded;
   RTC_DCHECK_GE(video_receiver_info.frames_received,
                 video_receiver_info.frames_rendered);
-  video_track_stats->frames_dropped = video_receiver_info.frames_received -
-                                      video_receiver_info.frames_rendered;
+  video_track_stats->frames_dropped =
+      video_receiver_info.frames_received - video_receiver_info.frames_rendered;
   video_track_stats->freeze_count = video_receiver_info.freeze_count;
   video_track_stats->pause_count = video_receiver_info.pause_count;
   video_track_stats->total_freezes_duration =
@@ -1214,7 +1217,8 @@
 }
 
 void RTCStatsCollector::ProduceDataChannelStats_s(
-    int64_t timestamp_us, RTCStatsReport* report) const {
+    int64_t timestamp_us,
+    RTCStatsReport* report) const {
   RTC_DCHECK(signaling_thread_->IsCurrent());
   for (const rtc::scoped_refptr<DataChannel>& data_channel :
        pc_->sctp_data_channels()) {
@@ -1457,10 +1461,11 @@
 }
 
 void RTCStatsCollector::ProducePeerConnectionStats_s(
-    int64_t timestamp_us, RTCStatsReport* report) const {
+    int64_t timestamp_us,
+    RTCStatsReport* report) const {
   RTC_DCHECK(signaling_thread_->IsCurrent());
   std::unique_ptr<RTCPeerConnectionStats> stats(
-    new RTCPeerConnectionStats("RTCPeerConnection", timestamp_us));
+      new RTCPeerConnectionStats("RTCPeerConnection", timestamp_us));
   stats->data_channels_opened = internal_record_.data_channels_opened;
   stats->data_channels_closed = internal_record_.data_channels_closed;
   report->AddStats(std::move(stats));
@@ -1645,8 +1650,7 @@
     std::string rtcp_transport_stats_id;
     for (const cricket::TransportChannelStats& channel_stats :
          transport_stats.channel_stats) {
-      if (channel_stats.component ==
-          cricket::ICE_CANDIDATE_COMPONENT_RTCP) {
+      if (channel_stats.component == cricket::ICE_CANDIDATE_COMPONENT_RTCP) {
         rtcp_transport_stats_id = RTCTransportStatsIDFromTransportChannel(
             transport_name, channel_stats.component);
         break;
@@ -1678,8 +1682,8 @@
                                 timestamp_us));
       transport_stats->bytes_sent = 0;
       transport_stats->bytes_received = 0;
-      transport_stats->dtls_state = DtlsTransportStateToRTCDtlsTransportState(
-          channel_stats.dtls_state);
+      transport_stats->dtls_state =
+          DtlsTransportStateToRTCDtlsTransportState(channel_stats.dtls_state);
       for (const cricket::ConnectionInfo& info :
            channel_stats.connection_infos) {
         *transport_stats->bytes_sent += info.sent_total_bytes;
@@ -1855,8 +1859,9 @@
 
 void RTCStatsCollector::OnDataChannelOpened(DataChannel* channel) {
   RTC_DCHECK(signaling_thread_->IsCurrent());
-  bool result = internal_record_.opened_data_channels.insert(
-      reinterpret_cast<uintptr_t>(channel)).second;
+  bool result = internal_record_.opened_data_channels
+                    .insert(reinterpret_cast<uintptr_t>(channel))
+                    .second;
   ++internal_record_.data_channels_opened;
   RTC_DCHECK(result);
 }

diff --git a/pc/rtc_stats_collector_unittest.cc b/pc/rtc_stats_collector_unittest.cc
index 02f6654..cd50346 100644
--- a/pc/rtc_stats_collector_unittest.cc
+++ b/pc/rtc_stats_collector_unittest.cc

@@ -8,6 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/rtc_stats_collector.h"
+
 #include <ctype.h>
 
 #include <algorithm>
@@ -30,7 +32,6 @@
 #include "p2p/base/port.h"
 #include "pc/media_stream.h"
 #include "pc/media_stream_track.h"
-#include "pc/rtc_stats_collector.h"
 #include "pc/test/fake_peer_connection_for_stats.h"
 #include "pc/test/mock_data_channel.h"
 #include "pc/test/mock_rtp_receiver_internal.h"

diff --git a/pc/rtc_stats_integrationtest.cc b/pc/rtc_stats_integrationtest.cc
index adb986d..a723123 100644
--- a/pc/rtc_stats_integrationtest.cc
+++ b/pc/rtc_stats_integrationtest.cc

@@ -10,6 +10,7 @@
 
 #include <stdint.h>
 #include <string.h>
+
 #include <algorithm>
 #include <memory>
 #include <set>
@@ -978,8 +979,10 @@
       // TODO(hbos): Include RTC[Audio/Video]ReceiverStats when implemented.
       // TODO(hbos): Include RTCRemoteOutboundRtpStreamStats when implemented.
       // TODO(hbos): Include RTCRtpContributingSourceStats when implemented.
-      RTCInboundRTPStreamStats::kType, RTCPeerConnectionStats::kType,
-      RTCMediaStreamStats::kType, RTCDataChannelStats::kType,
+      RTCInboundRTPStreamStats::kType,
+      RTCPeerConnectionStats::kType,
+      RTCMediaStreamStats::kType,
+      RTCDataChannelStats::kType,
   };
   RTCStatsReportVerifier(report.get()).VerifyReport(allowed_missing_stats);
   EXPECT_TRUE(report->size());
@@ -995,8 +998,10 @@
       // TODO(hbos): Include RTC[Audio/Video]SenderStats when implemented.
       // TODO(hbos): Include RTCRemoteInboundRtpStreamStats when implemented.
       // TODO(hbos): Include RTCRtpContributingSourceStats when implemented.
-      RTCOutboundRTPStreamStats::kType, RTCPeerConnectionStats::kType,
-      RTCMediaStreamStats::kType, RTCDataChannelStats::kType,
+      RTCOutboundRTPStreamStats::kType,
+      RTCPeerConnectionStats::kType,
+      RTCMediaStreamStats::kType,
+      RTCDataChannelStats::kType,
   };
   RTCStatsReportVerifier(report.get()).VerifyReport(allowed_missing_stats);
   EXPECT_TRUE(report->size());

diff --git a/pc/rtp_media_utils_unittest.cc b/pc/rtp_media_utils_unittest.cc
index f200c28..5ee49e3 100644
--- a/pc/rtp_media_utils_unittest.cc
+++ b/pc/rtp_media_utils_unittest.cc

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

diff --git a/pc/rtp_parameters_conversion_unittest.cc b/pc/rtp_parameters_conversion_unittest.cc
index 83a2893..3d64d62 100644
--- a/pc/rtp_parameters_conversion_unittest.cc
+++ b/pc/rtp_parameters_conversion_unittest.cc

@@ -8,9 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/rtp_parameters_conversion.h"
+
 #include <algorithm>
 
-#include "pc/rtp_parameters_conversion.h"
 #include "rtc_base/gunit.h"
 #include "test/gmock.h"
 

diff --git a/pc/rtp_receiver.cc b/pc/rtp_receiver.cc
index 0b800c1..f65afd7 100644
--- a/pc/rtp_receiver.cc
+++ b/pc/rtp_receiver.cc

@@ -11,6 +11,7 @@
 #include "pc/rtp_receiver.h"
 
 #include <stddef.h>
+
 #include <utility>
 #include <vector>
 

diff --git a/pc/rtp_receiver.h b/pc/rtp_receiver.h
index e56c859..b33878e 100644
--- a/pc/rtp_receiver.h
+++ b/pc/rtp_receiver.h

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

diff --git a/pc/rtp_sender_receiver_unittest.cc b/pc/rtp_sender_receiver_unittest.cc
index a303d6f..c6118b5 100644
--- a/pc/rtp_sender_receiver_unittest.cc
+++ b/pc/rtp_sender_receiver_unittest.cc

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

diff --git a/pc/rtp_transport.cc b/pc/rtp_transport.cc
index 6cfbed9..fe7357f 100644
--- a/pc/rtp_transport.cc
+++ b/pc/rtp_transport.cc

@@ -11,6 +11,7 @@
 #include "pc/rtp_transport.h"
 
 #include <errno.h>
+
 #include <string>
 #include <utility>
 

diff --git a/pc/rtp_transport_unittest.cc b/pc/rtp_transport_unittest.cc
index 4248ba7..03e8820 100644
--- a/pc/rtp_transport_unittest.cc
+++ b/pc/rtp_transport_unittest.cc

@@ -8,6 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/rtp_transport.h"
+
 #include <cstdint>
 #include <set>
 #include <string>
@@ -16,7 +18,6 @@
 #include "api/rtp_headers.h"
 #include "api/rtp_parameters.h"
 #include "p2p/base/fake_packet_transport.h"
-#include "pc/rtp_transport.h"
 #include "pc/test/rtp_transport_test_util.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"

diff --git a/pc/sdp_serializer_unittest.cc b/pc/sdp_serializer_unittest.cc
index 726d01d..b50f4f9 100644
--- a/pc/sdp_serializer_unittest.cc
+++ b/pc/sdp_serializer_unittest.cc

@@ -8,21 +8,22 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/sdp_serializer.h"
+
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "pc/sdp_serializer.h"
 #include "rtc_base/gunit.h"
 
-using ::testing::ValuesIn;
-using ::testing::TestWithParam;
 using cricket::RidDescription;
 using cricket::RidDirection;
 using cricket::SimulcastDescription;
 using cricket::SimulcastLayer;
 using cricket::SimulcastLayerList;
+using ::testing::TestWithParam;
+using ::testing::ValuesIn;
 
 namespace webrtc {
 

diff --git a/pc/session_description.cc b/pc/session_description.cc
index fc4afbc..07ab7db 100644
--- a/pc/session_description.cc
+++ b/pc/session_description.cc

@@ -90,8 +90,7 @@
 SessionDescription::SessionDescription() = default;
 SessionDescription::SessionDescription(const SessionDescription&) = default;
 
-SessionDescription::~SessionDescription() {
-}
+SessionDescription::~SessionDescription() {}
 
 std::unique_ptr<SessionDescription> SessionDescription::Clone() const {
   // Copy using the private copy constructor.

diff --git a/pc/session_description.h b/pc/session_description.h
index 01e9345..bc84740 100644
--- a/pc/session_description.h
+++ b/pc/session_description.h

@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <iosfwd>
 #include <memory>
 #include <string>
@@ -48,7 +49,6 @@
 
 extern const char kMediaProtocolDtlsSavpf[];
 
-
 // Options to control how session descriptions are generated.
 const int kAutoBandwidth = -1;
 

diff --git a/pc/session_description_unittest.cc b/pc/session_description_unittest.cc
index 6baf5a1..7f2b410 100644
--- a/pc/session_description_unittest.cc
+++ b/pc/session_description_unittest.cc

@@ -140,5 +140,4 @@
                 ->extmap_allow_mixed_enum());
 }
 
-
 }  // namespace cricket

diff --git a/pc/simulcast_description.cc b/pc/simulcast_description.cc
index 0359ffc..8b510fe 100644
--- a/pc/simulcast_description.cc
+++ b/pc/simulcast_description.cc

@@ -8,9 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/simulcast_description.h"
+
 #include <utility>
 
-#include "pc/simulcast_description.h"
 #include "rtc_base/checks.h"
 
 namespace cricket {

diff --git a/pc/srtp_filter.cc b/pc/srtp_filter.cc
index cdfaeaa..d4ad3bb 100644
--- a/pc/srtp_filter.cc
+++ b/pc/srtp_filter.cc

@@ -11,6 +11,7 @@
 #include "pc/srtp_filter.h"
 
 #include <string.h>
+
 #include <cstdint>
 
 #include "rtc_base/logging.h"

diff --git a/pc/srtp_filter_unittest.cc b/pc/srtp_filter_unittest.cc
index 7964002..9a57206 100644
--- a/pc/srtp_filter_unittest.cc
+++ b/pc/srtp_filter_unittest.cc

@@ -8,10 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/srtp_filter.h"
+
 #include <string.h>
 
 #include "api/crypto_params.h"
-#include "pc/srtp_filter.h"
 #include "rtc_base/ssl_stream_adapter.h"
 #include "test/gtest.h"
 

diff --git a/pc/srtp_session_unittest.cc b/pc/srtp_session_unittest.cc
index 8feceb4..0125cc1 100644
--- a/pc/srtp_session_unittest.cc
+++ b/pc/srtp_session_unittest.cc

@@ -11,6 +11,7 @@
 #include "pc/srtp_session.h"
 
 #include <string.h>
+
 #include <string>
 
 #include "media/base/fake_rtp.h"

diff --git a/pc/srtp_transport.cc b/pc/srtp_transport.cc
index 20e32f5..6306d50 100644
--- a/pc/srtp_transport.cc
+++ b/pc/srtp_transport.cc

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

diff --git a/pc/srtp_transport.h b/pc/srtp_transport.h
index ed92379..4bc028d 100644
--- a/pc/srtp_transport.h
+++ b/pc/srtp_transport.h

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

diff --git a/pc/srtp_transport_unittest.cc b/pc/srtp_transport_unittest.cc
index a12d2c5..403ff7c 100644
--- a/pc/srtp_transport_unittest.cc
+++ b/pc/srtp_transport_unittest.cc

@@ -8,7 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/srtp_transport.h"
+
 #include <string.h>
+
 #include <set>
 #include <vector>
 
@@ -17,7 +20,6 @@
 #include "media/base/fake_rtp.h"
 #include "p2p/base/dtls_transport_internal.h"
 #include "p2p/base/fake_packet_transport.h"
-#include "pc/srtp_transport.h"
 #include "pc/test/rtp_transport_test_util.h"
 #include "pc/test/srtp_test_util.h"
 #include "rtc_base/async_packet_socket.h"

diff --git a/pc/stats_collector.h b/pc/stats_collector.h
index b3d5cb9..569f1a6 100644
--- a/pc/stats_collector.h
+++ b/pc/stats_collector.h

@@ -15,6 +15,7 @@
 #define PC_STATS_COLLECTOR_H_
 
 #include <stdint.h>
+
 #include <map>
 #include <memory>
 #include <string>

diff --git a/pc/stats_collector_unittest.cc b/pc/stats_collector_unittest.cc
index 6b75184..82f219e 100644
--- a/pc/stats_collector_unittest.cc
+++ b/pc/stats_collector_unittest.cc

@@ -8,7 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/stats_collector.h"
+
 #include <stdio.h>
+
 #include <memory>
 
 #include "absl/algorithm/container.h"
@@ -24,7 +27,6 @@
 #include "pc/data_channel.h"
 #include "pc/media_stream.h"
 #include "pc/media_stream_track.h"
-#include "pc/stats_collector.h"
 #include "pc/test/fake_peer_connection_for_stats.h"
 #include "pc/test/fake_video_track_source.h"
 #include "pc/test/mock_rtp_receiver_internal.h"

diff --git a/pc/test/fake_audio_capture_module_unittest.cc b/pc/test/fake_audio_capture_module_unittest.cc
index c8be683..8dd252a 100644
--- a/pc/test/fake_audio_capture_module_unittest.cc
+++ b/pc/test/fake_audio_capture_module_unittest.cc

@@ -11,6 +11,7 @@
 #include "pc/test/fake_audio_capture_module.h"
 
 #include <string.h>
+
 #include <algorithm>
 
 #include "api/scoped_refptr.h"

diff --git a/pc/test/frame_generator_capturer_video_track_source.h b/pc/test/frame_generator_capturer_video_track_source.h
index 229a66a..007cfc2 100644
--- a/pc/test/frame_generator_capturer_video_track_source.h
+++ b/pc/test/frame_generator_capturer_video_track_source.h

@@ -64,13 +64,9 @@
 
   ~FrameGeneratorCapturerVideoTrackSource() = default;
 
-  void Start() {
-    SetState(kLive);
-  }
+  void Start() { SetState(kLive); }
 
-  void Stop() {
-    SetState(kMuted);
-  }
+  void Stop() { SetState(kMuted); }
 
   bool is_screencast() const override { return is_screencast_; }
 

diff --git a/pc/test/peer_connection_test_wrapper.cc b/pc/test/peer_connection_test_wrapper.cc
index c2fd338..7b278c8 100644
--- a/pc/test/peer_connection_test_wrapper.cc
+++ b/pc/test/peer_connection_test_wrapper.cc

@@ -8,7 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/test/peer_connection_test_wrapper.h"
+
 #include <stddef.h>
+
 #include <string>
 #include <utility>
 #include <vector>
@@ -29,7 +32,6 @@
 #include "pc/test/fake_periodic_video_track_source.h"
 #include "pc/test/fake_rtc_certificate_generator.h"
 #include "pc/test/mock_peer_connection_observers.h"
-#include "pc/test/peer_connection_test_wrapper.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/ref_counted_object.h"

diff --git a/pc/used_ids_unittest.cc b/pc/used_ids_unittest.cc
index 43e6208..f12a093 100644
--- a/pc/used_ids_unittest.cc
+++ b/pc/used_ids_unittest.cc

@@ -9,6 +9,7 @@
  */
 
 #include "pc/used_ids.h"
+
 #include "test/gtest.h"
 
 using cricket::UsedIds;

diff --git a/pc/video_rtp_receiver.cc b/pc/video_rtp_receiver.cc
index 7a9ec98..a2ba3cb 100644
--- a/pc/video_rtp_receiver.cc
+++ b/pc/video_rtp_receiver.cc

@@ -11,6 +11,7 @@
 #include "pc/video_rtp_receiver.h"
 
 #include <stddef.h>
+
 #include <utility>
 #include <vector>
 

diff --git a/pc/video_rtp_receiver.h b/pc/video_rtp_receiver.h
index 10354b0..a06865f 100644
--- a/pc/video_rtp_receiver.h
+++ b/pc/video_rtp_receiver.h

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

diff --git a/pc/video_track.cc b/pc/video_track.cc
index 16e1e70..55356e7 100644
--- a/pc/video_track.cc
+++ b/pc/video_track.cc

@@ -8,11 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/video_track.h"
+
 #include <string>
 #include <vector>
 
 #include "api/notifier.h"
-#include "pc/video_track.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/location.h"
 #include "rtc_base/ref_counted_object.h"

diff --git a/pc/video_track_source.cc b/pc/video_track_source.cc
index c806ec1..f45d44a 100644
--- a/pc/video_track_source.cc
+++ b/pc/video_track_source.cc

@@ -14,8 +14,7 @@
 
 namespace webrtc {
 
-VideoTrackSource::VideoTrackSource(
-    bool remote)
+VideoTrackSource::VideoTrackSource(bool remote)
     : state_(kInitializing), remote_(remote) {
   worker_thread_checker_.Detach();
 }

diff --git a/pc/video_track_unittest.cc b/pc/video_track_unittest.cc
index fc05f66..f86bec8 100644
--- a/pc/video_track_unittest.cc
+++ b/pc/video_track_unittest.cc

@@ -8,13 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "pc/video_track.h"
+
 #include <memory>
 
 #include "media/base/fake_frame_source.h"
 #include "media/base/video_common.h"
 #include "pc/test/fake_video_track_renderer.h"
 #include "pc/test/fake_video_track_source.h"
-#include "pc/video_track.h"
 #include "pc/video_track_source.h"
 #include "rtc_base/ref_counted_object.h"
 #include "test/gtest.h"

diff --git a/pc/webrtc_sdp_unittest.cc b/pc/webrtc_sdp_unittest.cc
index d3be4f3..2be454f 100644
--- a/pc/webrtc_sdp_unittest.cc
+++ b/pc/webrtc_sdp_unittest.cc

@@ -10,6 +10,7 @@
 
 #include <stdio.h>
 #include <string.h>
+
 #include <algorithm>
 #include <cstdint>
 #include <map>

diff --git a/pc/webrtc_session_description_factory.cc b/pc/webrtc_session_description_factory.cc
index ad7a0c1..4cf1c8c 100644
--- a/pc/webrtc_session_description_factory.cc
+++ b/pc/webrtc_session_description_factory.cc

@@ -11,6 +11,7 @@
 #include "pc/webrtc_session_description_factory.h"
 
 #include <stddef.h>
+
 #include <string>
 #include <utility>
 #include <vector>

diff --git a/pc/webrtc_session_description_factory.h b/pc/webrtc_session_description_factory.h
index b94ddbf..c707feb 100644
--- a/pc/webrtc_session_description_factory.h
+++ b/pc/webrtc_session_description_factory.h

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