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/video/encoder_overshoot_detector_unittest.cc b/video/encoder_overshoot_detector_unittest.cc
index d720d21..7170f49 100644
--- a/video/encoder_overshoot_detector_unittest.cc
+++ b/video/encoder_overshoot_detector_unittest.cc
@@ -9,6 +9,7 @@
  */
 
 #include "video/encoder_overshoot_detector.h"
+
 #include "api/units/data_rate.h"
 #include "rtc_base/fake_clock.h"
 #include "rtc_base/time_utils.h"
diff --git a/video/end_to_end_tests/extended_reports_tests.cc b/video/end_to_end_tests/extended_reports_tests.cc
index 8c5f4fa..efdf6c8 100644
--- a/video/end_to_end_tests/extended_reports_tests.cc
+++ b/video/end_to_end_tests/extended_reports_tests.cc
@@ -10,6 +10,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/video/end_to_end_tests/multi_codec_receive_tests.cc b/video/end_to_end_tests/multi_codec_receive_tests.cc
index 140c4e1..56da409 100644
--- a/video/end_to_end_tests/multi_codec_receive_tests.cc
+++ b/video/end_to_end_tests/multi_codec_receive_tests.cc
@@ -185,7 +185,7 @@
       decoder.decoder_factory = config.decoder_factory;
 
       video_receive_configs_[0].decoders.push_back(decoder);
-  }
+    }
 }
 
 void MultiCodecReceiveTest::ConfigureEncoder(const CodecConfig& config) {
diff --git a/video/end_to_end_tests/multi_stream_tests.cc b/video/end_to_end_tests/multi_stream_tests.cc
index 0f4b997..00e7c44 100644
--- a/video/end_to_end_tests/multi_stream_tests.cc
+++ b/video/end_to_end_tests/multi_stream_tests.cc
@@ -10,6 +10,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <memory>
 #include <vector>
 
diff --git a/video/end_to_end_tests/ssrc_tests.cc b/video/end_to_end_tests/ssrc_tests.cc
index b2fdd30..4d81a57 100644
--- a/video/end_to_end_tests/ssrc_tests.cc
+++ b/video/end_to_end_tests/ssrc_tests.cc
@@ -77,38 +77,38 @@
   std::unique_ptr<test::DirectTransport> receive_transport;
   std::unique_ptr<PacketInputObserver> input_observer;
 
-  task_queue_.SendTask([this, &send_transport, &receive_transport,
-                        &input_observer]() {
-    CreateCalls();
+  task_queue_.SendTask(
+      [this, &send_transport, &receive_transport, &input_observer]() {
+        CreateCalls();
 
-    send_transport = absl::make_unique<test::DirectTransport>(
-        &task_queue_,
-        absl::make_unique<FakeNetworkPipe>(Clock::GetRealTimeClock(),
-                                           absl::make_unique<SimulatedNetwork>(
+        send_transport = absl::make_unique<test::DirectTransport>(
+            &task_queue_,
+            absl::make_unique<FakeNetworkPipe>(
+                Clock::GetRealTimeClock(), absl::make_unique<SimulatedNetwork>(
                                                BuiltInNetworkBehaviorConfig())),
-        sender_call_.get(), payload_type_map_);
-    receive_transport = absl::make_unique<test::DirectTransport>(
-        &task_queue_,
-        absl::make_unique<FakeNetworkPipe>(Clock::GetRealTimeClock(),
-                                           absl::make_unique<SimulatedNetwork>(
+            sender_call_.get(), payload_type_map_);
+        receive_transport = absl::make_unique<test::DirectTransport>(
+            &task_queue_,
+            absl::make_unique<FakeNetworkPipe>(
+                Clock::GetRealTimeClock(), absl::make_unique<SimulatedNetwork>(
                                                BuiltInNetworkBehaviorConfig())),
-        receiver_call_.get(), payload_type_map_);
-    input_observer =
-        absl::make_unique<PacketInputObserver>(receiver_call_->Receiver());
-    send_transport->SetReceiver(input_observer.get());
-    receive_transport->SetReceiver(sender_call_->Receiver());
+            receiver_call_.get(), payload_type_map_);
+        input_observer =
+            absl::make_unique<PacketInputObserver>(receiver_call_->Receiver());
+        send_transport->SetReceiver(input_observer.get());
+        receive_transport->SetReceiver(sender_call_->Receiver());
 
-    CreateSendConfig(1, 0, 0, send_transport.get());
-    CreateMatchingReceiveConfigs(receive_transport.get());
+        CreateSendConfig(1, 0, 0, send_transport.get());
+        CreateMatchingReceiveConfigs(receive_transport.get());
 
-    CreateVideoStreams();
-    CreateFrameGeneratorCapturer(kDefaultFramerate, kDefaultWidth,
-                                 kDefaultHeight);
-    Start();
+        CreateVideoStreams();
+        CreateFrameGeneratorCapturer(kDefaultFramerate, kDefaultWidth,
+                                     kDefaultHeight);
+        Start();
 
-    receiver_call_->DestroyVideoReceiveStream(video_receive_streams_[0]);
-    video_receive_streams_.clear();
-  });
+        receiver_call_->DestroyVideoReceiveStream(video_receive_streams_[0]);
+        video_receive_streams_.clear();
+      });
 
   // Wait() waits for a received packet.
   EXPECT_TRUE(input_observer->Wait());
diff --git a/video/end_to_end_tests/transport_feedback_tests.cc b/video/end_to_end_tests/transport_feedback_tests.cc
index 95ab6ce..d8ae230 100644
--- a/video/end_to_end_tests/transport_feedback_tests.cc
+++ b/video/end_to_end_tests/transport_feedback_tests.cc
@@ -12,11 +12,10 @@
 #include "call/call.h"
 #include "call/fake_network_pipe.h"
 #include "call/simulated_network.h"
+#include "modules/rtp_rtcp/source/byte_io.h"
 #include "test/call_test.h"
 #include "test/field_trial.h"
 #include "test/gtest.h"
-
-#include "modules/rtp_rtcp/source/byte_io.h"
 #include "test/rtcp_packet_parser.h"
 #include "video/end_to_end_tests/multi_stream_tester.h"
 
diff --git a/video/frame_dumping_decoder.cc b/video/frame_dumping_decoder.cc
index 09cf3e9..72fc0ff 100644
--- a/video/frame_dumping_decoder.cc
+++ b/video/frame_dumping_decoder.cc
@@ -30,10 +30,9 @@
   return decoder_->InitDecode(codec_settings, number_of_cores);
 }
 
-int32_t FrameDumpingDecoder::Decode(
-    const EncodedImage& input_image,
-    bool missing_frames,
-    int64_t render_time_ms) {
+int32_t FrameDumpingDecoder::Decode(const EncodedImage& input_image,
+                                    bool missing_frames,
+                                    int64_t render_time_ms) {
   int32_t ret = decoder_->Decode(input_image, missing_frames, render_time_ms);
   writer_->WriteFrame(input_image, codec_type_);
 
diff --git a/video/frame_dumping_decoder.h b/video/frame_dumping_decoder.h
index 5bb2271..8235a1e 100644
--- a/video/frame_dumping_decoder.h
+++ b/video/frame_dumping_decoder.h
@@ -12,6 +12,7 @@
 #define VIDEO_FRAME_DUMPING_DECODER_H_
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "api/video/encoded_image.h"
diff --git a/video/full_stack_tests.cc b/video/full_stack_tests.cc
index bf8bf21..de05628 100644
--- a/video/full_stack_tests.cc
+++ b/video/full_stack_tests.cc
@@ -290,9 +290,8 @@
       30000, 500000, 2000000, false,
       "VP8", 1,      0,       0,
       false, false,  true,    ClipNameToClipPath("foreman_cif")};
-  foreman_cif.analyzer = {"foreman_cif_link_150kbps_net_delay_0_0_plr_0",
-                          0.0, 0.0,
-                          kFullStackTestDurationSecs};
+  foreman_cif.analyzer = {"foreman_cif_link_150kbps_net_delay_0_0_plr_0", 0.0,
+                          0.0, kFullStackTestDurationSecs};
   foreman_cif.config->link_capacity_kbps = 150;
   fixture->RunWithAnalyzer(foreman_cif);
 }
@@ -1243,18 +1242,17 @@
   auto fixture = CreateVideoQualityTestFixture();
   ParamsWithLogging simulcast;
   simulcast.call.send_side_bwe = true;
-  simulcast.video[0] = {true,    1920,    1080,  30,    800000,
-                        2500000, 2500000, false, "VP8", 3,
-                        2,       400000,  false, false, false, "Generator"};
+  simulcast.video[0] = {true,    1920,  1080,  30,         800000, 2500000,
+                        2500000, false, "VP8", 3,          2,      400000,
+                        false,   false, false, "Generator"};
   simulcast.analyzer = {"simulcast_HD_high", 0.0, 0.0,
                         kFullStackTestDurationSecs};
   simulcast.config->loss_percent = 0;
   simulcast.config->queue_delay_ms = 100;
   std::vector<VideoStream> streams = {
-    VideoQualityTest::DefaultVideoStream(simulcast, 0),
-    VideoQualityTest::DefaultVideoStream(simulcast, 0),
-    VideoQualityTest::DefaultVideoStream(simulcast, 0)
-  };
+      VideoQualityTest::DefaultVideoStream(simulcast, 0),
+      VideoQualityTest::DefaultVideoStream(simulcast, 0),
+      VideoQualityTest::DefaultVideoStream(simulcast, 0)};
   simulcast.ss[0] = {
       streams, 2, 1, 0, InterLayerPredMode::kOn, std::vector<SpatialLayer>(),
       true};
@@ -1550,10 +1548,9 @@
 
   // Screenshare Settings.
   dual_streams.screenshare[first_stream] = {true, false, 10};
-  dual_streams.video[first_stream] = {true,    1850,    1110,  5,     800000,
-                                      2500000, 2500000, false, "VP8", 3,
-                                      2,       400000,  false, false, false,
-                                      ""};
+  dual_streams.video[first_stream] = {true,    1850,  1110,  5, 800000, 2500000,
+                                      2500000, false, "VP8", 3, 2,      400000,
+                                      false,   false, false, ""};
   // Video settings.
   dual_streams.video[1 - first_stream] = {
       true,   1280,
diff --git a/video/overuse_frame_detector_unittest.cc b/video/overuse_frame_detector_unittest.cc
index cb45482..b66d119 100644
--- a/video/overuse_frame_detector_unittest.cc
+++ b/video/overuse_frame_detector_unittest.cc
@@ -8,6 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "video/overuse_frame_detector.h"
+
 #include <memory>
 
 #include "absl/memory/memory.h"
@@ -20,12 +22,11 @@
 #include "rtc_base/task_queue_for_test.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
-#include "video/overuse_frame_detector.h"
 
 namespace webrtc {
 
-using ::testing::InvokeWithoutArgs;
 using ::testing::_;
+using ::testing::InvokeWithoutArgs;
 
 namespace {
 const int kWidth = 640;
@@ -636,7 +637,8 @@
 
   constexpr int kNumFrames = 500;
   constexpr int kEncodeTimesUs[] = {
-      10 * rtc::kNumMicrosecsPerMillisec, 8 * rtc::kNumMicrosecsPerMillisec,
+      10 * rtc::kNumMicrosecsPerMillisec,
+      8 * rtc::kNumMicrosecsPerMillisec,
       12 * rtc::kNumMicrosecsPerMillisec,
   };
   constexpr int kIntervalUs = 30 * rtc::kNumMicrosecsPerMillisec;
@@ -981,7 +983,7 @@
   // three encoded frames, and the last of those isn't finished until after the
   // first encoded frame corresponding to the next input frame.
   const int kEncodeTimeUs = 30 * rtc::kNumMicrosecsPerMillisec;
-  const int kCaptureTimesMs[] = { 33, 33, 66, 33 };
+  const int kCaptureTimesMs[] = {33, 33, 66, 33};
 
   for (int capture_time_ms : kCaptureTimesMs) {
     overuse_detector_->FrameSent(
@@ -998,7 +1000,8 @@
 
   constexpr int kNumFrames = 500;
   constexpr int kEncodeTimesUs[] = {
-      10 * rtc::kNumMicrosecsPerMillisec, 8 * rtc::kNumMicrosecsPerMillisec,
+      10 * rtc::kNumMicrosecsPerMillisec,
+      8 * rtc::kNumMicrosecsPerMillisec,
       12 * rtc::kNumMicrosecsPerMillisec,
   };
   constexpr int kIntervalUs = 30 * rtc::kNumMicrosecsPerMillisec;
diff --git a/video/receive_statistics_proxy_unittest.cc b/video/receive_statistics_proxy_unittest.cc
index dbd6ccf..276a059 100644
--- a/video/receive_statistics_proxy_unittest.cc
+++ b/video/receive_statistics_proxy_unittest.cc
@@ -495,8 +495,7 @@
   EXPECT_STREQ("", statistics_proxy_->GetStats().c_name.c_str());
 }
 
-TEST_F(ReceiveStatisticsProxyTest,
-       ReportsLongestTimingFrameInfo) {
+TEST_F(ReceiveStatisticsProxyTest, ReportsLongestTimingFrameInfo) {
   const int64_t kShortEndToEndDelay = 10;
   const int64_t kMedEndToEndDelay = 20;
   const int64_t kLongEndToEndDelay = 100;
diff --git a/video/report_block_stats.h b/video/report_block_stats.h
index b9c09da..bb9ea78 100644
--- a/video/report_block_stats.h
+++ b/video/report_block_stats.h
@@ -12,6 +12,7 @@
 #define VIDEO_REPORT_BLOCK_STATS_H_
 
 #include <stdint.h>
+
 #include <map>
 #include <vector>
 
diff --git a/video/report_block_stats_unittest.cc b/video/report_block_stats_unittest.cc
index a9b7d35..d87c7f7 100644
--- a/video/report_block_stats_unittest.cc
+++ b/video/report_block_stats_unittest.cc
@@ -9,6 +9,7 @@
  */
 
 #include "video/report_block_stats.h"
+
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/video/rtp_video_stream_receiver_unittest.cc b/video/rtp_video_stream_receiver_unittest.cc
index d30a698..a688351 100644
--- a/video/rtp_video_stream_receiver_unittest.cc
+++ b/video/rtp_video_stream_receiver_unittest.cc
@@ -8,8 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "test/gmock.h"
-#include "test/gtest.h"
+#include "video/rtp_video_stream_receiver.h"
 
 #include "absl/memory/memory.h"
 #include "api/video/video_codec_type.h"
@@ -32,7 +31,8 @@
 #include "system_wrappers/include/clock.h"
 #include "system_wrappers/include/field_trial.h"
 #include "test/field_trial.h"
-#include "video/rtp_video_stream_receiver.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
 
 using ::testing::_;
 using ::testing::Invoke;
diff --git a/video/send_delay_stats.h b/video/send_delay_stats.h
index ed4b257..d9fa16a 100644
--- a/video/send_delay_stats.h
+++ b/video/send_delay_stats.h
@@ -13,6 +13,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <map>
 #include <memory>
 #include <set>
diff --git a/video/stream_synchronization.cc b/video/stream_synchronization.cc
index 8a51039..493ed33 100644
--- a/video/stream_synchronization.cc
+++ b/video/stream_synchronization.cc
@@ -12,6 +12,7 @@
 
 #include <assert.h>
 #include <stdlib.h>
+
 #include <algorithm>
 
 #include "rtc_base/logging.h"
diff --git a/video/stream_synchronization_unittest.cc b/video/stream_synchronization_unittest.cc
index 2bd7eae..cbd00e8 100644
--- a/video/stream_synchronization_unittest.cc
+++ b/video/stream_synchronization_unittest.cc
@@ -8,11 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "video/stream_synchronization.h"
+
 #include <algorithm>
 
 #include "system_wrappers/include/ntp_time.h"
 #include "test/gtest.h"
-#include "video/stream_synchronization.h"
 
 namespace webrtc {
 
diff --git a/video/transport_adapter.h b/video/transport_adapter.h
index a47fde3..95dd308 100644
--- a/video/transport_adapter.h
+++ b/video/transport_adapter.h
@@ -12,6 +12,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <atomic>
 
 #include "api/call/transport.h"
diff --git a/video/video_quality_observer.h b/video/video_quality_observer.h
index ecd06f8..83ef0c8 100644
--- a/video/video_quality_observer.h
+++ b/video/video_quality_observer.h
@@ -12,6 +12,7 @@
 #define VIDEO_VIDEO_QUALITY_OBSERVER_H_
 
 #include <stdint.h>
+
 #include <set>
 #include <vector>
 
diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc
index c2eac81..535c5e9 100644
--- a/video/video_quality_test.cc
+++ b/video/video_quality_test.cc
@@ -10,6 +10,7 @@
 #include "video/video_quality_test.h"
 
 #include <stdio.h>
+
 #include <algorithm>
 #include <deque>
 #include <map>
diff --git a/video/video_quality_test.h b/video/video_quality_test.h
index a8bb8a4..711e343 100644
--- a/video/video_quality_test.h
+++ b/video/video_quality_test.h
@@ -33,8 +33,8 @@
 
 namespace webrtc {
 
-class VideoQualityTest :
-    public test::CallTest, public VideoQualityTestFixtureInterface {
+class VideoQualityTest : public test::CallTest,
+                         public VideoQualityTestFixtureInterface {
  public:
   explicit VideoQualityTest(
       std::unique_ptr<InjectionComponents> injection_components);
diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc
index 458330d..a530bcf 100644
--- a/video/video_receive_stream.cc
+++ b/video/video_receive_stream.cc
@@ -12,6 +12,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+
 #include <algorithm>
 #include <set>
 #include <string>
diff --git a/video/video_receive_stream_unittest.cc b/video/video_receive_stream_unittest.cc
index 005b077..fc1bd78 100644
--- a/video/video_receive_stream_unittest.cc
+++ b/video/video_receive_stream_unittest.cc
@@ -8,13 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "video/video_receive_stream.h"
+
 #include <algorithm>
 #include <utility>
 #include <vector>
 
-#include "test/gmock.h"
-#include "test/gtest.h"
-
 #include "absl/memory/memory.h"
 #include "api/task_queue/default_task_queue_factory.h"
 #include "api/test/video/function_video_decoder_factory.h"
@@ -30,9 +29,10 @@
 #include "system_wrappers/include/clock.h"
 #include "test/fake_decoder.h"
 #include "test/field_trial.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
 #include "test/video_decoder_proxy_factory.h"
 #include "video/call_stats.h"
-#include "video/video_receive_stream.h"
 
 namespace webrtc {
 namespace {
diff --git a/video/video_send_stream_impl.cc b/video/video_send_stream_impl.cc
index dc52b86..7de991c 100644
--- a/video/video_send_stream_impl.cc
+++ b/video/video_send_stream_impl.cc
@@ -10,6 +10,7 @@
 #include "video/video_send_stream_impl.h"
 
 #include <stdio.h>
+
 #include <algorithm>
 #include <cstdint>
 #include <string>
diff --git a/video/video_send_stream_impl.h b/video/video_send_stream_impl.h
index c451576..7f734e9 100644
--- a/video/video_send_stream_impl.h
+++ b/video/video_send_stream_impl.h
@@ -12,6 +12,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <atomic>
 #include <map>
 #include <memory>
diff --git a/video/video_send_stream_impl_unittest.cc b/video/video_send_stream_impl_unittest.cc
index e6886ae..51e31f7 100644
--- a/video/video_send_stream_impl_unittest.cc
+++ b/video/video_send_stream_impl_unittest.cc
@@ -8,6 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "video/video_send_stream_impl.h"
+
 #include <string>
 
 #include "absl/memory/memory.h"
@@ -27,7 +29,6 @@
 #include "test/gtest.h"
 #include "test/mock_transport.h"
 #include "video/test/mock_video_stream_encoder.h"
-#include "video/video_send_stream_impl.h"
 
 namespace webrtc {
 namespace internal {
@@ -340,20 +341,20 @@
     config_.rtp.ssrcs.emplace_back(2);
 
     EXPECT_CALL(bitrate_allocator_, AddObserver(vss_impl.get(), _))
-        .WillRepeatedly(Invoke([&](BitrateAllocatorObserver*,
-                                   MediaStreamAllocationConfig config) {
-          EXPECT_EQ(config.min_bitrate_bps,
-                    static_cast<uint32_t>(low_stream.min_bitrate_bps));
-          EXPECT_EQ(config.max_bitrate_bps,
-                    static_cast<uint32_t>(low_stream.max_bitrate_bps +
-                                          high_stream.max_bitrate_bps));
-          if (config.pad_up_bitrate_bps != 0) {
-            EXPECT_EQ(
-                config.pad_up_bitrate_bps,
-                static_cast<uint32_t>(low_stream.target_bitrate_bps +
-                                      1.25 * high_stream.min_bitrate_bps));
-          }
-        }));
+        .WillRepeatedly(Invoke(
+            [&](BitrateAllocatorObserver*, MediaStreamAllocationConfig config) {
+              EXPECT_EQ(config.min_bitrate_bps,
+                        static_cast<uint32_t>(low_stream.min_bitrate_bps));
+              EXPECT_EQ(config.max_bitrate_bps,
+                        static_cast<uint32_t>(low_stream.max_bitrate_bps +
+                                              high_stream.max_bitrate_bps));
+              if (config.pad_up_bitrate_bps != 0) {
+                EXPECT_EQ(
+                    config.pad_up_bitrate_bps,
+                    static_cast<uint32_t>(low_stream.target_bitrate_bps +
+                                          1.25 * high_stream.min_bitrate_bps));
+              }
+            }));
 
     static_cast<VideoStreamEncoderInterface::EncoderSink*>(vss_impl.get())
         ->OnEncoderConfigurationChanged(
diff --git a/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc
index e327ba0..96da991 100644
--- a/video/video_send_stream_tests.cc
+++ b/video/video_send_stream_tests.cc
@@ -23,6 +23,7 @@
 #include "call/fake_network_pipe.h"
 #include "call/rtp_transport_controller_send.h"
 #include "call/simulated_network.h"
+#include "call/video_send_stream.h"
 #include "modules/rtp_rtcp/include/rtp_header_parser.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "modules/rtp_rtcp/source/rtcp_sender.h"
@@ -53,8 +54,6 @@
 #include "test/rtcp_packet_parser.h"
 #include "test/testsupport/perf_test.h"
 #include "test/video_encoder_proxy_factory.h"
-
-#include "call/video_send_stream.h"
 #include "video/send_statistics_proxy.h"
 #include "video/transport_adapter.h"
 #include "video/video_send_stream.h"
diff --git a/video/video_stream_decoder_impl.cc b/video/video_stream_decoder_impl.cc
index 003f230..48733ec 100644
--- a/video/video_stream_decoder_impl.cc
+++ b/video/video_stream_decoder_impl.cc
@@ -34,9 +34,7 @@
                      "video_stream_decoder_decode_thread",
                      rtc::kHighestPriority),
       timing_(Clock::GetRealTimeClock()),
-      frame_buffer_(Clock::GetRealTimeClock(),
-                    &timing_,
-                    nullptr),
+      frame_buffer_(Clock::GetRealTimeClock(), &timing_, nullptr),
       next_frame_timestamps_index_(0) {
   frame_timestamps_.fill({-1, -1, -1});
   decode_thread_.Start();
@@ -215,7 +213,7 @@
         });
 
     int32_t decode_result = decoder->Decode(frame->EncodedImage(),
-                                            false,    // missing_frame
+                                            false,  // missing_frame
                                             frame->RenderTimeMs());
 
     return decode_result == WEBRTC_VIDEO_CODEC_OK ? kOk : kDecodeFailure;