commit a4d873786f10eedd72de25ad0d94ad7c53c1f68a
author Jonas Olsson <jonasolsson@webrtc.org> Fri Jul 05 19:08:33 2019 +0200
committer Commit Bot <commit-bot@chromium.org> Mon Jul 08 13:45:15 2019 +0000
tree 962ed681b560cc929c3521fc50fdded8fd88860d
parent c93bfcfd2f7613a1f8fa26b567de327db3548c7f

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}

modules/audio_coding/acm2/acm_receiver_unittest.cc

diff --git a/modules/audio_coding/acm2/acm_receiver_unittest.cc b/modules/audio_coding/acm2/acm_receiver_unittest.cc
index 780026d..5d40fc1 100644
--- a/modules/audio_coding/acm2/acm_receiver_unittest.cc
+++ b/modules/audio_coding/acm2/acm_receiver_unittest.cc
@@ -314,14 +314,13 @@
                                                 {1, {"PCMA", 8000, 1}},
                                                 {2, {"ISAC", 32000, 1}},
                                                 {3, {"L16", 32000, 1}}};
-  const std::map<int, int> cng_payload_types = {{8000, 100},
-                                                {16000, 101},
-                                                {32000, 102}};
+  const std::map<int, int> cng_payload_types = {
+      {8000, 100}, {16000, 101}, {32000, 102}};
   {
     std::map<int, SdpAudioFormat> receive_codecs = codecs;
     for (const auto& cng_type : cng_payload_types) {
-      receive_codecs.emplace(
-          std::make_pair(cng_type.second, SdpAudioFormat("CN", cng_type.first, 1)));
+      receive_codecs.emplace(std::make_pair(
+          cng_type.second, SdpAudioFormat("CN", cng_type.first, 1)));
     }
     receiver_->SetCodecs(receive_codecs);
   }
@@ -333,7 +332,7 @@
   packet_sent_ = false;
   InsertOnePacketOfSilence(
       SetEncoder(0, codecs.at(0), cng_payload_types));  // Enough to test
-                                                     // with one codec.
+                                                        // with one codec.
   ASSERT_TRUE(packet_sent_);
   EXPECT_EQ(AudioFrameType::kAudioFrameCN, last_frame_type_);