Sort #includes that got unsorted when gmock.h and gtest.h moved to webrtc/test/
gmock.h and gtest.h were moved (or rather, got wrappers so that we
could put some icky compatibility hacks in one place instead of 500)
in this CL: https://codereview.webrtc.org/2358993004/
NOPRESUBMIT=true
BUG=webrtc:6398
Review-Url: https://codereview.webrtc.org/2381013002
Cr-Original-Commit-Position: refs/heads/master@{#14464}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: ac9f876bc06b8152ecc3a328147cdab19136361b
diff --git a/api/mediastream_unittest.cc b/api/mediastream_unittest.cc
index b5f783f..5df08ce 100644
--- a/api/mediastream_unittest.cc
+++ b/api/mediastream_unittest.cc
@@ -12,12 +12,12 @@
#include "webrtc/api/audiotrack.h"
#include "webrtc/api/mediastream.h"
-#include "webrtc/api/videotrack.h"
#include "webrtc/api/test/fakevideotracksource.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
+#include "webrtc/api/videotrack.h"
#include "webrtc/base/gunit.h"
#include "webrtc/base/refcount.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
static const char kStreamLabel1[] = "local_stream_1";
static const char kVideoTrackId[] = "dummy_video_cam_1";
diff --git a/api/peerconnectioninterface_unittest.cc b/api/peerconnectioninterface_unittest.cc
index c639f98..d91336c 100644
--- a/api/peerconnectioninterface_unittest.cc
+++ b/api/peerconnectioninterface_unittest.cc
@@ -12,7 +12,6 @@
#include <string>
#include <utility>
-#include "webrtc/test/gmock.h"
#include "webrtc/api/audiotrack.h"
#include "webrtc/api/jsepsessiondescription.h"
#include "webrtc/api/mediastream.h"
@@ -22,9 +21,6 @@
#include "webrtc/api/rtpreceiverinterface.h"
#include "webrtc/api/rtpsenderinterface.h"
#include "webrtc/api/streamcollection.h"
-#ifdef WEBRTC_ANDROID
-#include "webrtc/api/test/androidtestinitializer.h"
-#endif
#include "webrtc/api/test/fakeconstraints.h"
#include "webrtc/api/test/fakertccertificategenerator.h"
#include "webrtc/api/test/fakevideotracksource.h"
@@ -42,6 +38,11 @@
#include "webrtc/p2p/base/fakeportallocator.h"
#include "webrtc/p2p/base/faketransportcontroller.h"
#include "webrtc/pc/mediasession.h"
+#include "webrtc/test/gmock.h"
+
+#ifdef WEBRTC_ANDROID
+#include "webrtc/api/test/androidtestinitializer.h"
+#endif
static const char kStreamLabel1[] = "local_stream_1";
static const char kStreamLabel2[] = "local_stream_2";
diff --git a/api/proxy_unittest.cc b/api/proxy_unittest.cc
index 8c16513..193fb29 100644
--- a/api/proxy_unittest.cc
+++ b/api/proxy_unittest.cc
@@ -13,10 +13,10 @@
#include <memory>
#include <string>
-#include "webrtc/test/gmock.h"
#include "webrtc/base/gunit.h"
#include "webrtc/base/refcount.h"
#include "webrtc/base/thread.h"
+#include "webrtc/test/gmock.h"
using ::testing::_;
using ::testing::DoAll;
diff --git a/api/rtpsenderreceiver_unittest.cc b/api/rtpsenderreceiver_unittest.cc
index ea0bd64..3fccfb9 100644
--- a/api/rtpsenderreceiver_unittest.cc
+++ b/api/rtpsenderreceiver_unittest.cc
@@ -12,8 +12,6 @@
#include <string>
#include <utility>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/api/audiotrack.h"
#include "webrtc/api/fakemediacontroller.h"
#include "webrtc/api/localaudiosource.h"
@@ -23,14 +21,16 @@
#include "webrtc/api/rtpsender.h"
#include "webrtc/api/streamcollection.h"
#include "webrtc/api/test/fakevideotracksource.h"
-#include "webrtc/api/videotracksource.h"
#include "webrtc/api/videotrack.h"
+#include "webrtc/api/videotracksource.h"
#include "webrtc/base/gunit.h"
-#include "webrtc/media/base/mediachannel.h"
#include "webrtc/media/base/fakemediaengine.h"
+#include "webrtc/media/base/mediachannel.h"
#include "webrtc/media/engine/fakewebrtccall.h"
#include "webrtc/p2p/base/faketransportcontroller.h"
#include "webrtc/pc/channelmanager.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
using ::testing::_;
using ::testing::Exactly;
diff --git a/api/statscollector_unittest.cc b/api/statscollector_unittest.cc
index f5270fd..acef448 100644
--- a/api/statscollector_unittest.cc
+++ b/api/statscollector_unittest.cc
@@ -15,8 +15,6 @@
#include "webrtc/api/statscollector.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/api/mediastream.h"
#include "webrtc/api/mediastreaminterface.h"
#include "webrtc/api/mediastreamtrack.h"
@@ -35,6 +33,8 @@
#include "webrtc/media/base/test/mock_mediachannel.h"
#include "webrtc/p2p/base/faketransportcontroller.h"
#include "webrtc/pc/channelmanager.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
using testing::_;
using testing::DoAll;
diff --git a/audio/audio_receive_stream_unittest.cc b/audio/audio_receive_stream_unittest.cc
index 77b529e..94bfabd 100644
--- a/audio/audio_receive_stream_unittest.cc
+++ b/audio/audio_receive_stream_unittest.cc
@@ -11,8 +11,6 @@
#include <string>
#include <vector>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/audio/audio_receive_stream.h"
#include "webrtc/audio/conversion.h"
#include "webrtc/call/mock/mock_rtc_event_log.h"
@@ -23,6 +21,7 @@
#include "webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/mock_voe_channel_proxy.h"
#include "webrtc/test/mock_voice_engine.h"
diff --git a/audio/audio_send_stream_unittest.cc b/audio/audio_send_stream_unittest.cc
index c7eb24c..a05c00b 100644
--- a/audio/audio_send_stream_unittest.cc
+++ b/audio/audio_send_stream_unittest.cc
@@ -11,17 +11,16 @@
#include <string>
#include <vector>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/audio/audio_send_stream.h"
#include "webrtc/audio/audio_state.h"
#include "webrtc/audio/conversion.h"
#include "webrtc/base/task_queue.h"
-#include "webrtc/modules/congestion_controller/include/mock/mock_congestion_controller.h"
#include "webrtc/call/mock/mock_rtc_event_log.h"
#include "webrtc/modules/congestion_controller/include/congestion_controller.h"
+#include "webrtc/modules/congestion_controller/include/mock/mock_congestion_controller.h"
#include "webrtc/modules/pacing/paced_sender.h"
#include "webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/mock_voe_channel_proxy.h"
#include "webrtc/test/mock_voice_engine.h"
diff --git a/audio/audio_state_unittest.cc b/audio/audio_state_unittest.cc
index 882766f..86a9176 100644
--- a/audio/audio_state_unittest.cc
+++ b/audio/audio_state_unittest.cc
@@ -10,9 +10,8 @@
#include <memory>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/audio/audio_state.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/mock_voice_engine.h"
namespace webrtc {
diff --git a/base/event_tracer_unittest.cc b/base/event_tracer_unittest.cc
index 6ea1275..ec474bd 100644
--- a/base/event_tracer_unittest.cc
+++ b/base/event_tracer_unittest.cc
@@ -10,9 +10,9 @@
#include "webrtc/base/event_tracer.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/trace_event.h"
#include "webrtc/system_wrappers/include/static_instance.h"
+#include "webrtc/test/gtest.h"
namespace {
diff --git a/base/mod_ops_unittest.cc b/base/mod_ops_unittest.cc
index 931579d..58c6a8e 100644
--- a/base/mod_ops_unittest.cc
+++ b/base/mod_ops_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/base/mod_ops.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
class TestModOps : public ::testing::Test {
diff --git a/base/platform_thread_unittest.cc b/base/platform_thread_unittest.cc
index 86f091f..322eb35 100644
--- a/base/platform_thread_unittest.cc
+++ b/base/platform_thread_unittest.cc
@@ -10,8 +10,8 @@
#include "webrtc/base/platform_thread.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/system_wrappers/include/sleep.h"
+#include "webrtc/test/gtest.h"
namespace rtc {
namespace {
diff --git a/base/random_unittest.cc b/base/random_unittest.cc
index 9022206..0d9041f 100644
--- a/base/random_unittest.cc
+++ b/base/random_unittest.cc
@@ -13,9 +13,9 @@
#include <limits>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/mathutils.h" // unsigned difference
#include "webrtc/base/random.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/base/rate_limiter_unittest.cc b/base/rate_limiter_unittest.cc
index 198e3b2..f799a97 100644
--- a/base/rate_limiter_unittest.cc
+++ b/base/rate_limiter_unittest.cc
@@ -11,13 +11,12 @@
#include <algorithm>
#include <memory>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/base/event.h"
#include "webrtc/base/platform_thread.h"
#include "webrtc/base/rate_limiter.h"
#include "webrtc/base/task_queue.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/base/rate_statistics_unittest.cc b/base/rate_statistics_unittest.cc
index 0aa5ac2..06136f5 100644
--- a/base/rate_statistics_unittest.cc
+++ b/base/rate_statistics_unittest.cc
@@ -10,8 +10,8 @@
#include <algorithm>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/rate_statistics.h"
+#include "webrtc/test/gtest.h"
namespace {
diff --git a/base/sequenced_task_checker_unittest.cc b/base/sequenced_task_checker_unittest.cc
index 13b1afc..20a4c0f 100644
--- a/base/sequenced_task_checker_unittest.cc
+++ b/base/sequenced_task_checker_unittest.cc
@@ -7,12 +7,13 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
+
#include "webrtc/base/checks.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/platform_thread.h"
#include "webrtc/base/sequenced_task_checker.h"
#include "webrtc/base/task_queue.h"
+#include "webrtc/test/gtest.h"
namespace rtc {
diff --git a/base/thread_checker_unittest.cc b/base/thread_checker_unittest.cc
index 2e6afe9..76462fd 100644
--- a/base/thread_checker_unittest.cc
+++ b/base/thread_checker_unittest.cc
@@ -12,12 +12,12 @@
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/task_queue.h"
#include "webrtc/base/thread.h"
#include "webrtc/base/thread_checker.h"
+#include "webrtc/test/gtest.h"
// Duplicated from base/threading/thread_checker.h so that we can be
// good citizens there and undef the macro.
diff --git a/call/bitrate_allocator_unittest.cc b/call/bitrate_allocator_unittest.cc
index 811e76d..5d0395d 100644
--- a/call/bitrate_allocator_unittest.cc
+++ b/call/bitrate_allocator_unittest.cc
@@ -12,10 +12,10 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/call/bitrate_allocator.h"
#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
using testing::NiceMock;
diff --git a/call/bitrate_estimator_tests.cc b/call/bitrate_estimator_tests.cc
index 57639cd..79dedef 100644
--- a/call/bitrate_estimator_tests.cc
+++ b/call/bitrate_estimator_tests.cc
@@ -12,8 +12,6 @@
#include <memory>
#include <string>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/api/call/audio_state.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/event.h"
@@ -27,8 +25,9 @@
#include "webrtc/test/encoder_settings.h"
#include "webrtc/test/fake_decoder.h"
#include "webrtc/test/fake_encoder.h"
-#include "webrtc/test/mock_voice_engine.h"
#include "webrtc/test/frame_generator_capturer.h"
+#include "webrtc/test/gtest.h"
+#include "webrtc/test/mock_voice_engine.h"
namespace webrtc {
namespace {
diff --git a/call/call_perf_tests.cc b/call/call_perf_tests.cc
index 6258a85..6833dc0 100644
--- a/call/call_perf_tests.cc
+++ b/call/call_perf_tests.cc
@@ -13,8 +13,6 @@
#include <memory>
#include <string>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/base/checks.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/thread_annotations.h"
@@ -36,6 +34,7 @@
#include "webrtc/test/fake_encoder.h"
#include "webrtc/test/frame_generator.h"
#include "webrtc/test/frame_generator_capturer.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/rtp_rtcp_observer.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/testsupport/perf_test.h"
diff --git a/call/call_unittest.cc b/call/call_unittest.cc
index 14687d5..2fe4fde 100644
--- a/call/call_unittest.cc
+++ b/call/call_unittest.cc
@@ -11,11 +11,10 @@
#include <list>
#include <memory>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/api/call/audio_state.h"
#include "webrtc/call.h"
#include "webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/mock_voice_engine.h"
namespace {
diff --git a/call/mock/mock_rtc_event_log.h b/call/mock/mock_rtc_event_log.h
index 7558411..bb1337e 100644
--- a/call/mock/mock_rtc_event_log.h
+++ b/call/mock/mock_rtc_event_log.h
@@ -13,9 +13,8 @@
#include <string>
-#include "webrtc/test/gmock.h"
-
#include "webrtc/call/rtc_event_log.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/call/packet_injection_tests.cc b/call/packet_injection_tests.cc
index ccd4f4a..42f4fae 100644
--- a/call/packet_injection_tests.cc
+++ b/call/packet_injection_tests.cc
@@ -10,9 +10,8 @@
#include <memory>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/test/call_test.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/null_transport.h"
namespace webrtc {
diff --git a/call/rampup_tests.cc b/call/rampup_tests.cc
index bbfd87b..74c915d 100644
--- a/call/rampup_tests.cc
+++ b/call/rampup_tests.cc
@@ -10,9 +10,9 @@
#include "webrtc/call/rampup_tests.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/platform_thread.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/perf_test.h"
namespace webrtc {
diff --git a/call/ringbuffer_unittest.cc b/call/ringbuffer_unittest.cc
index 166c4f6..370f262 100644
--- a/call/ringbuffer_unittest.cc
+++ b/call/ringbuffer_unittest.cc
@@ -11,9 +11,9 @@
#include <list>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/random.h"
#include "webrtc/call/ringbuffer.h"
+#include "webrtc/test/gtest.h"
namespace {
template <typename T>
diff --git a/call/rtc_event_log_unittest.cc b/call/rtc_event_log_unittest.cc
index 2a96afe..6c4ec63 100644
--- a/call/rtc_event_log_unittest.cc
+++ b/call/rtc_event_log_unittest.cc
@@ -14,7 +14,6 @@
#include <utility>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/buffer.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/random.h"
@@ -28,6 +27,7 @@
#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/test_suite.h"
#include "webrtc/test/testsupport/fileutils.h"
diff --git a/call/rtc_event_log_unittest_helper.cc b/call/rtc_event_log_unittest_helper.cc
index ba19641..566e92b 100644
--- a/call/rtc_event_log_unittest_helper.cc
+++ b/call/rtc_event_log_unittest_helper.cc
@@ -14,8 +14,8 @@
#include <string>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/checks.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/test_suite.h"
#include "webrtc/test/testsupport/fileutils.h"
diff --git a/common_audio/audio_converter_unittest.cc b/common_audio/audio_converter_unittest.cc
index 26bb973..320c1da 100644
--- a/common_audio/audio_converter_unittest.cc
+++ b/common_audio/audio_converter_unittest.cc
@@ -13,12 +13,12 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/arraysize.h"
#include "webrtc/base/format_macros.h"
#include "webrtc/common_audio/audio_converter.h"
#include "webrtc/common_audio/channel_buffer.h"
#include "webrtc/common_audio/resampler/push_sinc_resampler.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/common_audio/audio_ring_buffer_unittest.cc b/common_audio/audio_ring_buffer_unittest.cc
index 02c48d1..fe86853 100644
--- a/common_audio/audio_ring_buffer_unittest.cc
+++ b/common_audio/audio_ring_buffer_unittest.cc
@@ -12,8 +12,8 @@
#include "webrtc/common_audio/audio_ring_buffer.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/common_audio/channel_buffer.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/common_audio/audio_util_unittest.cc b/common_audio/audio_util_unittest.cc
index c21eaca..d91b648 100644
--- a/common_audio/audio_util_unittest.cc
+++ b/common_audio/audio_util_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "webrtc/common_audio/include/audio_util.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
-#include "webrtc/common_audio/include/audio_util.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/common_audio/blocker_unittest.cc b/common_audio/blocker_unittest.cc
index 105bb81..1c675db 100644
--- a/common_audio/blocker_unittest.cc
+++ b/common_audio/blocker_unittest.cc
@@ -12,8 +12,8 @@
#include "webrtc/common_audio/blocker.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/arraysize.h"
+#include "webrtc/test/gtest.h"
namespace {
diff --git a/common_audio/channel_buffer_unittest.cc b/common_audio/channel_buffer_unittest.cc
index 80c4b72..f4171ba 100644
--- a/common_audio/channel_buffer_unittest.cc
+++ b/common_audio/channel_buffer_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/common_audio/channel_buffer.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/common_audio/real_fourier_unittest.cc b/common_audio/real_fourier_unittest.cc
index dab28bb..d1281c7 100644
--- a/common_audio/real_fourier_unittest.cc
+++ b/common_audio/real_fourier_unittest.cc
@@ -12,9 +12,9 @@
#include <stdlib.h>
-#include "webrtc/test/gtest.h"
-#include "webrtc/common_audio/real_fourier_openmax.h"
#include "webrtc/common_audio/real_fourier_ooura.h"
+#include "webrtc/common_audio/real_fourier_openmax.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/common_audio/resampler/push_resampler_unittest.cc b/common_audio/resampler/push_resampler_unittest.cc
index 98657d1..9a5cb5d 100644
--- a/common_audio/resampler/push_resampler_unittest.cc
+++ b/common_audio/resampler/push_resampler_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
-#include "webrtc/base/checks.h" // force defintion of RTC_DCHECK_IS_ON
+#include "webrtc/base/checks.h" // RTC_DCHECK_IS_ON
#include "webrtc/common_audio/resampler/include/push_resampler.h"
+#include "webrtc/test/gtest.h"
// Quality testing of PushResampler is handled through output_mixer_unittest.cc.
diff --git a/common_audio/resampler/push_sinc_resampler_unittest.cc b/common_audio/resampler/push_sinc_resampler_unittest.cc
index c9a3358..ab7f141 100644
--- a/common_audio/resampler/push_sinc_resampler_unittest.cc
+++ b/common_audio/resampler/push_sinc_resampler_unittest.cc
@@ -12,12 +12,12 @@
#include <cstring>
#include <memory>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/timeutils.h"
#include "webrtc/common_audio/include/audio_util.h"
#include "webrtc/common_audio/resampler/push_sinc_resampler.h"
#include "webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/common_audio/resampler/resampler_unittest.cc b/common_audio/resampler/resampler_unittest.cc
index 4c10f93..4f50363 100644
--- a/common_audio/resampler/resampler_unittest.cc
+++ b/common_audio/resampler/resampler_unittest.cc
@@ -8,9 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
-
#include "webrtc/common_audio/resampler/include/resampler.h"
+#include "webrtc/test/gtest.h"
// TODO(andrew): this is a work-in-progress. Many more tests are needed.
diff --git a/common_audio/resampler/sinc_resampler_unittest.cc b/common_audio/resampler/sinc_resampler_unittest.cc
index d965881..c7e84fc 100644
--- a/common_audio/resampler/sinc_resampler_unittest.cc
+++ b/common_audio/resampler/sinc_resampler_unittest.cc
@@ -18,13 +18,13 @@
#include <memory>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/timeutils.h"
#include "webrtc/common_audio/resampler/sinc_resampler.h"
#include "webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h"
#include "webrtc/system_wrappers/include/cpu_features_wrapper.h"
#include "webrtc/system_wrappers/include/stringize_macros.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/test_suite.h"
using testing::_;
diff --git a/common_audio/signal_processing/real_fft_unittest.cc b/common_audio/signal_processing/real_fft_unittest.cc
index ba8619a..8b1c431 100644
--- a/common_audio/signal_processing/real_fft_unittest.cc
+++ b/common_audio/signal_processing/real_fft_unittest.cc
@@ -10,9 +10,8 @@
#include "webrtc/common_audio/signal_processing/include/real_fft.h"
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
-#include "webrtc/typedefs.h"
-
#include "webrtc/test/gtest.h"
+#include "webrtc/typedefs.h"
namespace webrtc {
namespace {
diff --git a/common_audio/signal_processing/signal_processing_unittest.cc b/common_audio/signal_processing/signal_processing_unittest.cc
index 9429bcd..9bf22fe 100644
--- a/common_audio/signal_processing/signal_processing_unittest.cc
+++ b/common_audio/signal_processing/signal_processing_unittest.cc
@@ -11,8 +11,8 @@
#include <algorithm>
#include <sstream>
-#include "webrtc/test/gtest.h"
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
+#include "webrtc/test/gtest.h"
static const size_t kVector16Size = 9;
static const int16_t vector16[kVector16Size] = {1, -15511, 4323, 1963,
diff --git a/common_audio/sparse_fir_filter_unittest.cc b/common_audio/sparse_fir_filter_unittest.cc
index edfbf52..e7ba5d2 100644
--- a/common_audio/sparse_fir_filter_unittest.cc
+++ b/common_audio/sparse_fir_filter_unittest.cc
@@ -12,9 +12,9 @@
#include "webrtc/common_audio/sparse_fir_filter.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/arraysize.h"
#include "webrtc/common_audio/fir_filter.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/common_audio/vad/mock/mock_vad.h b/common_audio/vad/mock/mock_vad.h
index cce72c6..09109e6 100644
--- a/common_audio/vad/mock/mock_vad.h
+++ b/common_audio/vad/mock/mock_vad.h
@@ -12,7 +12,6 @@
#define WEBRTC_COMMON_AUDIO_VAD_MOCK_MOCK_VAD_H_
#include "webrtc/common_audio/vad/include/vad.h"
-
#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/common_audio/vad/vad_core_unittest.cc b/common_audio/vad/vad_core_unittest.cc
index de61bc9..43673ee 100644
--- a/common_audio/vad/vad_core_unittest.cc
+++ b/common_audio/vad/vad_core_unittest.cc
@@ -10,8 +10,8 @@
#include <stdlib.h>
-#include "webrtc/test/gtest.h"
#include "webrtc/common_audio/vad/vad_unittest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
extern "C" {
diff --git a/common_audio/vad/vad_filterbank_unittest.cc b/common_audio/vad/vad_filterbank_unittest.cc
index 58e70bf..5b27801 100644
--- a/common_audio/vad/vad_filterbank_unittest.cc
+++ b/common_audio/vad/vad_filterbank_unittest.cc
@@ -10,8 +10,8 @@
#include <stdlib.h>
-#include "webrtc/test/gtest.h"
#include "webrtc/common_audio/vad/vad_unittest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
extern "C" {
diff --git a/common_audio/vad/vad_gmm_unittest.cc b/common_audio/vad/vad_gmm_unittest.cc
index eff81dd..9de93f6 100644
--- a/common_audio/vad/vad_gmm_unittest.cc
+++ b/common_audio/vad/vad_gmm_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/common_audio/vad/vad_unittest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
extern "C" {
diff --git a/common_audio/vad/vad_sp_unittest.cc b/common_audio/vad/vad_sp_unittest.cc
index 0c6827f..1e335e3 100644
--- a/common_audio/vad/vad_sp_unittest.cc
+++ b/common_audio/vad/vad_sp_unittest.cc
@@ -10,8 +10,8 @@
#include <stdlib.h>
-#include "webrtc/test/gtest.h"
#include "webrtc/common_audio/vad/vad_unittest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
extern "C" {
diff --git a/common_audio/vad/vad_unittest.cc b/common_audio/vad/vad_unittest.cc
index a3dcba9..a03f667 100644
--- a/common_audio/vad/vad_unittest.cc
+++ b/common_audio/vad/vad_unittest.cc
@@ -12,12 +12,11 @@
#include <stdlib.h>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/base/arraysize.h"
#include "webrtc/base/checks.h"
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
#include "webrtc/common_audio/vad/include/webrtc_vad.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
VadTest::VadTest() {}
diff --git a/common_audio/vad/vad_unittest.h b/common_audio/vad/vad_unittest.h
index ae11340..55ba527 100644
--- a/common_audio/vad/vad_unittest.h
+++ b/common_audio/vad/vad_unittest.h
@@ -14,7 +14,6 @@
#include <stddef.h> // size_t
#include "webrtc/test/gtest.h"
-
#include "webrtc/typedefs.h"
namespace {
diff --git a/common_audio/wav_file_unittest.cc b/common_audio/wav_file_unittest.cc
index 7bad87a..0868fa6 100644
--- a/common_audio/wav_file_unittest.cc
+++ b/common_audio/wav_file_unittest.cc
@@ -14,9 +14,9 @@
#include <cmath>
#include <limits>
-#include "webrtc/test/gtest.h"
-#include "webrtc/common_audio/wav_header.h"
#include "webrtc/common_audio/wav_file.h"
+#include "webrtc/common_audio/wav_header.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/common_audio/wav_header_unittest.cc b/common_audio/wav_header_unittest.cc
index cf5e010..17ebf82 100644
--- a/common_audio/wav_header_unittest.cc
+++ b/common_audio/wav_header_unittest.cc
@@ -10,8 +10,8 @@
#include <limits>
-#include "webrtc/test/gtest.h"
#include "webrtc/common_audio/wav_header.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/common_video/bitrate_adjuster_unittest.cc b/common_video/bitrate_adjuster_unittest.cc
index 5e509b3..b6152ac 100644
--- a/common_video/bitrate_adjuster_unittest.cc
+++ b/common_video/bitrate_adjuster_unittest.cc
@@ -8,10 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
-
#include "webrtc/common_video/include/bitrate_adjuster.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/common_video/h264/pps_parser_unittest.cc b/common_video/h264/pps_parser_unittest.cc
index 7474753..9a650e8 100644
--- a/common_video/h264/pps_parser_unittest.cc
+++ b/common_video/h264/pps_parser_unittest.cc
@@ -13,11 +13,10 @@
#include <limits>
#include <memory>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/base/bitbuffer.h"
#include "webrtc/base/buffer.h"
#include "webrtc/common_video/h264/h264_common.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/common_video/h264/sps_parser_unittest.cc b/common_video/h264/sps_parser_unittest.cc
index bf3cd09..958ddc0 100644
--- a/common_video/h264/sps_parser_unittest.cc
+++ b/common_video/h264/sps_parser_unittest.cc
@@ -10,12 +10,11 @@
#include "webrtc/common_video/h264/sps_parser.h"
-#include "webrtc/test/gtest.h"
-
#include "webrtc/base/arraysize.h"
#include "webrtc/base/bitbuffer.h"
#include "webrtc/base/buffer.h"
#include "webrtc/common_video/h264/h264_common.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/common_video/h264/sps_vui_rewriter_unittest.cc b/common_video/h264/sps_vui_rewriter_unittest.cc
index 12c2741..711a836 100644
--- a/common_video/h264/sps_vui_rewriter_unittest.cc
+++ b/common_video/h264/sps_vui_rewriter_unittest.cc
@@ -10,17 +10,15 @@
#include <vector>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/base/bitbuffer.h"
#include "webrtc/base/buffer.h"
#include "webrtc/base/fileutils.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/pathutils.h"
#include "webrtc/base/stream.h"
-
-#include "webrtc/common_video/h264/sps_vui_rewriter.h"
#include "webrtc/common_video/h264/h264_common.h"
+#include "webrtc/common_video/h264/sps_vui_rewriter.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/common_video/i420_buffer_pool_unittest.cc b/common_video/i420_buffer_pool_unittest.cc
index 7dfe792..d5c7c9b 100644
--- a/common_video/i420_buffer_pool_unittest.cc
+++ b/common_video/i420_buffer_pool_unittest.cc
@@ -10,8 +10,8 @@
#include <string>
-#include "webrtc/test/gtest.h"
#include "webrtc/common_video/include/i420_buffer_pool.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/common_video/i420_video_frame_unittest.cc b/common_video/i420_video_frame_unittest.cc
index 4d41c9d..a0146e5 100644
--- a/common_video/i420_video_frame_unittest.cc
+++ b/common_video/i420_video_frame_unittest.cc
@@ -11,10 +11,10 @@
#include <math.h>
#include <string.h>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/bind.h"
#include "webrtc/test/fake_texture_frame.h"
#include "webrtc/test/frame_utils.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/video_frame.h"
namespace webrtc {
diff --git a/common_video/libyuv/libyuv_unittest.cc b/common_video/libyuv/libyuv_unittest.cc
index 98546f0..1ed72df 100644
--- a/common_video/libyuv/libyuv_unittest.cc
+++ b/common_video/libyuv/libyuv_unittest.cc
@@ -13,9 +13,9 @@
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/test/frame_utils.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/video_frame.h"
diff --git a/media/engine/nullwebrtcvideoengine_unittest.cc b/media/engine/nullwebrtcvideoengine_unittest.cc
index 8ccaa2f..c63dbfb 100644
--- a/media/engine/nullwebrtcvideoengine_unittest.cc
+++ b/media/engine/nullwebrtcvideoengine_unittest.cc
@@ -8,11 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
-
#include "webrtc/media/engine/nullwebrtcvideoengine.h"
#include "webrtc/media/engine/webrtcvoiceengine.h"
#include "webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h"
+#include "webrtc/test/gtest.h"
namespace cricket {
diff --git a/media/engine/payload_type_mapper_unittest.cc b/media/engine/payload_type_mapper_unittest.cc
index d11644c..7f94c6e 100644
--- a/media/engine/payload_type_mapper_unittest.cc
+++ b/media/engine/payload_type_mapper_unittest.cc
@@ -11,8 +11,8 @@
#include <set>
#include <string>
-#include "webrtc/test/gtest.h"
#include "webrtc/media/engine/payload_type_mapper.h"
+#include "webrtc/test/gtest.h"
namespace cricket {
diff --git a/media/engine/simulcast_unittest.cc b/media/engine/simulcast_unittest.cc
index da54767..8377d4f 100644
--- a/media/engine/simulcast_unittest.cc
+++ b/media/engine/simulcast_unittest.cc
@@ -10,8 +10,8 @@
#include <string>
-#include "webrtc/test/gtest.h"
#include "webrtc/media/engine/simulcast.h"
+#include "webrtc/test/gtest.h"
namespace cricket {
diff --git a/media/engine/webrtcmediaengine_unittest.cc b/media/engine/webrtcmediaengine_unittest.cc
index 1416324..03e50a1 100644
--- a/media/engine/webrtcmediaengine_unittest.cc
+++ b/media/engine/webrtcmediaengine_unittest.cc
@@ -8,10 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
-
-#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
#include "webrtc/media/engine/webrtcmediaengine.h"
+#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
+#include "webrtc/test/gtest.h"
using webrtc::RtpExtension;
diff --git a/modules/audio_coding/acm2/acm_receive_test_oldapi.cc b/modules/audio_coding/acm2/acm_receive_test_oldapi.cc
index 105221b..71a8744 100644
--- a/modules/audio_coding/acm2/acm_receive_test_oldapi.cc
+++ b/modules/audio_coding/acm2/acm_receive_test_oldapi.cc
@@ -15,11 +15,11 @@
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
#include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h"
#include "webrtc/modules/audio_coding/neteq/tools/packet.h"
#include "webrtc/modules/audio_coding/neteq/tools/packet_source.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace test {
diff --git a/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc b/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc
index 9551cac..ce7e8fc 100644
--- a/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc
+++ b/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc
@@ -13,13 +13,13 @@
#include <algorithm> // std::min
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/safe_conversions.h"
-#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
+#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/test_suite.h"
#include "webrtc/test/testsupport/fileutils.h"
diff --git a/modules/audio_coding/acm2/acm_send_test_oldapi.cc b/modules/audio_coding/acm2/acm_send_test_oldapi.cc
index 63ddf3a..bb588f0 100644
--- a/modules/audio_coding/acm2/acm_send_test_oldapi.cc
+++ b/modules/audio_coding/acm2/acm_send_test_oldapi.cc
@@ -14,12 +14,12 @@
#include <stdio.h>
#include <string.h>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/checks.h"
#include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
#include "webrtc/modules/audio_coding/neteq/tools/packet.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace test {
diff --git a/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc b/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc
index 5ae2038..60e90f7 100644
--- a/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc
+++ b/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc
@@ -13,7 +13,6 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/md5digest.h"
#include "webrtc/base/platform_thread.h"
@@ -40,6 +39,7 @@
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/system_wrappers/include/event_wrapper.h"
#include "webrtc/system_wrappers/include/sleep.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
using ::testing::AtLeast;
diff --git a/modules/audio_coding/acm2/call_statistics_unittest.cc b/modules/audio_coding/acm2/call_statistics_unittest.cc
index 7c56b71..ce4468a 100644
--- a/modules/audio_coding/acm2/call_statistics_unittest.cc
+++ b/modules/audio_coding/acm2/call_statistics_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/acm2/call_statistics.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_coding/acm2/codec_manager_unittest.cc b/modules/audio_coding/acm2/codec_manager_unittest.cc
index 0108dc0..bae0e39 100644
--- a/modules/audio_coding/acm2/codec_manager_unittest.cc
+++ b/modules/audio_coding/acm2/codec_manager_unittest.cc
@@ -10,10 +10,10 @@
#include <memory>
-#include "webrtc/test/gtest.h"
-#include "webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h"
#include "webrtc/modules/audio_coding/acm2/codec_manager.h"
#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
+#include "webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace acm2 {
diff --git a/modules/audio_coding/acm2/rent_a_codec_unittest.cc b/modules/audio_coding/acm2/rent_a_codec_unittest.cc
index 1816ae4..8fddf87 100644
--- a/modules/audio_coding/acm2/rent_a_codec_unittest.cc
+++ b/modules/audio_coding/acm2/rent_a_codec_unittest.cc
@@ -10,10 +10,10 @@
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/arraysize.h"
-#include "webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h"
#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
+#include "webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace acm2 {
diff --git a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc
index ac508cf..d4aeadc 100644
--- a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc
+++ b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc
@@ -11,11 +11,11 @@
#include <utility>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc b/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc
index bec0ec5..1ba1e82 100644
--- a/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc
+++ b/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace audio_network_adaptor {
diff --git a/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc b/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
index b0fb773..a175910 100644
--- a/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
+++ b/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
@@ -10,10 +10,10 @@
#include <utility>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc b/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc
index 8c335d8..4eea54e 100644
--- a/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc
+++ b/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc
@@ -10,8 +10,8 @@
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc b/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc
index 5d45646..997382f 100644
--- a/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc
+++ b/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc
@@ -11,8 +11,8 @@
#include <memory>
#include <utility>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h b/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h
index b7a59cd..cf7c307 100644
--- a/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h
+++ b/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_CONTROLLER_H_
#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_CONTROLLER_H_
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h b/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h
index 8be3d2e..6a20f7a 100644
--- a/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h
+++ b/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_DEBUG_DUMP_WRITER_H_
#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_DEBUG_DUMP_WRITER_H_
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/modules/audio_coding/audio_network_adaptor/mock/mock_smoothing_filter.h b/modules/audio_coding/audio_network_adaptor/mock/mock_smoothing_filter.h
index 844f16c..745ca98 100644
--- a/modules/audio_coding/audio_network_adaptor/mock/mock_smoothing_filter.h
+++ b/modules/audio_coding/audio_network_adaptor/mock/mock_smoothing_filter.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_SMOOTHING_FILTER_H_
#define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_SMOOTHING_FILTER_H_
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/modules/audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc b/modules/audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc
index 8ef90f2..af4e8d9 100644
--- a/modules/audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc
+++ b/modules/audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc
@@ -10,8 +10,8 @@
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_coding/codecs/audio_decoder_factory_unittest.cc b/modules/audio_coding/codecs/audio_decoder_factory_unittest.cc
index bda5391..6b63f98 100644
--- a/modules/audio_coding/codecs/audio_decoder_factory_unittest.cc
+++ b/modules/audio_coding/codecs/audio_decoder_factory_unittest.cc
@@ -10,8 +10,8 @@
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc b/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc
index 8511e9d..ace217e 100644
--- a/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc
+++ b/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc
@@ -11,11 +11,11 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/common_audio/vad/mock/mock_vad.h"
#include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h"
#include "webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h"
+#include "webrtc/test/gtest.h"
using ::testing::Return;
using ::testing::_;
diff --git a/modules/audio_coding/codecs/cng/cng_unittest.cc b/modules/audio_coding/codecs/cng/cng_unittest.cc
index 6860348..3835e93 100644
--- a/modules/audio_coding/codecs/cng/cng_unittest.cc
+++ b/modules/audio_coding/codecs/cng/cng_unittest.cc
@@ -10,9 +10,9 @@
#include <memory>
#include <string>
+#include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h"
#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
-#include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h"
namespace webrtc {
diff --git a/modules/audio_coding/codecs/ilbc/ilbc_unittest.cc b/modules/audio_coding/codecs/ilbc/ilbc_unittest.cc
index a4eaaa2..dbd5c07 100644
--- a/modules/audio_coding/codecs/ilbc/ilbc_unittest.cc
+++ b/modules/audio_coding/codecs/ilbc/ilbc_unittest.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h"
#include "webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h"
#include "webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc b/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc
index 20c41b8..ce96e2c 100644
--- a/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc
+++ b/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
#include "webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h"
#include "webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h"
#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h"
#include "webrtc/system_wrappers/include/cpu_features_wrapper.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
class FilterBanksTest : public testing::Test {
diff --git a/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc b/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc
index 251f9d3..527841a 100644
--- a/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc
+++ b/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc
@@ -7,9 +7,10 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
+
#include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h"
#include "webrtc/system_wrappers/include/cpu_features_wrapper.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
class FiltersTest : public testing::Test {
diff --git a/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc b/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc
index b030172..a81814d 100644
--- a/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc
+++ b/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h"
#include "webrtc/system_wrappers/include/cpu_features_wrapper.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
class LpcMaskingModelTest : public testing::Test {
diff --git a/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc b/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc
index 9197483..35e5800 100644
--- a/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc
+++ b/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc
@@ -7,9 +7,10 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
+
#include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h"
#include "webrtc/system_wrappers/include/cpu_features_wrapper.h"
+#include "webrtc/test/gtest.h"
static const int kSamples = FRAMESAMPLES/2;
static const int32_t spec2time_out_expected_1[kSamples] = {
diff --git a/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc b/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc
index 8d781e1..e9ca570 100644
--- a/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc
+++ b/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc
@@ -10,8 +10,8 @@
#include <limits>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc b/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc
index b7f4888..3f7170c 100644
--- a/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc
+++ b/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc
@@ -9,8 +9,8 @@
*/
#include <string>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/codecs/isac/main/include/isac.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
struct WebRtcISACStruct;
diff --git a/modules/audio_coding/codecs/isac/unittest.cc b/modules/audio_coding/codecs/isac/unittest.cc
index d304f33..d68c24d 100644
--- a/modules/audio_coding/codecs/isac/unittest.cc
+++ b/modules/audio_coding/codecs/isac/unittest.cc
@@ -13,11 +13,11 @@
#include <sstream>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/buffer.h"
#include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h"
#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h"
#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc b/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc
index 30f9737..a9d20e1 100644
--- a/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc
+++ b/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
#include "webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h b/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h
index 676d683..f2ef170 100644
--- a/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h
+++ b/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h
@@ -13,9 +13,9 @@
#include <vector>
-#include "webrtc/test/gmock.h"
#include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/modules/audio_coding/codecs/audio_decoder_factory.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/modules/audio_coding/codecs/mock/mock_audio_encoder.h b/modules/audio_coding/codecs/mock/mock_audio_encoder.h
index cf076fa..66f82b2 100644
--- a/modules/audio_coding/codecs/mock/mock_audio_encoder.h
+++ b/modules/audio_coding/codecs/mock/mock_audio_encoder.h
@@ -15,7 +15,6 @@
#include "webrtc/base/array_view.h"
#include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
-
#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc b/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
index 20b2368..1b836f3 100644
--- a/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
+++ b/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
@@ -10,10 +10,10 @@
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/checks.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_coding/codecs/opus/opus_fec_test.cc b/modules/audio_coding/codecs/opus/opus_fec_test.cc
index c6dcb2e..8748162 100644
--- a/modules/audio_coding/codecs/opus/opus_fec_test.cc
+++ b/modules/audio_coding/codecs/opus/opus_fec_test.cc
@@ -10,9 +10,9 @@
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/format_macros.h"
#include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
using ::std::string;
diff --git a/modules/audio_coding/codecs/opus/opus_unittest.cc b/modules/audio_coding/codecs/opus/opus_unittest.cc
index 63f4e0a..febea2f 100644
--- a/modules/audio_coding/codecs/opus/opus_unittest.cc
+++ b/modules/audio_coding/codecs/opus/opus_unittest.cc
@@ -11,11 +11,11 @@
#include <memory>
#include <string>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/checks.h"
-#include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h"
#include "webrtc/modules/audio_coding/codecs/opus/opus_inst.h"
+#include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h"
#include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc b/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc
index 1d162e1..5509792 100644
--- a/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc
+++ b/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc
@@ -11,10 +11,10 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/checks.h"
-#include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h"
#include "webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h"
+#include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h"
+#include "webrtc/test/gtest.h"
using ::testing::Return;
using ::testing::_;
diff --git a/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc b/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
index b3fb7cf..5b0f02e 100644
--- a/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
+++ b/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
@@ -10,8 +10,8 @@
#include "webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/format_macros.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
using ::std::tr1::get;
diff --git a/modules/audio_coding/codecs/tools/audio_codec_speed_test.h b/modules/audio_coding/codecs/tools/audio_codec_speed_test.h
index 32ff9c6..b79b1ef 100644
--- a/modules/audio_coding/codecs/tools/audio_codec_speed_test.h
+++ b/modules/audio_coding/codecs/tools/audio_codec_speed_test.h
@@ -13,6 +13,7 @@
#include <memory>
#include <string>
+
#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
diff --git a/modules/audio_coding/neteq/audio_decoder_unittest.cc b/modules/audio_coding/neteq/audio_decoder_unittest.cc
index 376f8d7..876a5ff 100644
--- a/modules/audio_coding/neteq/audio_decoder_unittest.cc
+++ b/modules/audio_coding/neteq/audio_decoder_unittest.cc
@@ -17,7 +17,6 @@
#include <string>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h"
#include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h"
#include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h"
@@ -34,6 +33,7 @@
#include "webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h"
#include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h"
#include "webrtc/system_wrappers/include/data_log.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_coding/neteq/comfort_noise_unittest.cc b/modules/audio_coding/neteq/comfort_noise_unittest.cc
index 19ffd40..2de6886 100644
--- a/modules/audio_coding/neteq/comfort_noise_unittest.cc
+++ b/modules/audio_coding/neteq/comfort_noise_unittest.cc
@@ -12,9 +12,9 @@
#include "webrtc/modules/audio_coding/neteq/comfort_noise.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h"
#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_coding/neteq/decision_logic_unittest.cc b/modules/audio_coding/neteq/decision_logic_unittest.cc
index e8bbb5e..42fc673 100644
--- a/modules/audio_coding/neteq/decision_logic_unittest.cc
+++ b/modules/audio_coding/neteq/decision_logic_unittest.cc
@@ -10,15 +10,15 @@
// Unit tests for DecisionLogic class and derived classes.
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h"
#include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h"
-#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
#include "webrtc/modules/audio_coding/neteq/decision_logic.h"
+#include "webrtc/modules/audio_coding/neteq/decoder_database.h"
#include "webrtc/modules/audio_coding/neteq/delay_manager.h"
#include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h"
#include "webrtc/modules/audio_coding/neteq/packet_buffer.h"
#include "webrtc/modules/audio_coding/neteq/tick_timer.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_coding/neteq/decoder_database_unittest.cc b/modules/audio_coding/neteq/decoder_database_unittest.cc
index b97a49d..c65d287 100644
--- a/modules/audio_coding/neteq/decoder_database_unittest.cc
+++ b/modules/audio_coding/neteq/decoder_database_unittest.cc
@@ -15,12 +15,11 @@
#include <string>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-
-#include "webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h"
#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
#include "webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h"
+#include "webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
using testing::_;
using testing::Invoke;
diff --git a/modules/audio_coding/neteq/delay_manager_unittest.cc b/modules/audio_coding/neteq/delay_manager_unittest.cc
index 8ccc735..84ceb88 100644
--- a/modules/audio_coding/neteq/delay_manager_unittest.cc
+++ b/modules/audio_coding/neteq/delay_manager_unittest.cc
@@ -14,9 +14,9 @@
#include <math.h>
+#include "webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
-#include "webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h"
namespace webrtc {
diff --git a/modules/audio_coding/neteq/dsp_helper_unittest.cc b/modules/audio_coding/neteq/dsp_helper_unittest.cc
index a771521..fbdc047 100644
--- a/modules/audio_coding/neteq/dsp_helper_unittest.cc
+++ b/modules/audio_coding/neteq/dsp_helper_unittest.cc
@@ -10,8 +10,8 @@
#include "webrtc/modules/audio_coding/neteq/dsp_helper.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc b/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc
index 7aa207b..1da383f 100644
--- a/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc
+++ b/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc
@@ -14,8 +14,8 @@
#include <math.h>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_coding/neteq/expand_unittest.cc b/modules/audio_coding/neteq/expand_unittest.cc
index a697441..55b048f 100644
--- a/modules/audio_coding/neteq/expand_unittest.cc
+++ b/modules/audio_coding/neteq/expand_unittest.cc
@@ -12,7 +12,6 @@
#include "webrtc/modules/audio_coding/neteq/expand.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/safe_conversions.h"
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
#include "webrtc/modules/audio_coding/neteq/background_noise.h"
@@ -20,6 +19,7 @@
#include "webrtc/modules/audio_coding/neteq/statistics_calculator.h"
#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
#include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_coding/neteq/merge_unittest.cc b/modules/audio_coding/neteq/merge_unittest.cc
index b6c62c9..bfabb22 100644
--- a/modules/audio_coding/neteq/merge_unittest.cc
+++ b/modules/audio_coding/neteq/merge_unittest.cc
@@ -14,12 +14,12 @@
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/neteq/background_noise.h"
#include "webrtc/modules/audio_coding/neteq/expand.h"
#include "webrtc/modules/audio_coding/neteq/random_vector.h"
#include "webrtc/modules/audio_coding/neteq/statistics_calculator.h"
#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h b/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
index 1d630e7..dd12f18 100644
--- a/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
+++ b/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
@@ -13,9 +13,9 @@
#include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
-#include "webrtc/test/gmock.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"
+#include "webrtc/test/gmock.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/modules/audio_coding/neteq/nack_tracker_unittest.cc b/modules/audio_coding/neteq/nack_tracker_unittest.cc
index c33a99f..f27b512 100644
--- a/modules/audio_coding/neteq/nack_tracker_unittest.cc
+++ b/modules/audio_coding/neteq/nack_tracker_unittest.cc
@@ -15,9 +15,9 @@
#include <algorithm>
#include <memory>
+#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h"
#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
-#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h"
namespace webrtc {
namespace {
diff --git a/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc b/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc
index 98962be..3f6a80b 100644
--- a/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc
@@ -12,13 +12,13 @@
#include <memory>
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
#include "webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h"
#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
#include "webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h"
#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/test/gmock.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_coding/neteq/neteq_impl_unittest.cc b/modules/audio_coding/neteq/neteq_impl_unittest.cc
index dfb598b..8e5a21d 100644
--- a/modules/audio_coding/neteq/neteq_impl_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_impl_unittest.cc
@@ -13,8 +13,6 @@
#include "webrtc/modules/audio_coding/neteq/include/neteq.h"
#include "webrtc/modules/audio_coding/neteq/neteq_impl.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/safe_conversions.h"
#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
#include "webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h"
@@ -33,6 +31,8 @@
#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
using ::testing::AtLeast;
using ::testing::Return;
diff --git a/modules/audio_coding/neteq/neteq_network_stats_unittest.cc b/modules/audio_coding/neteq/neteq_network_stats_unittest.cc
index 63b2b5b..82269bc 100644
--- a/modules/audio_coding/neteq/neteq_network_stats_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_network_stats_unittest.cc
@@ -10,10 +10,10 @@
#include <memory>
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h"
#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
namespace test {
diff --git a/modules/audio_coding/neteq/neteq_stereo_unittest.cc b/modules/audio_coding/neteq/neteq_stereo_unittest.cc
index 442bf7a..fb2648d 100644
--- a/modules/audio_coding/neteq/neteq_stereo_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_stereo_unittest.cc
@@ -15,13 +15,13 @@
#include <string>
#include <list>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"
#include "webrtc/modules/audio_coding/neteq/include/neteq.h"
#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_coding/neteq/neteq_unittest.cc b/modules/audio_coding/neteq/neteq_unittest.cc
index a5b5468..c227b5b 100644
--- a/modules/audio_coding/neteq/neteq_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_unittest.cc
@@ -21,15 +21,15 @@
#include <vector>
#include "gflags/gflags.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/ignore_wundef.h"
#include "webrtc/base/sha1digest.h"
#include "webrtc/base/stringencode.h"
#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
+#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"
#include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h"
#include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h"
-#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/typedefs.h"
diff --git a/modules/audio_coding/neteq/normal_unittest.cc b/modules/audio_coding/neteq/normal_unittest.cc
index 07ec4f7..1044c4b 100644
--- a/modules/audio_coding/neteq/normal_unittest.cc
+++ b/modules/audio_coding/neteq/normal_unittest.cc
@@ -15,7 +15,6 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
#include "webrtc/modules/audio_coding/neteq/background_noise.h"
@@ -25,6 +24,7 @@
#include "webrtc/modules/audio_coding/neteq/random_vector.h"
#include "webrtc/modules/audio_coding/neteq/statistics_calculator.h"
#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
+#include "webrtc/test/gtest.h"
using ::testing::_;
using ::testing::Invoke;
diff --git a/modules/audio_coding/neteq/packet_buffer_unittest.cc b/modules/audio_coding/neteq/packet_buffer_unittest.cc
index 2069dbb..86c91a4 100644
--- a/modules/audio_coding/neteq/packet_buffer_unittest.cc
+++ b/modules/audio_coding/neteq/packet_buffer_unittest.cc
@@ -12,12 +12,12 @@
#include "webrtc/modules/audio_coding/neteq/packet_buffer.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h"
#include "webrtc/modules/audio_coding/neteq/packet.h"
#include "webrtc/modules/audio_coding/neteq/tick_timer.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
using ::testing::Return;
using ::testing::_;
diff --git a/modules/audio_coding/neteq/red_payload_splitter_unittest.cc b/modules/audio_coding/neteq/red_payload_splitter_unittest.cc
index 7528e2b..57ae3f6 100644
--- a/modules/audio_coding/neteq/red_payload_splitter_unittest.cc
+++ b/modules/audio_coding/neteq/red_payload_splitter_unittest.cc
@@ -17,11 +17,11 @@
#include <memory>
#include <utility> // pair
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
#include "webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h"
#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h"
#include "webrtc/modules/audio_coding/neteq/packet.h"
+#include "webrtc/test/gtest.h"
using ::testing::Return;
using ::testing::ReturnNull;
diff --git a/modules/audio_coding/neteq/test/RTPtimeshift.cc b/modules/audio_coding/neteq/test/RTPtimeshift.cc
index e419c5d..3b7a53c 100644
--- a/modules/audio_coding/neteq/test/RTPtimeshift.cc
+++ b/modules/audio_coding/neteq/test/RTPtimeshift.cc
@@ -12,8 +12,8 @@
#include <algorithm>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h"
+#include "webrtc/test/gtest.h"
#define FIRSTLINELEN 40
diff --git a/modules/audio_coding/neteq/test/neteq_performance_unittest.cc b/modules/audio_coding/neteq/test/neteq_performance_unittest.cc
index f9775b5..cd5ce4e 100644
--- a/modules/audio_coding/neteq/test/neteq_performance_unittest.cc
+++ b/modules/audio_coding/neteq/test/neteq_performance_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/perf_test.h"
#include "webrtc/typedefs.h"
diff --git a/modules/audio_coding/neteq/time_stretch_unittest.cc b/modules/audio_coding/neteq/time_stretch_unittest.cc
index 6f84089..8299924 100644
--- a/modules/audio_coding/neteq/time_stretch_unittest.cc
+++ b/modules/audio_coding/neteq/time_stretch_unittest.cc
@@ -16,11 +16,11 @@
#include <map>
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/checks.h"
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
#include "webrtc/modules/audio_coding/neteq/background_noise.h"
#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_coding/neteq/timestamp_scaler_unittest.cc b/modules/audio_coding/neteq/timestamp_scaler_unittest.cc
index ed7a9a2..fc558c4 100644
--- a/modules/audio_coding/neteq/timestamp_scaler_unittest.cc
+++ b/modules/audio_coding/neteq/timestamp_scaler_unittest.cc
@@ -10,11 +10,11 @@
#include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
#include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h"
#include "webrtc/modules/audio_coding/neteq/packet.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
using ::testing::Return;
using ::testing::ReturnNull;
diff --git a/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc b/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc
index 2422f07..123a315 100644
--- a/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc
+++ b/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc
@@ -11,9 +11,9 @@
#include "webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h"
+#include "webrtc/base/format_macros.h"
#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
#include "webrtc/test/gtest.h"
-#include "webrtc/base/format_macros.h"
namespace webrtc {
namespace test {
diff --git a/modules/audio_coding/neteq/tools/neteq_quality_test.h b/modules/audio_coding/neteq/tools/neteq_quality_test.h
index d8bd2ce..0ed7dfb 100644
--- a/modules/audio_coding/neteq/tools/neteq_quality_test.h
+++ b/modules/audio_coding/neteq/tools/neteq_quality_test.h
@@ -14,12 +14,13 @@
#include <fstream>
#include <memory>
#include <gflags/gflags.h>
-#include "webrtc/test/gtest.h"
+
#include "webrtc/modules/audio_coding/neteq/include/neteq.h"
#include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h"
#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
using google::RegisterFlagValidator;
diff --git a/modules/audio_coding/test/APITest.cc b/modules/audio_coding/test/APITest.cc
index 771ca87..717de82 100644
--- a/modules/audio_coding/test/APITest.cc
+++ b/modules/audio_coding/test/APITest.cc
@@ -19,7 +19,6 @@
#include <ostream>
#include <string>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/platform_thread.h"
#include "webrtc/base/timeutils.h"
#include "webrtc/common_types.h"
@@ -28,6 +27,7 @@
#include "webrtc/modules/audio_coding/test/utility.h"
#include "webrtc/system_wrappers/include/event_wrapper.h"
#include "webrtc/system_wrappers/include/trace.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_coding/test/EncodeDecodeTest.cc b/modules/audio_coding/test/EncodeDecodeTest.cc
index 93591f5..2bcae5a 100644
--- a/modules/audio_coding/test/EncodeDecodeTest.cc
+++ b/modules/audio_coding/test/EncodeDecodeTest.cc
@@ -15,12 +15,12 @@
#include <stdio.h>
#include <stdlib.h>
-#include "webrtc/test/gtest.h"
#include "webrtc/common_types.h"
-#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
#include "webrtc/modules/audio_coding/acm2/acm_common_defs.h"
+#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
#include "webrtc/modules/audio_coding/test/utility.h"
#include "webrtc/system_wrappers/include/trace.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_coding/test/PCMFile.cc b/modules/audio_coding/test/PCMFile.cc
index d16071b..5d2d818 100644
--- a/modules/audio_coding/test/PCMFile.cc
+++ b/modules/audio_coding/test/PCMFile.cc
@@ -14,8 +14,8 @@
#include <stdio.h>
#include <string.h>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_coding/test/TestAllCodecs.cc b/modules/audio_coding/test/TestAllCodecs.cc
index 74caaf4..96c359c 100644
--- a/modules/audio_coding/test/TestAllCodecs.cc
+++ b/modules/audio_coding/test/TestAllCodecs.cc
@@ -14,14 +14,13 @@
#include <limits>
#include <string>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/common_types.h"
#include "webrtc/engine_configurations.h"
#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h"
#include "webrtc/modules/audio_coding/test/utility.h"
#include "webrtc/system_wrappers/include/trace.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/typedefs.h"
diff --git a/modules/audio_coding/test/TestStereo.cc b/modules/audio_coding/test/TestStereo.cc
index f0eb477..abc6179 100644
--- a/modules/audio_coding/test/TestStereo.cc
+++ b/modules/audio_coding/test/TestStereo.cc
@@ -14,12 +14,12 @@
#include <string>
-#include "webrtc/test/gtest.h"
#include "webrtc/common_types.h"
#include "webrtc/engine_configurations.h"
#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h"
#include "webrtc/modules/audio_coding/test/utility.h"
#include "webrtc/system_wrappers/include/trace.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_coding/test/Tester.cc b/modules/audio_coding/test/Tester.cc
index f09cae3..481e9ff 100644
--- a/modules/audio_coding/test/Tester.cc
+++ b/modules/audio_coding/test/Tester.cc
@@ -12,19 +12,19 @@
#include <string>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
#include "webrtc/modules/audio_coding/test/APITest.h"
#include "webrtc/modules/audio_coding/test/EncodeDecodeTest.h"
-#include "webrtc/modules/audio_coding/test/iSACTest.h"
-#include "webrtc/modules/audio_coding/test/opus_test.h"
#include "webrtc/modules/audio_coding/test/PacketLossTest.h"
#include "webrtc/modules/audio_coding/test/TestAllCodecs.h"
#include "webrtc/modules/audio_coding/test/TestRedFec.h"
#include "webrtc/modules/audio_coding/test/TestStereo.h"
#include "webrtc/modules/audio_coding/test/TestVADDTX.h"
#include "webrtc/modules/audio_coding/test/TwoWayCommunication.h"
+#include "webrtc/modules/audio_coding/test/iSACTest.h"
+#include "webrtc/modules/audio_coding/test/opus_test.h"
#include "webrtc/system_wrappers/include/trace.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
using webrtc::Trace;
diff --git a/modules/audio_coding/test/TwoWayCommunication.cc b/modules/audio_coding/test/TwoWayCommunication.cc
index bc36a02..9c26a32 100644
--- a/modules/audio_coding/test/TwoWayCommunication.cc
+++ b/modules/audio_coding/test/TwoWayCommunication.cc
@@ -20,13 +20,13 @@
#include <Windows.h>
#endif
-#include "webrtc/test/gtest.h"
-#include "webrtc/engine_configurations.h"
#include "webrtc/common_types.h"
+#include "webrtc/engine_configurations.h"
#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
#include "webrtc/modules/audio_coding/test/PCMFile.h"
#include "webrtc/modules/audio_coding/test/utility.h"
#include "webrtc/system_wrappers/include/trace.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_coding/test/delay_test.cc b/modules/audio_coding/test/delay_test.cc
index 5ab98d3..4f9ed53 100644
--- a/modules/audio_coding/test/delay_test.cc
+++ b/modules/audio_coding/test/delay_test.cc
@@ -15,16 +15,16 @@
#include <memory>
#include "gflags/gflags.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/common_types.h"
#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/audio_coding/acm2/acm_common_defs.h"
#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h"
-#include "webrtc/modules/audio_coding/acm2/acm_common_defs.h"
#include "webrtc/modules/audio_coding/test/Channel.h"
#include "webrtc/modules/audio_coding/test/PCMFile.h"
#include "webrtc/modules/audio_coding/test/utility.h"
#include "webrtc/system_wrappers/include/event_wrapper.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
DEFINE_string(codec, "isac", "Codec Name");
diff --git a/modules/audio_coding/test/insert_packet_with_timing.cc b/modules/audio_coding/test/insert_packet_with_timing.cc
index 98ce06a..ca0a240 100644
--- a/modules/audio_coding/test/insert_packet_with_timing.cc
+++ b/modules/audio_coding/test/insert_packet_with_timing.cc
@@ -13,13 +13,13 @@
#include <memory>
#include "gflags/gflags.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
#include "webrtc/modules/audio_coding/test/Channel.h"
#include "webrtc/modules/audio_coding/test/PCMFile.h"
#include "webrtc/modules/include/module_common_types.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
// Codec.
diff --git a/modules/audio_coding/test/opus_test.cc b/modules/audio_coding/test/opus_test.cc
index ba2a9df..d3f7b7a 100644
--- a/modules/audio_coding/test/opus_test.cc
+++ b/modules/audio_coding/test/opus_test.cc
@@ -14,7 +14,6 @@
#include <string>
-#include "webrtc/test/gtest.h"
#include "webrtc/common_types.h"
#include "webrtc/engine_configurations.h"
#include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h"
@@ -22,6 +21,7 @@
#include "webrtc/modules/audio_coding/test/TestStereo.h"
#include "webrtc/modules/audio_coding/test/utility.h"
#include "webrtc/system_wrappers/include/trace.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_coding/test/target_delay_unittest.cc b/modules/audio_coding/test/target_delay_unittest.cc
index 6b0f2af..2939453 100644
--- a/modules/audio_coding/test/target_delay_unittest.cc
+++ b/modules/audio_coding/test/target_delay_unittest.cc
@@ -10,13 +10,13 @@
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"
#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
#include "webrtc/modules/audio_coding/test/utility.h"
#include "webrtc/modules/include/module_common_types.h"
#include "webrtc/system_wrappers/include/sleep.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_coding/test/utility.cc b/modules/audio_coding/test/utility.cc
index 3a0afa1..5c1fc3f 100644
--- a/modules/audio_coding/test/utility.cc
+++ b/modules/audio_coding/test/utility.cc
@@ -15,10 +15,10 @@
#include <stdlib.h>
#include <string.h>
-#include "webrtc/test/gtest.h"
#include "webrtc/common_types.h"
-#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
#include "webrtc/modules/audio_coding/acm2/acm_common_defs.h"
+#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
+#include "webrtc/test/gtest.h"
#define NUM_CODECS_WITH_FIXED_PAYLOAD_TYPE 13
diff --git a/modules/audio_coding/test/utility.h b/modules/audio_coding/test/utility.h
index fe85933..1a3e06d 100644
--- a/modules/audio_coding/test/utility.h
+++ b/modules/audio_coding/test/utility.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_UTILITY_H_
#define WEBRTC_MODULES_AUDIO_CODING_TEST_UTILITY_H_
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc b/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc
index 2acbfbf..218b8be 100644
--- a/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc
+++ b/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc
@@ -10,9 +10,9 @@
#include <memory>
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h"
#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/modules/audio_device/android/audio_device_unittest.cc b/modules/audio_device/android/audio_device_unittest.cc
index cfbe96f..56fb209 100644
--- a/modules/audio_device/android/audio_device_unittest.cc
+++ b/modules/audio_device/android/audio_device_unittest.cc
@@ -16,8 +16,6 @@
#include <string>
#include <vector>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/arraysize.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/format_macros.h"
@@ -31,6 +29,8 @@
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/system_wrappers/include/event_wrapper.h"
#include "webrtc/system_wrappers/include/sleep.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
using std::cout;
diff --git a/modules/audio_device/android/audio_manager_unittest.cc b/modules/audio_device/android/audio_manager_unittest.cc
index bf81f7f..76ee305 100644
--- a/modules/audio_device/android/audio_manager_unittest.cc
+++ b/modules/audio_device/android/audio_manager_unittest.cc
@@ -10,12 +10,12 @@
#include <SLES/OpenSLES_Android.h>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/arraysize.h"
#include "webrtc/base/format_macros.h"
-#include "webrtc/modules/audio_device/android/build_info.h"
#include "webrtc/modules/audio_device/android/audio_manager.h"
+#include "webrtc/modules/audio_device/android/build_info.h"
#include "webrtc/modules/audio_device/android/ensure_initialized.h"
+#include "webrtc/test/gtest.h"
#define PRINT(...) fprintf(stderr, __VA_ARGS__);
diff --git a/modules/audio_device/fine_audio_buffer_unittest.cc b/modules/audio_device/fine_audio_buffer_unittest.cc
index a0dfb97..18b2035 100644
--- a/modules/audio_device/fine_audio_buffer_unittest.cc
+++ b/modules/audio_device/fine_audio_buffer_unittest.cc
@@ -13,9 +13,9 @@
#include <limits.h>
#include <memory>
+#include "webrtc/modules/audio_device/mock_audio_device_buffer.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
-#include "webrtc/modules/audio_device/mock_audio_device_buffer.h"
using ::testing::_;
using ::testing::AtLeast;
diff --git a/modules/audio_device/include/mock_audio_device.h b/modules/audio_device/include/mock_audio_device.h
index 00c95a8..2c44c65 100644
--- a/modules/audio_device/include/mock_audio_device.h
+++ b/modules/audio_device/include/mock_audio_device.h
@@ -12,8 +12,9 @@
#define WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_MOCK_AUDIO_DEVICE_H_
#include <string>
-#include "webrtc/test/gmock.h"
+
#include "webrtc/modules/audio_device/include/audio_device.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
namespace test {
diff --git a/modules/audio_device/ios/audio_device_unittest_ios.cc b/modules/audio_device/ios/audio_device_unittest_ios.cc
index 56dbdc5..d1a3979 100644
--- a/modules/audio_device/ios/audio_device_unittest_ios.cc
+++ b/modules/audio_device/ios/audio_device_unittest_ios.cc
@@ -16,8 +16,6 @@
#include <string>
#include <vector>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/arraysize.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/format_macros.h"
@@ -29,6 +27,8 @@
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/system_wrappers/include/event_wrapper.h"
#include "webrtc/system_wrappers/include/sleep.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
using std::cout;
diff --git a/modules/audio_device/mock_audio_device_buffer.h b/modules/audio_device/mock_audio_device_buffer.h
index 8d09655..bfef605 100644
--- a/modules/audio_device/mock_audio_device_buffer.h
+++ b/modules/audio_device/mock_audio_device_buffer.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_DEVICE_MOCK_AUDIO_DEVICE_BUFFER_H_
#define WEBRTC_MODULES_AUDIO_DEVICE_MOCK_AUDIO_DEVICE_BUFFER_H_
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/audio_device/audio_device_buffer.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/modules/audio_mixer/test/audio_mixer_unittest.cc b/modules/audio_mixer/test/audio_mixer_unittest.cc
index ed10685..9bf1b8b 100644
--- a/modules/audio_mixer/test/audio_mixer_unittest.cc
+++ b/modules/audio_mixer/test/audio_mixer_unittest.cc
@@ -13,11 +13,11 @@
#include <memory>
#include <utility>
-#include "webrtc/test/gmock.h"
#include "webrtc/base/bind.h"
#include "webrtc/base/thread.h"
-#include "webrtc/modules/audio_mixer/audio_mixer_defines.h"
#include "webrtc/modules/audio_mixer/audio_mixer.h"
+#include "webrtc/modules/audio_mixer/audio_mixer_defines.h"
+#include "webrtc/test/gmock.h"
using testing::_;
using testing::Exactly;
diff --git a/modules/audio_processing/aec/echo_cancellation_unittest.cc b/modules/audio_processing/aec/echo_cancellation_unittest.cc
index 58fff81..20b63d6 100644
--- a/modules/audio_processing/aec/echo_cancellation_unittest.cc
+++ b/modules/audio_processing/aec/echo_cancellation_unittest.cc
@@ -15,9 +15,9 @@
#include <stdlib.h>
#include <time.h>
+#include "webrtc/base/checks.h"
#include "webrtc/modules/audio_processing/aec/aec_core.h"
#include "webrtc/test/gtest.h"
-#include "webrtc/base/checks.h"
namespace webrtc {
diff --git a/modules/audio_processing/aec/system_delay_unittest.cc b/modules/audio_processing/aec/system_delay_unittest.cc
index d29642e..141d608 100644
--- a/modules/audio_processing/aec/system_delay_unittest.cc
+++ b/modules/audio_processing/aec/system_delay_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_processing/aec/aec_core.h"
#include "webrtc/modules/audio_processing/aec/echo_cancellation.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
namespace webrtc {
namespace {
diff --git a/modules/audio_processing/agc/agc_manager_direct_unittest.cc b/modules/audio_processing/agc/agc_manager_direct_unittest.cc
index 397f38c..d19d190 100644
--- a/modules/audio_processing/agc/agc_manager_direct_unittest.cc
+++ b/modules/audio_processing/agc/agc_manager_direct_unittest.cc
@@ -10,12 +10,12 @@
#include "webrtc/modules/audio_processing/agc/agc_manager_direct.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/audio_processing/agc/mock_agc.h"
#include "webrtc/modules/audio_processing/include/mock_audio_processing.h"
#include "webrtc/system_wrappers/include/trace.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/trace_to_stderr.h"
using ::testing::_;
diff --git a/modules/audio_processing/agc/loudness_histogram_unittest.cc b/modules/audio_processing/agc/loudness_histogram_unittest.cc
index 5c0b4ca..089c05a 100644
--- a/modules/audio_processing/agc/loudness_histogram_unittest.cc
+++ b/modules/audio_processing/agc/loudness_histogram_unittest.cc
@@ -17,9 +17,9 @@
#include <cmath>
#include <memory>
+#include "webrtc/modules/audio_processing/agc/utility.h"
#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
-#include "webrtc/modules/audio_processing/agc/utility.h"
namespace webrtc {
diff --git a/modules/audio_processing/agc/mock_agc.h b/modules/audio_processing/agc/mock_agc.h
index 4a837e5..3b9c22f 100644
--- a/modules/audio_processing/agc/mock_agc.h
+++ b/modules/audio_processing/agc/mock_agc.h
@@ -13,8 +13,8 @@
#include "webrtc/modules/audio_processing/agc/agc.h"
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/modules/audio_processing/audio_buffer_unittest.cc b/modules/audio_processing/audio_buffer_unittest.cc
index 38855d6..c89770c 100644
--- a/modules/audio_processing/audio_buffer_unittest.cc
+++ b/modules/audio_processing/audio_buffer_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_processing/audio_buffer.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_processing/audio_processing_impl_locking_unittest.cc b/modules/audio_processing/audio_processing_impl_locking_unittest.cc
index c55537d..2807355 100644
--- a/modules/audio_processing/audio_processing_impl_locking_unittest.cc
+++ b/modules/audio_processing/audio_processing_impl_locking_unittest.cc
@@ -14,7 +14,6 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/array_view.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/event.h"
@@ -24,6 +23,7 @@
#include "webrtc/modules/audio_processing/test/test_utils.h"
#include "webrtc/modules/include/module_common_types.h"
#include "webrtc/system_wrappers/include/sleep.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_processing/audio_processing_impl_unittest.cc b/modules/audio_processing/audio_processing_impl_unittest.cc
index 9f5b515..a68da2f 100644
--- a/modules/audio_processing/audio_processing_impl_unittest.cc
+++ b/modules/audio_processing/audio_processing_impl_unittest.cc
@@ -10,11 +10,11 @@
#include "webrtc/modules/audio_processing/audio_processing_impl.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/config.h"
#include "webrtc/modules/audio_processing/test/test_utils.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
using ::testing::Invoke;
using ::testing::Return;
diff --git a/modules/audio_processing/audio_processing_performance_unittest.cc b/modules/audio_processing/audio_processing_performance_unittest.cc
index 0048180..bb88c8b 100644
--- a/modules/audio_processing/audio_processing_performance_unittest.cc
+++ b/modules/audio_processing/audio_processing_performance_unittest.cc
@@ -15,7 +15,6 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/array_view.h"
#include "webrtc/base/atomicops.h"
#include "webrtc/base/platform_thread.h"
@@ -27,6 +26,7 @@
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/system_wrappers/include/event_wrapper.h"
#include "webrtc/system_wrappers/include/sleep.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/perf_test.h"
// Check to verify that the define for the intelligibility enhancer is properly
diff --git a/modules/audio_processing/beamformer/complex_matrix_unittest.cc b/modules/audio_processing/beamformer/complex_matrix_unittest.cc
index 9ad790f..100d2e6 100644
--- a/modules/audio_processing/beamformer/complex_matrix_unittest.cc
+++ b/modules/audio_processing/beamformer/complex_matrix_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_processing/beamformer/complex_matrix.h"
#include "webrtc/modules/audio_processing/beamformer/matrix_test_helpers.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc b/modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc
index b754e20..1dd65c1 100644
--- a/modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc
+++ b/modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc
@@ -14,8 +14,8 @@
#include <cmath>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_processing/beamformer/matrix_test_helpers.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_processing/beamformer/matrix_test_helpers.h b/modules/audio_processing/beamformer/matrix_test_helpers.h
index 2ec412f..57bd82e 100644
--- a/modules/audio_processing/beamformer/matrix_test_helpers.h
+++ b/modules/audio_processing/beamformer/matrix_test_helpers.h
@@ -11,9 +11,9 @@
#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_MATRIX_TEST_HELPERS_H_
#define WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_MATRIX_TEST_HELPERS_H_
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_processing/beamformer/complex_matrix.h"
#include "webrtc/modules/audio_processing/beamformer/matrix.h"
+#include "webrtc/test/gtest.h"
namespace {
const float kTolerance = 0.001f;
diff --git a/modules/audio_processing/beamformer/matrix_unittest.cc b/modules/audio_processing/beamformer/matrix_unittest.cc
index 66adb0e..939404c 100644
--- a/modules/audio_processing/beamformer/matrix_unittest.cc
+++ b/modules/audio_processing/beamformer/matrix_unittest.cc
@@ -10,9 +10,9 @@
#include <complex>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_processing/beamformer/matrix.h"
#include "webrtc/modules/audio_processing/beamformer/matrix_test_helpers.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h b/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h
index b0be4ac..7493dcb 100644
--- a/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h
+++ b/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h
@@ -13,8 +13,8 @@
#include <vector>
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc b/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc
index ee211f2..7983d71 100644
--- a/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc
+++ b/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc
@@ -15,11 +15,11 @@
#include <math.h>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/array_view.h"
#include "webrtc/modules/audio_processing/audio_buffer.h"
#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h"
#include "webrtc/modules/audio_processing/test/bitexactness_tools.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc b/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc
index cc6af2e..3fb43d8 100644
--- a/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc
+++ b/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc
@@ -9,12 +9,12 @@
*/
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/array_view.h"
#include "webrtc/modules/audio_processing/audio_buffer.h"
#include "webrtc/modules/audio_processing/echo_cancellation_impl.h"
#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h"
#include "webrtc/modules/audio_processing/test/bitexactness_tools.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/modules/audio_processing/echo_cancellation_impl_unittest.cc b/modules/audio_processing/echo_cancellation_impl_unittest.cc
index ceb27e5..0aa1cf3 100644
--- a/modules/audio_processing/echo_cancellation_impl_unittest.cc
+++ b/modules/audio_processing/echo_cancellation_impl_unittest.cc
@@ -10,9 +10,9 @@
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_processing/aec/aec_core.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_processing/echo_control_mobile_unittest.cc b/modules/audio_processing/echo_control_mobile_unittest.cc
index 4293814..3c747d0 100644
--- a/modules/audio_processing/echo_control_mobile_unittest.cc
+++ b/modules/audio_processing/echo_control_mobile_unittest.cc
@@ -9,12 +9,12 @@
*/
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/array_view.h"
#include "webrtc/modules/audio_processing/audio_buffer.h"
#include "webrtc/modules/audio_processing/echo_control_mobile_impl.h"
#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h"
#include "webrtc/modules/audio_processing/test/bitexactness_tools.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/modules/audio_processing/gain_control_unittest.cc b/modules/audio_processing/gain_control_unittest.cc
index 413a7b6..0f9ed08 100644
--- a/modules/audio_processing/gain_control_unittest.cc
+++ b/modules/audio_processing/gain_control_unittest.cc
@@ -9,12 +9,12 @@
*/
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/array_view.h"
#include "webrtc/modules/audio_processing/audio_buffer.h"
#include "webrtc/modules/audio_processing/gain_control_impl.h"
#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h"
#include "webrtc/modules/audio_processing/test/bitexactness_tools.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/modules/audio_processing/high_pass_filter_unittest.cc b/modules/audio_processing/high_pass_filter_unittest.cc
index db746f6..932b5c3 100644
--- a/modules/audio_processing/high_pass_filter_unittest.cc
+++ b/modules/audio_processing/high_pass_filter_unittest.cc
@@ -9,12 +9,12 @@
*/
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/array_view.h"
#include "webrtc/modules/audio_processing/audio_buffer.h"
#include "webrtc/modules/audio_processing/high_pass_filter_impl.h"
#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h"
#include "webrtc/modules/audio_processing/test/bitexactness_tools.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc b/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc
index bccfd09..0f9467c 100644
--- a/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc
+++ b/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc
@@ -15,7 +15,6 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/array_view.h"
#include "webrtc/base/arraysize.h"
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
@@ -24,6 +23,7 @@
#include "webrtc/modules/audio_processing/noise_suppression_impl.h"
#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h"
#include "webrtc/modules/audio_processing/test/bitexactness_tools.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc b/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc
index a9d3d31..b7c212d 100644
--- a/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc
+++ b/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc
@@ -12,9 +12,9 @@
#include <complex>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/arraysize.h"
#include "webrtc/modules/audio_processing/intelligibility/intelligibility_utils.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_processing/intelligibility/test/intelligibility_proc.cc b/modules/audio_processing/intelligibility/test/intelligibility_proc.cc
index bf3dba9..ddcf167 100644
--- a/modules/audio_processing/intelligibility/test/intelligibility_proc.cc
+++ b/modules/audio_processing/intelligibility/test/intelligibility_proc.cc
@@ -9,7 +9,6 @@
*/
#include "gflags/gflags.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/common_audio/channel_buffer.h"
#include "webrtc/common_audio/include/audio_util.h"
@@ -17,6 +16,7 @@
#include "webrtc/modules/audio_processing/audio_buffer.h"
#include "webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h"
#include "webrtc/modules/audio_processing/noise_suppression_impl.h"
+#include "webrtc/test/gtest.h"
using std::complex;
diff --git a/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc b/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc
index bfd719b..69ef28d 100644
--- a/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc
+++ b/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc
@@ -11,7 +11,6 @@
#include <numeric>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/array_view.h"
#include "webrtc/base/random.h"
#include "webrtc/modules/audio_processing/audio_buffer.h"
@@ -20,6 +19,7 @@
#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h"
#include "webrtc/modules/audio_processing/test/bitexactness_tools.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/perf_test.h"
namespace webrtc {
diff --git a/modules/audio_processing/level_controller/level_controller_unittest.cc b/modules/audio_processing/level_controller/level_controller_unittest.cc
index dc07e49..ed842b6 100644
--- a/modules/audio_processing/level_controller/level_controller_unittest.cc
+++ b/modules/audio_processing/level_controller/level_controller_unittest.cc
@@ -10,13 +10,13 @@
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/array_view.h"
#include "webrtc/modules/audio_processing/audio_buffer.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
#include "webrtc/modules/audio_processing/level_controller/level_controller.h"
#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h"
#include "webrtc/modules/audio_processing/test/bitexactness_tools.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/modules/audio_processing/level_estimator_unittest.cc b/modules/audio_processing/level_estimator_unittest.cc
index ce7064d..2675e0a 100644
--- a/modules/audio_processing/level_estimator_unittest.cc
+++ b/modules/audio_processing/level_estimator_unittest.cc
@@ -9,12 +9,12 @@
*/
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/array_view.h"
#include "webrtc/modules/audio_processing/audio_buffer.h"
#include "webrtc/modules/audio_processing/level_estimator_impl.h"
#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h"
#include "webrtc/modules/audio_processing/test/bitexactness_tools.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/modules/audio_processing/noise_suppression_unittest.cc b/modules/audio_processing/noise_suppression_unittest.cc
index 4763614..78c3cc5 100644
--- a/modules/audio_processing/noise_suppression_unittest.cc
+++ b/modules/audio_processing/noise_suppression_unittest.cc
@@ -9,12 +9,12 @@
*/
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/array_view.h"
#include "webrtc/modules/audio_processing/audio_buffer.h"
#include "webrtc/modules/audio_processing/noise_suppression_impl.h"
#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h"
#include "webrtc/modules/audio_processing/test/bitexactness_tools.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/modules/audio_processing/splitting_filter_unittest.cc b/modules/audio_processing/splitting_filter_unittest.cc
index 96a6408..ce07031 100644
--- a/modules/audio_processing/splitting_filter_unittest.cc
+++ b/modules/audio_processing/splitting_filter_unittest.cc
@@ -13,9 +13,9 @@
#include <cmath>
-#include "webrtc/test/gtest.h"
#include "webrtc/common_audio/channel_buffer.h"
#include "webrtc/modules/audio_processing/splitting_filter.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/modules/audio_processing/test/debug_dump_test.cc b/modules/audio_processing/test/debug_dump_test.cc
index b8d4b43..b4e0ee7 100644
--- a/modules/audio_processing/test/debug_dump_test.cc
+++ b/modules/audio_processing/test/debug_dump_test.cc
@@ -14,10 +14,10 @@
#include <string>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h"
#include "webrtc/modules/audio_processing/test/debug_dump_replayer.h"
#include "webrtc/modules/audio_processing/test/test_utils.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
diff --git a/modules/audio_processing/transient/file_utils_unittest.cc b/modules/audio_processing/transient/file_utils_unittest.cc
index c975934..2909ac3 100644
--- a/modules/audio_processing/transient/file_utils_unittest.cc
+++ b/modules/audio_processing/transient/file_utils_unittest.cc
@@ -15,8 +15,8 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/system_wrappers/include/file_wrapper.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/typedefs.h"
diff --git a/modules/audio_processing/transient/transient_detector_unittest.cc b/modules/audio_processing/transient/transient_detector_unittest.cc
index dcf1e34..7f9b74e 100644
--- a/modules/audio_processing/transient/transient_detector_unittest.cc
+++ b/modules/audio_processing/transient/transient_detector_unittest.cc
@@ -14,10 +14,10 @@
#include <sstream>
#include <string>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_processing/transient/common.h"
#include "webrtc/modules/audio_processing/transient/file_utils.h"
#include "webrtc/system_wrappers/include/file_wrapper.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/typedefs.h"
diff --git a/modules/audio_processing/transient/transient_suppression_test.cc b/modules/audio_processing/transient/transient_suppression_test.cc
index 447b3d4..2158a81 100644
--- a/modules/audio_processing/transient/transient_suppression_test.cc
+++ b/modules/audio_processing/transient/transient_suppression_test.cc
@@ -17,10 +17,10 @@
#include <string>
#include "gflags/gflags.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/common_audio/include/audio_util.h"
#include "webrtc/modules/audio_processing/agc/agc.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/typedefs.h"
diff --git a/modules/audio_processing/transient/transient_suppressor_unittest.cc b/modules/audio_processing/transient/transient_suppressor_unittest.cc
index 1e67124..ff01055 100644
--- a/modules/audio_processing/transient/transient_suppressor_unittest.cc
+++ b/modules/audio_processing/transient/transient_suppressor_unittest.cc
@@ -10,8 +10,8 @@
#include "webrtc/modules/audio_processing/transient/transient_suppressor.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_processing/transient/common.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_processing/transient/wpd_tree_unittest.cc b/modules/audio_processing/transient/wpd_tree_unittest.cc
index 61a67e5..983d05d 100644
--- a/modules/audio_processing/transient/wpd_tree_unittest.cc
+++ b/modules/audio_processing/transient/wpd_tree_unittest.cc
@@ -14,10 +14,10 @@
#include <sstream>
#include <string>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h"
#include "webrtc/modules/audio_processing/transient/file_utils.h"
#include "webrtc/system_wrappers/include/file_wrapper.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_processing/utility/block_mean_calculator_unittest.cc b/modules/audio_processing/utility/block_mean_calculator_unittest.cc
index 91146a6..22e8f49 100644
--- a/modules/audio_processing/utility/block_mean_calculator_unittest.cc
+++ b/modules/audio_processing/utility/block_mean_calculator_unittest.cc
@@ -8,9 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
-
#include "webrtc/modules/audio_processing/utility/block_mean_calculator.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_processing/utility/delay_estimator_unittest.cc b/modules/audio_processing/utility/delay_estimator_unittest.cc
index a7d363a..f054b9c 100644
--- a/modules/audio_processing/utility/delay_estimator_unittest.cc
+++ b/modules/audio_processing/utility/delay_estimator_unittest.cc
@@ -8,11 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
-
#include "webrtc/modules/audio_processing/utility/delay_estimator.h"
#include "webrtc/modules/audio_processing/utility/delay_estimator_internal.h"
#include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
namespace {
diff --git a/modules/audio_processing/vad/gmm_unittest.cc b/modules/audio_processing/vad/gmm_unittest.cc
index 5444cbc..46785af 100644
--- a/modules/audio_processing/vad/gmm_unittest.cc
+++ b/modules/audio_processing/vad/gmm_unittest.cc
@@ -12,9 +12,9 @@
#include <math.h>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_processing/vad/noise_gmm_tables.h"
#include "webrtc/modules/audio_processing/vad/voice_gmm_tables.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_processing/vad/pole_zero_filter_unittest.cc b/modules/audio_processing/vad/pole_zero_filter_unittest.cc
index 4bb8308..71e7213 100644
--- a/modules/audio_processing/vad/pole_zero_filter_unittest.cc
+++ b/modules/audio_processing/vad/pole_zero_filter_unittest.cc
@@ -15,8 +15,8 @@
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_processing/vad/vad_audio_proc_internal.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_processing/vad/standalone_vad_unittest.cc b/modules/audio_processing/vad/standalone_vad_unittest.cc
index c920415..5ed39b8 100644
--- a/modules/audio_processing/vad/standalone_vad_unittest.cc
+++ b/modules/audio_processing/vad/standalone_vad_unittest.cc
@@ -14,8 +14,8 @@
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_processing/vad/vad_audio_proc_unittest.cc b/modules/audio_processing/vad/vad_audio_proc_unittest.cc
index 1de1b73..65b516a 100644
--- a/modules/audio_processing/vad/vad_audio_proc_unittest.cc
+++ b/modules/audio_processing/vad/vad_audio_proc_unittest.cc
@@ -19,9 +19,9 @@
#include <string>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_processing/vad/common.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_processing/voice_detection_unittest.cc b/modules/audio_processing/voice_detection_unittest.cc
index 171c1d6..7dee44d 100644
--- a/modules/audio_processing/voice_detection_unittest.cc
+++ b/modules/audio_processing/voice_detection_unittest.cc
@@ -9,12 +9,12 @@
*/
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/array_view.h"
#include "webrtc/modules/audio_processing/audio_buffer.h"
-#include "webrtc/modules/audio_processing/voice_detection_impl.h"
#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h"
#include "webrtc/modules/audio_processing/test/bitexactness_tools.h"
+#include "webrtc/modules/audio_processing/voice_detection_impl.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/modules/bitrate_controller/bitrate_controller_unittest.cc b/modules/bitrate_controller/bitrate_controller_unittest.cc
index 4b298cc..6f269a4 100644
--- a/modules/bitrate_controller/bitrate_controller_unittest.cc
+++ b/modules/bitrate_controller/bitrate_controller_unittest.cc
@@ -11,13 +11,12 @@
#include <algorithm>
#include <vector>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/call/mock/mock_rtc_event_log.h"
#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
#include "webrtc/modules/pacing/mock/mock_paced_sender.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/test/field_trial.h"
+#include "webrtc/test/gtest.h"
using ::testing::Exactly;
using ::testing::Return;
diff --git a/modules/bitrate_controller/include/mock/mock_bitrate_controller.h b/modules/bitrate_controller/include/mock/mock_bitrate_controller.h
index ee545f5..d4a12ec 100644
--- a/modules/bitrate_controller/include/mock/mock_bitrate_controller.h
+++ b/modules/bitrate_controller/include/mock/mock_bitrate_controller.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_MODULES_BITRATE_CONTROLLER_INCLUDE_MOCK_MOCK_BITRATE_CONTROLLER_H_
#define WEBRTC_MODULES_BITRATE_CONTROLLER_INCLUDE_MOCK_MOCK_BITRATE_CONTROLLER_H_
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
namespace test {
diff --git a/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc b/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc
index 7368a48..da618c7 100644
--- a/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc
+++ b/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc
@@ -11,9 +11,9 @@
#include <algorithm>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/call/mock/mock_rtc_event_log.h"
#include "webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/congestion_controller/congestion_controller_unittest.cc b/modules/congestion_controller/congestion_controller_unittest.cc
index 8d1005d..e840294 100644
--- a/modules/congestion_controller/congestion_controller_unittest.cc
+++ b/modules/congestion_controller/congestion_controller_unittest.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/call/mock/mock_rtc_event_log.h"
-#include "webrtc/modules/pacing/mock/mock_paced_sender.h"
#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
#include "webrtc/modules/congestion_controller/include/congestion_controller.h"
#include "webrtc/modules/congestion_controller/include/mock/mock_congestion_controller.h"
+#include "webrtc/modules/pacing/mock/mock_paced_sender.h"
#include "webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
using testing::_;
using testing::AtLeast;
diff --git a/modules/congestion_controller/delay_based_bwe_unittest_helper.h b/modules/congestion_controller/delay_based_bwe_unittest_helper.h
index add9fb3..55aa650 100644
--- a/modules/congestion_controller/delay_based_bwe_unittest_helper.h
+++ b/modules/congestion_controller/delay_based_bwe_unittest_helper.h
@@ -17,11 +17,11 @@
#include <utility>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/congestion_controller/delay_based_bwe.h"
#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace test {
diff --git a/modules/congestion_controller/include/mock/mock_congestion_controller.h b/modules/congestion_controller/include/mock/mock_congestion_controller.h
index 143efd4..128d64e 100644
--- a/modules/congestion_controller/include/mock/mock_congestion_controller.h
+++ b/modules/congestion_controller/include/mock/mock_congestion_controller.h
@@ -11,10 +11,10 @@
#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_CONGESTION_CONTROLLER_H_
#define WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_CONGESTION_CONTROLLER_H_
-#include "webrtc/test/gmock.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/socket.h"
#include "webrtc/modules/congestion_controller/include/congestion_controller.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
namespace test {
diff --git a/modules/congestion_controller/probe_bitrate_estimator_unittest.cc b/modules/congestion_controller/probe_bitrate_estimator_unittest.cc
index cd12b58..0a2f7b0 100644
--- a/modules/congestion_controller/probe_bitrate_estimator_unittest.cc
+++ b/modules/congestion_controller/probe_bitrate_estimator_unittest.cc
@@ -13,9 +13,9 @@
#include <vector>
#include <utility>
+#include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
-#include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h"
namespace webrtc {
diff --git a/modules/congestion_controller/probe_controller_unittest.cc b/modules/congestion_controller/probe_controller_unittest.cc
index a57cad0..fec059d 100644
--- a/modules/congestion_controller/probe_controller_unittest.cc
+++ b/modules/congestion_controller/probe_controller_unittest.cc
@@ -9,12 +9,12 @@
*/
#include <memory>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/logging.h"
#include "webrtc/modules/congestion_controller/probe_controller.h"
#include "webrtc/modules/pacing/mock/mock_paced_sender.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
using testing::_;
using testing::AtLeast;
diff --git a/modules/congestion_controller/transport_feedback_adapter_unittest.cc b/modules/congestion_controller/transport_feedback_adapter_unittest.cc
index 0c77fe9..2c94c71 100644
--- a/modules/congestion_controller/transport_feedback_adapter_unittest.cc
+++ b/modules/congestion_controller/transport_feedback_adapter_unittest.cc
@@ -12,15 +12,14 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-
#include "webrtc/base/checks.h"
#include "webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h"
#include "webrtc/modules/congestion_controller/transport_feedback_adapter.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
using ::testing::_;
using ::testing::Invoke;
diff --git a/modules/desktop_capture/differ_block_unittest.cc b/modules/desktop_capture/differ_block_unittest.cc
index e981cc1..cfee667 100644
--- a/modules/desktop_capture/differ_block_unittest.cc
+++ b/modules/desktop_capture/differ_block_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/desktop_capture/differ_block.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/modules/desktop_capture/screen_capturer_differ_wrapper_unittest.cc b/modules/desktop_capture/screen_capturer_differ_wrapper_unittest.cc
index 0aad0e0..f04d809 100644
--- a/modules/desktop_capture/screen_capturer_differ_wrapper_unittest.cc
+++ b/modules/desktop_capture/screen_capturer_differ_wrapper_unittest.cc
@@ -15,7 +15,6 @@
#include <utility>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/random.h"
#include "webrtc/base/timeutils.h"
#include "webrtc/modules/desktop_capture/desktop_geometry.h"
@@ -24,6 +23,7 @@
#include "webrtc/modules/desktop_capture/fake_screen_capturer.h"
#include "webrtc/modules/desktop_capture/screen_capturer_mock_objects.h"
#include "webrtc/system_wrappers/include/cpu_features_wrapper.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/modules/desktop_capture/screen_capturer_mac_unittest.cc b/modules/desktop_capture/screen_capturer_mac_unittest.cc
index 7b83a83..003f4db 100644
--- a/modules/desktop_capture/screen_capturer_mac_unittest.cc
+++ b/modules/desktop_capture/screen_capturer_mac_unittest.cc
@@ -15,13 +15,13 @@
#include <memory>
#include <ostream>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/desktop_capture/desktop_capture_options.h"
#include "webrtc/modules/desktop_capture/desktop_frame.h"
#include "webrtc/modules/desktop_capture/desktop_geometry.h"
#include "webrtc/modules/desktop_capture/desktop_region.h"
#include "webrtc/modules/desktop_capture/mac/desktop_configuration.h"
#include "webrtc/modules/desktop_capture/screen_capturer_mock_objects.h"
+#include "webrtc/test/gtest.h"
using ::testing::_;
using ::testing::AnyNumber;
diff --git a/modules/desktop_capture/screen_capturer_mock_objects.h b/modules/desktop_capture/screen_capturer_mock_objects.h
index 82944a7..f08dab5 100644
--- a/modules/desktop_capture/screen_capturer_mock_objects.h
+++ b/modules/desktop_capture/screen_capturer_mock_objects.h
@@ -11,9 +11,9 @@
#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURER_MOCK_OBJECTS_H_
#define WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURER_MOCK_OBJECTS_H_
-#include "webrtc/test/gmock.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/desktop_capture/screen_capturer.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/modules/desktop_capture/screen_drawer_unittest.cc b/modules/desktop_capture/screen_drawer_unittest.cc
index 499c690..2821af0 100644
--- a/modules/desktop_capture/screen_drawer_unittest.cc
+++ b/modules/desktop_capture/screen_drawer_unittest.cc
@@ -12,11 +12,11 @@
#include <stdint.h>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/random.h"
#include "webrtc/base/timeutils.h"
#include "webrtc/system_wrappers/include/logging.h"
#include "webrtc/system_wrappers/include/sleep.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/desktop_capture/win/cursor_unittest.cc b/modules/desktop_capture/win/cursor_unittest.cc
index 21ea303..e37fd98 100644
--- a/modules/desktop_capture/win/cursor_unittest.cc
+++ b/modules/desktop_capture/win/cursor_unittest.cc
@@ -10,13 +10,13 @@
#include <memory>
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/desktop_capture/desktop_frame.h"
#include "webrtc/modules/desktop_capture/desktop_geometry.h"
#include "webrtc/modules/desktop_capture/mouse_cursor.h"
#include "webrtc/modules/desktop_capture/win/cursor.h"
#include "webrtc/modules/desktop_capture/win/cursor_unittest_resources.h"
#include "webrtc/modules/desktop_capture/win/scoped_gdi_object.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/modules/media_file/media_file_unittest.cc b/modules/media_file/media_file_unittest.cc
index 3fa0afc..cbea836 100644
--- a/modules/media_file/media_file_unittest.cc
+++ b/modules/media_file/media_file_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/media_file/media_file.h"
#include "webrtc/system_wrappers/include/sleep.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
class MediaFileTest : public testing::Test {
diff --git a/modules/pacing/bitrate_prober_unittest.cc b/modules/pacing/bitrate_prober_unittest.cc
index e0318df..c55ac68 100644
--- a/modules/pacing/bitrate_prober_unittest.cc
+++ b/modules/pacing/bitrate_prober_unittest.cc
@@ -10,8 +10,8 @@
#include <limits>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/pacing/bitrate_prober.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/pacing/mock/mock_paced_sender.h b/modules/pacing/mock/mock_paced_sender.h
index 15f5f0a..b83032c 100644
--- a/modules/pacing/mock/mock_paced_sender.h
+++ b/modules/pacing/mock/mock_paced_sender.h
@@ -13,10 +13,9 @@
#include <vector>
-#include "webrtc/test/gmock.h"
-
#include "webrtc/modules/pacing/paced_sender.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/modules/pacing/paced_sender_unittest.cc b/modules/pacing/paced_sender_unittest.cc
index 4d859c7..a0bb92f 100644
--- a/modules/pacing/paced_sender_unittest.cc
+++ b/modules/pacing/paced_sender_unittest.cc
@@ -11,10 +11,10 @@
#include <list>
#include <memory>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/pacing/paced_sender.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
using testing::_;
using testing::Return;
diff --git a/modules/pacing/packet_router_unittest.cc b/modules/pacing/packet_router_unittest.cc
index bfd644d..456e1de 100644
--- a/modules/pacing/packet_router_unittest.cc
+++ b/modules/pacing/packet_router_unittest.cc
@@ -12,12 +12,12 @@
#include <memory>
#include "webrtc/base/checks.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/pacing/packet_router.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
#include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
using ::testing::_;
using ::testing::AnyNumber;
diff --git a/modules/remote_bitrate_estimator/bwe_simulations.cc b/modules/remote_bitrate_estimator/bwe_simulations.cc
index b0621ef..a3f2894 100644
--- a/modules/remote_bitrate_estimator/bwe_simulations.cc
+++ b/modules/remote_bitrate_estimator/bwe_simulations.cc
@@ -10,12 +10,12 @@
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test.h"
#include "webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h"
#include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
diff --git a/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h b/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h
index b65d424..b8cc8ef 100644
--- a/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h
+++ b/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h
@@ -13,8 +13,8 @@
#include <vector>
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h b/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h
index 8820396..c3fb6ac 100644
--- a/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h
+++ b/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h
@@ -13,8 +13,8 @@
#include <vector>
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/modules/remote_bitrate_estimator/inter_arrival_unittest.cc b/modules/remote_bitrate_estimator/inter_arrival_unittest.cc
index 5ee72d2..1076419 100644
--- a/modules/remote_bitrate_estimator/inter_arrival_unittest.cc
+++ b/modules/remote_bitrate_estimator/inter_arrival_unittest.cc
@@ -10,10 +10,9 @@
#include <memory>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/common_types.h"
#include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace testing {
diff --git a/modules/remote_bitrate_estimator/overuse_detector_unittest.cc b/modules/remote_bitrate_estimator/overuse_detector_unittest.cc
index cfcf2d6..576e253 100644
--- a/modules/remote_bitrate_estimator/overuse_detector_unittest.cc
+++ b/modules/remote_bitrate_estimator/overuse_detector_unittest.cc
@@ -15,8 +15,6 @@
#include <cstdlib>
#include <memory>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/base/random.h"
#include "webrtc/base/rate_statistics.h"
#include "webrtc/common_types.h"
@@ -24,6 +22,7 @@
#include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h"
#include "webrtc/modules/remote_bitrate_estimator/overuse_estimator.h"
#include "webrtc/test/field_trial.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace testing {
diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h b/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h
index 5a3a524..460a3a9 100644
--- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h
+++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h
@@ -17,10 +17,10 @@
#include <utility>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace testing {
diff --git a/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc b/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc
index 7b831db..9821568 100644
--- a/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc
+++ b/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc
@@ -8,13 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-
#include "webrtc/modules/pacing/packet_router.h"
#include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
using ::testing::_;
using ::testing::InSequence;
diff --git a/modules/remote_bitrate_estimator/send_time_history_unittest.cc b/modules/remote_bitrate_estimator/send_time_history_unittest.cc
index 96e6d27..843f36e 100644
--- a/modules/remote_bitrate_estimator/send_time_history_unittest.cc
+++ b/modules/remote_bitrate_estimator/send_time_history_unittest.cc
@@ -12,10 +12,10 @@
#include <limits>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace test {
diff --git a/modules/remote_bitrate_estimator/test/bwe_test.h b/modules/remote_bitrate_estimator/test/bwe_test.h
index b11ea1a..963b606 100644
--- a/modules/remote_bitrate_estimator/test/bwe_test.h
+++ b/modules/remote_bitrate_estimator/test/bwe_test.h
@@ -14,11 +14,12 @@
#include <map>
#include <string>
#include <vector>
-#include "webrtc/test/gtest.h"
+
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
#include "webrtc/modules/remote_bitrate_estimator/test/bwe.h"
#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc b/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
index a06838a..bd41a13 100644
--- a/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
+++ b/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
@@ -12,10 +12,10 @@
#include <numeric>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/remote_bitrate_estimator/test/packet.h"
#include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/remote_bitrate_estimator/test/bwe_unittest.cc b/modules/remote_bitrate_estimator/test/bwe_unittest.cc
index c2c87f9..f9255cc 100644
--- a/modules/remote_bitrate_estimator/test/bwe_unittest.cc
+++ b/modules/remote_bitrate_estimator/test/bwe_unittest.cc
@@ -12,8 +12,8 @@
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/arraysize.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace testing {
diff --git a/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc b/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
index 78196df..ad87cb3 100644
--- a/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
+++ b/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
@@ -16,11 +16,11 @@
#include "webrtc/base/arraysize.h"
#include "webrtc/base/common.h"
+#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"
#include "webrtc/modules/remote_bitrate_estimator/test/packet.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/remote_bitrate_estimator/test/estimators/remb.cc b/modules/remote_bitrate_estimator/test/estimators/remb.cc
index f5a9eaf..1917789 100644
--- a/modules/remote_bitrate_estimator/test/estimators/remb.cc
+++ b/modules/remote_bitrate_estimator/test/estimators/remb.cc
@@ -12,12 +12,12 @@
#include "webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/common.h"
#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
#include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h"
#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace testing {
diff --git a/modules/remote_bitrate_estimator/test/estimators/tcp.cc b/modules/remote_bitrate_estimator/test/estimators/tcp.cc
index e7d3a10..300ef2d 100644
--- a/modules/remote_bitrate_estimator/test/estimators/tcp.cc
+++ b/modules/remote_bitrate_estimator/test/estimators/tcp.cc
@@ -12,11 +12,11 @@
#include "webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/common.h"
#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace testing {
diff --git a/modules/remote_bitrate_estimator/test/packet_receiver.cc b/modules/remote_bitrate_estimator/test/packet_receiver.cc
index d0be605..2f5dcee 100644
--- a/modules/remote_bitrate_estimator/test/packet_receiver.cc
+++ b/modules/remote_bitrate_estimator/test/packet_receiver.cc
@@ -12,13 +12,13 @@
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/common.h"
#include "webrtc/modules/include/module_common_types.h"
#include "webrtc/modules/remote_bitrate_estimator/test/bwe.h"
#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"
#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace testing {
diff --git a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
index 01f5d82..25d78c0 100644
--- a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
+++ b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
@@ -15,12 +15,11 @@
#include <utility>
#include <vector>
-#include "webrtc/test/gmock.h"
-
#include "webrtc/modules/include/module.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/byte_io_unittest.cc b/modules/rtp_rtcp/source/byte_io_unittest.cc
index 6d3327f..addf334 100644
--- a/modules/rtp_rtcp/source/byte_io_unittest.cc
+++ b/modules/rtp_rtcp/source/byte_io_unittest.cc
@@ -10,8 +10,8 @@
#include <limits>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/modules/rtp_rtcp/source/fec_receiver_unittest.cc b/modules/rtp_rtcp/source/fec_receiver_unittest.cc
index fe0abdc..516306c 100644
--- a/modules/rtp_rtcp/source/fec_receiver_unittest.cc
+++ b/modules/rtp_rtcp/source/fec_receiver_unittest.cc
@@ -13,14 +13,14 @@
#include <list>
#include <memory>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/rtp_rtcp/include/fec_receiver.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
#include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
#include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h"
#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h b/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h
index e5e9f46..458f5a8 100644
--- a/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h
+++ b/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_MOCK_MOCK_RTP_PAYLOAD_STRATEGY_H_
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_MOCK_MOCK_RTP_PAYLOAD_STRATEGY_H_
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/nack_rtx_unittest.cc b/modules/rtp_rtcp/source/nack_rtx_unittest.cc
index 85de611..2a0fce5 100644
--- a/modules/rtp_rtcp/source/nack_rtx_unittest.cc
+++ b/modules/rtp_rtcp/source/nack_rtx_unittest.cc
@@ -14,7 +14,6 @@
#include <memory>
#include <set>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/rate_limiter.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
@@ -23,6 +22,7 @@
#include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/transport.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc b/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc
index 6e7ea03..b82f46b 100644
--- a/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc
+++ b/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/rtp_rtcp/source/packet_loss_stats.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc b/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc
index 0d38f3f..b4a0189 100644
--- a/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc
+++ b/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc
@@ -10,8 +10,8 @@
#include "webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/logging.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/producer_fec_unittest.cc b/modules/rtp_rtcp/source/producer_fec_unittest.cc
index 023a24c..14d80eb 100644
--- a/modules/rtp_rtcp/source/producer_fec_unittest.cc
+++ b/modules/rtp_rtcp/source/producer_fec_unittest.cc
@@ -12,11 +12,11 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
#include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h"
#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
#include "webrtc/modules/rtp_rtcp/source/producer_fec.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/receive_statistics_unittest.cc b/modules/rtp_rtcp/source/receive_statistics_unittest.cc
index c3d7757..97f6fa3 100644
--- a/modules/rtp_rtcp/source/receive_statistics_unittest.cc
+++ b/modules/rtp_rtcp/source/receive_statistics_unittest.cc
@@ -10,10 +10,10 @@
#include <memory>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc b/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc
index 0103547..f976183 100644
--- a/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc
+++ b/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
using ::testing::_;
using ::testing::DoAll;
diff --git a/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc
index b42ec0c..4c1c238 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc
@@ -10,12 +10,12 @@
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/rtcp_packet_parser.h"
using webrtc::rtcp::Bye;
diff --git a/modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc
index bf5756d..161974d 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc
@@ -10,9 +10,8 @@
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h"
-#include "webrtc/test/gtest.h"
-
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
+#include "webrtc/test/gtest.h"
using webrtc::rtcp::Dlrr;
using webrtc::rtcp::ReceiveTimeInfo;
diff --git a/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc
index 53b81cf..3c5025c 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc
@@ -10,9 +10,9 @@
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h"
+#include "webrtc/base/random.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
-#include "webrtc/base/random.h"
#include "webrtc/test/rtcp_packet_parser.h"
using testing::ElementsAre;
diff --git a/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc
index 6f32482..8aba81b 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc
@@ -12,7 +12,6 @@
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
-
#include "webrtc/test/rtcp_packet_parser.h"
using testing::ElementsAreArray;
diff --git a/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc
index ab6254b..b6a0ab7 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc
@@ -12,8 +12,8 @@
#include <limits>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/random.h"
+#include "webrtc/test/gtest.h"
using webrtc::rtcp::ReportBlock;
diff --git a/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc
index d69b53f..c757650 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc
@@ -12,7 +12,6 @@
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
-
#include "webrtc/test/rtcp_packet_parser.h"
using testing::ElementsAreArray;
diff --git a/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc
index db23c71..1d42ad1 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc
@@ -13,9 +13,8 @@
#include <limits>
#include <memory>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
+#include "webrtc/test/gtest.h"
using webrtc::rtcp::TransportFeedback;
diff --git a/modules/rtp_rtcp/source/rtcp_packet_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
index 7a5a191..f9544b3 100644
--- a/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
@@ -8,11 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
using webrtc::rtcp::ReceiverReport;
using webrtc::rtcp::ReportBlock;
diff --git a/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc b/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
index dd1dc50..99bb7c7 100644
--- a/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
@@ -10,8 +10,6 @@
#include <memory>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/array_view.h"
#include "webrtc/base/random.h"
#include "webrtc/common_types.h"
@@ -37,6 +35,8 @@
#include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h"
#include "webrtc/modules/rtp_rtcp/source/time_util.h"
#include "webrtc/system_wrappers/include/ntp_time.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/modules/rtp_rtcp/source/rtcp_sender_unittest.cc b/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
index a6ad770..d348d3a 100644
--- a/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
@@ -10,14 +10,13 @@
#include <memory>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-
#include "webrtc/base/rate_limiter.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/mock_transport.h"
#include "webrtc/test/rtcp_packet_parser.h"
diff --git a/modules/rtp_rtcp/source/rtcp_utility_unittest.cc b/modules/rtp_rtcp/source/rtcp_utility_unittest.cc
index 9223912..b433107 100644
--- a/modules/rtp_rtcp/source/rtcp_utility_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_utility_unittest.cc
@@ -8,11 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
-
#include "webrtc/base/checks.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/rtp_fec_unittest.cc b/modules/rtp_rtcp/source/rtp_fec_unittest.cc
index fd00dc7..c70f2cf 100644
--- a/modules/rtp_rtcp/source/rtp_fec_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_fec_unittest.cc
@@ -12,13 +12,13 @@
#include <list>
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/basictypes.h"
#include "webrtc/base/random.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
#include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h"
#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
#include "webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc b/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
index a5650f6..81ff499 100644
--- a/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
@@ -11,13 +11,13 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
+#include "webrtc/common_video/h264/h264_common.h"
#include "webrtc/modules/include/module_common_types.h"
#include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
-#include "webrtc/common_video/h264/h264_common.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_format.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc b/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc
index ccaf826..ce39095 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc
@@ -10,10 +10,10 @@
#include <memory>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
#define CHECK_ARRAY_SIZE(expected_size, array) \
diff --git a/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc b/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
index 6a9fe8b..2848ea0 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
@@ -11,9 +11,9 @@
#include <memory>
#include <vector>
+#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/rtp_header_extension_unittest.cc b/modules/rtp_rtcp/source/rtp_header_extension_unittest.cc
index a8c7664..9ced70d 100644
--- a/modules/rtp_rtcp/source/rtp_header_extension_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_header_extension_unittest.cc
@@ -8,10 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
-
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc b/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc
index ab9b949..2a7caf1 100644
--- a/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc
@@ -12,10 +12,10 @@
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/rtp_packet_unittest.cc b/modules/rtp_rtcp/source/rtp_packet_unittest.cc
index 2991aee..a1f57ac 100644
--- a/modules/rtp_rtcp/source/rtp_packet_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_packet_unittest.cc
@@ -10,11 +10,11 @@
#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h"
+#include "webrtc/base/random.h"
+#include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h"
+#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
-#include "webrtc/base/random.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h"
using testing::ElementsAreArray;
using testing::make_tuple;
diff --git a/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc b/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc
index 98d074d..fa2b3a8 100644
--- a/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc
@@ -10,14 +10,13 @@
#include <memory>
-#include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h"
-
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
+#include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
#include "webrtc/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
index 5049721..dc4c73e 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
@@ -12,9 +12,6 @@
#include <memory>
#include <set>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-
#include "webrtc/base/rate_limiter.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
@@ -22,6 +19,8 @@
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/rtcp_packet_parser.h"
using ::testing::_;
diff --git a/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_unittest.cc
index 0afa817..22ad119 100644
--- a/modules/rtp_rtcp/source/rtp_sender_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_unittest.cc
@@ -11,8 +11,6 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/buffer.h"
#include "webrtc/base/rate_limiter.h"
#include "webrtc/call/mock/mock_rtc_event_log.h"
@@ -28,6 +26,8 @@
#include "webrtc/modules/rtp_rtcp/source/rtp_sender_video.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
#include "webrtc/system_wrappers/include/stl_util.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/mock_transport.h"
#include "webrtc/typedefs.h"
diff --git a/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc b/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
index 6edbdb3..a7f3f9a 100644
--- a/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
+++ b/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
@@ -13,7 +13,6 @@
#include <memory>
#include <utility>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/basictypes.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/random.h"
@@ -22,6 +21,7 @@
#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
#include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h"
#include "webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/vp8_partition_aggregator_unittest.cc b/modules/rtp_rtcp/source/vp8_partition_aggregator_unittest.cc
index eb35692..6413d60 100644
--- a/modules/rtp_rtcp/source/vp8_partition_aggregator_unittest.cc
+++ b/modules/rtp_rtcp/source/vp8_partition_aggregator_unittest.cc
@@ -10,8 +10,8 @@
#include <stdlib.h> // NULL
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/test/testAPI/test_api.h b/modules/rtp_rtcp/test/testAPI/test_api.h
index cbc5f17..b0dd405 100644
--- a/modules/rtp_rtcp/test/testAPI/test_api.h
+++ b/modules/rtp_rtcp/test/testAPI/test_api.h
@@ -10,7 +10,6 @@
#ifndef WEBRTC_MODULES_RTP_RTCP_TEST_TESTAPI_TEST_API_H_
#define WEBRTC_MODULES_RTP_RTCP_TEST_TESTAPI_TEST_API_H_
-#include "webrtc/test/gtest.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
@@ -18,6 +17,7 @@
#include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/transport.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/test/testAPI/test_api_audio.cc b/modules/rtp_rtcp/test/testAPI/test_api_audio.cc
index 7d72478..e2f4cfa 100644
--- a/modules/rtp_rtcp/test/testAPI/test_api_audio.cc
+++ b/modules/rtp_rtcp/test/testAPI/test_api_audio.cc
@@ -11,15 +11,14 @@
#include <algorithm>
#include <memory>
#include <vector>
-#include "webrtc/test/gtest.h"
-
-#include "webrtc/modules/rtp_rtcp/test/testAPI/test_api.h"
#include "webrtc/base/rate_limiter.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h"
+#include "webrtc/modules/rtp_rtcp/test/testAPI/test_api.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc b/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc
index cea85dd..ee0707a 100644
--- a/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc
+++ b/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc
@@ -12,8 +12,6 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/rate_limiter.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
@@ -21,6 +19,8 @@
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h"
#include "webrtc/modules/rtp_rtcp/test/testAPI/test_api.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/modules/rtp_rtcp/test/testAPI/test_api_video.cc b/modules/rtp_rtcp/test/testAPI/test_api_video.cc
index 80ec4ce..39d2726 100644
--- a/modules/rtp_rtcp/test/testAPI/test_api_video.cc
+++ b/modules/rtp_rtcp/test/testAPI/test_api_video.cc
@@ -14,7 +14,6 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/rate_limiter.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h"
@@ -23,6 +22,7 @@
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h"
#include "webrtc/modules/rtp_rtcp/test/testAPI/test_api.h"
+#include "webrtc/test/gtest.h"
namespace {
diff --git a/modules/rtp_rtcp/test/testFec/test_fec.cc b/modules/rtp_rtcp/test/testFec/test_fec.cc
index 971ccc5..4aaae98 100644
--- a/modules/rtp_rtcp/test/testFec/test_fec.cc
+++ b/modules/rtp_rtcp/test/testFec/test_fec.cc
@@ -18,11 +18,11 @@
#include <list>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/random.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
#include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
// #define VERBOSE_OUTPUT
diff --git a/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc b/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc
index edbe15f..7188e22 100644
--- a/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc
+++ b/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc
@@ -47,9 +47,9 @@
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h"
#include "webrtc/modules/rtp_rtcp/test/testFec/average_residual_loss_xor_codes.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/utility/source/audio_frame_operations_unittest.cc b/modules/utility/source/audio_frame_operations_unittest.cc
index 67ee798..5842b90 100644
--- a/modules/utility/source/audio_frame_operations_unittest.cc
+++ b/modules/utility/source/audio_frame_operations_unittest.cc
@@ -8,11 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
-
+#include "webrtc/base/checks.h"
#include "webrtc/modules/include/module_common_types.h"
#include "webrtc/modules/utility/include/audio_frame_operations.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/modules/utility/source/file_player_unittests.cc b/modules/utility/source/file_player_unittests.cc
index 8adbdd3..cc7865d 100644
--- a/modules/utility/source/file_player_unittests.cc
+++ b/modules/utility/source/file_player_unittests.cc
@@ -18,9 +18,9 @@
#include <string>
#include "gflags/gflags.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/md5digest.h"
#include "webrtc/base/stringencode.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
DEFINE_bool(file_player_output, false, "Generate reference files.");
diff --git a/modules/utility/source/process_thread_impl_unittest.cc b/modules/utility/source/process_thread_impl_unittest.cc
index 567ed4b..8f25b11 100644
--- a/modules/utility/source/process_thread_impl_unittest.cc
+++ b/modules/utility/source/process_thread_impl_unittest.cc
@@ -11,12 +11,12 @@
#include <memory>
#include <utility>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/task_queue.h"
#include "webrtc/base/timeutils.h"
#include "webrtc/modules/include/module.h"
#include "webrtc/modules/utility/source/process_thread_impl.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/video_capture/test/video_capture_unittest.cc b/modules/video_capture/test/video_capture_unittest.cc
index 4cc06cf..0090006 100644
--- a/modules/video_capture/test/video_capture_unittest.cc
+++ b/modules/video_capture/test/video_capture_unittest.cc
@@ -14,7 +14,6 @@
#include <memory>
#include <sstream>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/base/timeutils.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
@@ -24,6 +23,7 @@
#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
#include "webrtc/system_wrappers/include/sleep.h"
#include "webrtc/test/frame_utils.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/video_frame.h"
using webrtc::CriticalSectionWrapper;
diff --git a/modules/video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc b/modules/video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc
index 44a963e..1c6bd27 100644
--- a/modules/video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc
+++ b/modules/video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc
@@ -11,10 +11,9 @@
#include <memory>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/base/arraysize.h"
#include "webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_nalu.h"
+#include "webrtc/test/gtest.h"
#if defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)
diff --git a/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h b/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h
index c40993d..e58da79 100644
--- a/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h
+++ b/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h
@@ -16,8 +16,8 @@
#include <string>
#include <vector>
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/test/gmock.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/modules/video_coding/codecs/test/packet_manipulator_unittest.cc b/modules/video_coding/codecs/test/packet_manipulator_unittest.cc
index 3b9b17e..69598e2 100644
--- a/modules/video_coding/codecs/test/packet_manipulator_unittest.cc
+++ b/modules/video_coding/codecs/test/packet_manipulator_unittest.cc
@@ -12,9 +12,9 @@
#include <queue>
-#include "webrtc/test/gtest.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
#include "webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h"
+#include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/unittest_utils.h"
#include "webrtc/typedefs.h"
diff --git a/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
index 3d54d5d..5ca9e55 100644
--- a/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
+++ b/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
@@ -10,16 +10,15 @@
#include <math.h>
-#include "webrtc/test/gtest.h"
-
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
#include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h"
#include "webrtc/modules/video_coding/codecs/test/videoprocessor.h"
-#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h"
#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
+#include "webrtc/modules/video_coding/include/video_codec_interface.h"
#include "webrtc/modules/video_coding/include/video_coding.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/testsupport/frame_reader.h"
#include "webrtc/test/testsupport/frame_writer.h"
diff --git a/modules/video_coding/codecs/test/videoprocessor_unittest.cc b/modules/video_coding/codecs/test/videoprocessor_unittest.cc
index 92445d6..9d6e576 100644
--- a/modules/video_coding/codecs/test/videoprocessor_unittest.cc
+++ b/modules/video_coding/codecs/test/videoprocessor_unittest.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h"
#include "webrtc/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h"
#include "webrtc/modules/video_coding/codecs/test/videoprocessor.h"
+#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h"
#include "webrtc/modules/video_coding/include/video_coding.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/mock/mock_frame_reader.h"
#include "webrtc/test/testsupport/mock/mock_frame_writer.h"
#include "webrtc/test/testsupport/packet_reader.h"
diff --git a/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc b/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc
index 2290fe3..1e36c44 100644
--- a/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc
+++ b/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc
@@ -8,12 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h"
-
-#include "vpx/vpx_encoder.h"
#include "vpx/vp8cx.h"
+#include "vpx/vpx_encoder.h"
+#include "webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h"
+#include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/codecs/vp8/reference_picture_selection_unittest.cc b/modules/video_coding/codecs/vp8/reference_picture_selection_unittest.cc
index 082634f..fcae60e 100644
--- a/modules/video_coding/codecs/vp8/reference_picture_selection_unittest.cc
+++ b/modules/video_coding/codecs/vp8/reference_picture_selection_unittest.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
-#include "vpx/vpx_encoder.h"
#include "vpx/vp8cx.h"
+#include "vpx/vpx_encoder.h"
#include "webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.h"
+#include "webrtc/test/gtest.h"
using webrtc::ReferencePictureSelection;
diff --git a/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc b/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
index b6ffcba..e6316d6 100644
--- a/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
+++ b/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
@@ -11,15 +11,15 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gtest.h"
-#include "vpx/vpx_encoder.h"
#include "vpx/vp8cx.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "vpx/vpx_encoder.h"
#include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h"
+#include "webrtc/modules/video_coding/include/video_codec_interface.h"
#include "webrtc/modules/video_coding/utility/mock/mock_frame_dropper.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/system_wrappers/include/metrics.h"
#include "webrtc/system_wrappers/include/metrics_default.h"
+#include "webrtc/test/gtest.h"
using ::testing::_;
using ::testing::NiceMock;
diff --git a/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc b/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc
index 1fa06f6..0ccbb54 100644
--- a/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc
+++ b/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc
@@ -11,10 +11,10 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gmock.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
#include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h"
#include "webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h"
+#include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
namespace testing {
diff --git a/modules/video_coding/codecs/vp8/simulcast_unittest.h b/modules/video_coding/codecs/vp8/simulcast_unittest.h
index cc14819..e2d5bb8 100644
--- a/modules/video_coding/codecs/vp8/simulcast_unittest.h
+++ b/modules/video_coding/codecs/vp8/simulcast_unittest.h
@@ -15,12 +15,12 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/checks.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
+#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/video_frame.h"
using ::testing::_;
diff --git a/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc b/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
index 40203a4..5616c92 100644
--- a/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
+++ b/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
@@ -12,12 +12,12 @@
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/timeutils.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
#include "webrtc/test/frame_utils.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc b/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc
index 8eb091e..006ff65 100644
--- a/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc
+++ b/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc
@@ -10,12 +10,12 @@
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/timeutils.h"
#include "webrtc/common_video/include/video_image.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/testsupport/metrics/video_metrics.h"
#include "webrtc/tools/simple_command_line_parser.h"
diff --git a/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc b/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc
index 7038a19..eaced9d 100644
--- a/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc
+++ b/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc
@@ -11,12 +11,12 @@
#include <limits>
#include <memory>
-#include "webrtc/test/gtest.h"
#include "vpx/vp8cx.h"
#include "webrtc/base/logging.h"
#include "webrtc/modules/video_coding/codecs/vp9/screenshare_layers.h"
#include "webrtc/modules/video_coding/codecs/vp9/vp9_impl.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/decoding_state_unittest.cc b/modules/video_coding/decoding_state_unittest.cc
index 5d9733c..c147354 100644
--- a/modules/video_coding/decoding_state_unittest.cc
+++ b/modules/video_coding/decoding_state_unittest.cc
@@ -10,12 +10,12 @@
#include <string.h>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/include/module_common_types.h"
#include "webrtc/modules/video_coding/decoding_state.h"
#include "webrtc/modules/video_coding/frame_buffer.h"
#include "webrtc/modules/video_coding/jitter_buffer_common.h"
#include "webrtc/modules/video_coding/packet.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/frame_buffer2_unittest.cc b/modules/video_coding/frame_buffer2_unittest.cc
index 1397aeb..7f8ac67 100644
--- a/modules/video_coding/frame_buffer2_unittest.cc
+++ b/modules/video_coding/frame_buffer2_unittest.cc
@@ -15,8 +15,6 @@
#include <limits>
#include <vector>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/platform_thread.h"
#include "webrtc/base/random.h"
#include "webrtc/modules/video_coding/frame_object.h"
@@ -24,6 +22,8 @@
#include "webrtc/modules/video_coding/sequence_number_util.h"
#include "webrtc/modules/video_coding/timing.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace video_coding {
diff --git a/modules/video_coding/histogram_unittest.cc b/modules/video_coding/histogram_unittest.cc
index c1089ba..953f7db 100644
--- a/modules/video_coding/histogram_unittest.cc
+++ b/modules/video_coding/histogram_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/video_coding/histogram.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace video_coding {
diff --git a/modules/video_coding/include/mock/mock_vcm_callbacks.h b/modules/video_coding/include/mock/mock_vcm_callbacks.h
index 3aefea3..35362b9 100644
--- a/modules/video_coding/include/mock/mock_vcm_callbacks.h
+++ b/modules/video_coding/include/mock/mock_vcm_callbacks.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VCM_CALLBACKS_H_
#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VCM_CALLBACKS_H_
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/video_coding/include/video_coding_defines.h"
+#include "webrtc/test/gmock.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/modules/video_coding/include/mock/mock_video_codec_interface.h b/modules/video_coding/include/mock/mock_video_codec_interface.h
index c6665d7..ce02497 100644
--- a/modules/video_coding/include/mock/mock_video_codec_interface.h
+++ b/modules/video_coding/include/mock/mock_video_codec_interface.h
@@ -14,8 +14,8 @@
#include <string>
#include <vector>
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/test/gmock.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/modules/video_coding/jitter_buffer_unittest.cc b/modules/video_coding/jitter_buffer_unittest.cc
index c7108c1..f2e5f10 100644
--- a/modules/video_coding/jitter_buffer_unittest.cc
+++ b/modules/video_coding/jitter_buffer_unittest.cc
@@ -13,8 +13,6 @@
#include <list>
#include <memory>
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/video_coding/frame_buffer.h"
#include "webrtc/modules/video_coding/jitter_buffer.h"
#include "webrtc/modules/video_coding/media_opt_util.h"
@@ -26,6 +24,8 @@
#include "webrtc/system_wrappers/include/metrics.h"
#include "webrtc/system_wrappers/include/metrics_default.h"
#include "webrtc/test/field_trial.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/jitter_estimator_tests.cc b/modules/video_coding/jitter_estimator_tests.cc
index 1a9afbf..e2fd9f7 100644
--- a/modules/video_coding/jitter_estimator_tests.cc
+++ b/modules/video_coding/jitter_estimator_tests.cc
@@ -9,8 +9,8 @@
#include "webrtc/modules/video_coding/jitter_estimator.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/nack_module_unittest.cc b/modules/video_coding/nack_module_unittest.cc
index b11a4ad..fb7d095 100644
--- a/modules/video_coding/nack_module_unittest.cc
+++ b/modules/video_coding/nack_module_unittest.cc
@@ -11,10 +11,10 @@
#include <cstring>
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/video_coding/include/video_coding_defines.h"
#include "webrtc/modules/video_coding/nack_module.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
class TestNackModule : public ::testing::Test,
diff --git a/modules/video_coding/percentile_filter_unittest.cc b/modules/video_coding/percentile_filter_unittest.cc
index 1e1fa96..56cd99b 100644
--- a/modules/video_coding/percentile_filter_unittest.cc
+++ b/modules/video_coding/percentile_filter_unittest.cc
@@ -10,9 +10,9 @@
#include <algorithm>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/video_coding/percentile_filter.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/protection_bitrate_calculator_unittest.cc b/modules/video_coding/protection_bitrate_calculator_unittest.cc
index b442bba..718929c 100644
--- a/modules/video_coding/protection_bitrate_calculator_unittest.cc
+++ b/modules/video_coding/protection_bitrate_calculator_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/video_coding/protection_bitrate_calculator.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/receiver_unittest.cc b/modules/video_coding/receiver_unittest.cc
index 86ce036..1fdbefd 100644
--- a/modules/video_coding/receiver_unittest.cc
+++ b/modules/video_coding/receiver_unittest.cc
@@ -14,16 +14,16 @@
#include <queue>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/checks.h"
#include "webrtc/modules/video_coding/encoded_frame.h"
#include "webrtc/modules/video_coding/packet.h"
#include "webrtc/modules/video_coding/receiver.h"
#include "webrtc/modules/video_coding/test/stream_generator.h"
-#include "webrtc/modules/video_coding/timing.h"
#include "webrtc/modules/video_coding/test/test_util.h"
+#include "webrtc/modules/video_coding/timing.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/rtp_frame_reference_finder_unittest.cc b/modules/video_coding/rtp_frame_reference_finder_unittest.cc
index 606295f..5fcb442 100644
--- a/modules/video_coding/rtp_frame_reference_finder_unittest.cc
+++ b/modules/video_coding/rtp_frame_reference_finder_unittest.cc
@@ -14,12 +14,12 @@
#include <set>
#include <utility>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/random.h"
#include "webrtc/base/refcount.h"
#include "webrtc/modules/video_coding/frame_object.h"
#include "webrtc/modules/video_coding/packet_buffer.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace video_coding {
diff --git a/modules/video_coding/sequence_number_util_unittest.cc b/modules/video_coding/sequence_number_util_unittest.cc
index 4174335..1ed78b9 100644
--- a/modules/video_coding/sequence_number_util_unittest.cc
+++ b/modules/video_coding/sequence_number_util_unittest.cc
@@ -10,8 +10,8 @@
#include <set>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/video_coding/sequence_number_util.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
class TestSeqNumUtil : public ::testing::Test {
diff --git a/modules/video_coding/session_info_unittest.cc b/modules/video_coding/session_info_unittest.cc
index 25d359a..2cefc06 100644
--- a/modules/video_coding/session_info_unittest.cc
+++ b/modules/video_coding/session_info_unittest.cc
@@ -10,10 +10,10 @@
#include <string.h>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/include/module_common_types.h"
#include "webrtc/modules/video_coding/packet.h"
#include "webrtc/modules/video_coding/session_info.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/test/stream_generator.cc b/modules/video_coding/test/stream_generator.cc
index b9bd51a..a33ec9a 100644
--- a/modules/video_coding/test/stream_generator.cc
+++ b/modules/video_coding/test/stream_generator.cc
@@ -14,10 +14,10 @@
#include <list>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/video_coding/packet.h"
#include "webrtc/modules/video_coding/test/test_util.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/timing_unittest.cc b/modules/video_coding/timing_unittest.cc
index 88fb3d7..3aaa46d 100644
--- a/modules/video_coding/timing_unittest.cc
+++ b/modules/video_coding/timing_unittest.cc
@@ -12,14 +12,13 @@
#include <stdio.h>
#include <stdlib.h>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/modules/video_coding/include/video_coding.h"
#include "webrtc/modules/video_coding/internal_defines.h"
-#include "webrtc/modules/video_coding/timing.h"
#include "webrtc/modules/video_coding/test/test_util.h"
+#include "webrtc/modules/video_coding/timing.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/system_wrappers/include/trace.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/video_coding/utility/frame_dropper_unittest.cc b/modules/video_coding/utility/frame_dropper_unittest.cc
index b5e2f45..eec3d60 100644
--- a/modules/video_coding/utility/frame_dropper_unittest.cc
+++ b/modules/video_coding/utility/frame_dropper_unittest.cc
@@ -10,8 +10,8 @@
#include "webrtc/modules/video_coding/utility/frame_dropper.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/logging.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/utility/ivf_file_writer_unittest.cc b/modules/video_coding/utility/ivf_file_writer_unittest.cc
index e4017d1..cb5c97b 100644
--- a/modules/video_coding/utility/ivf_file_writer_unittest.cc
+++ b/modules/video_coding/utility/ivf_file_writer_unittest.cc
@@ -12,12 +12,12 @@
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/helpers.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/thread.h"
#include "webrtc/base/timeutils.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/video_coding/utility/mock/mock_frame_dropper.h b/modules/video_coding/utility/mock/mock_frame_dropper.h
index d339922..c5521b8 100644
--- a/modules/video_coding/utility/mock/mock_frame_dropper.h
+++ b/modules/video_coding/utility/mock/mock_frame_dropper.h
@@ -12,8 +12,8 @@
#include <string>
-#include "webrtc/test/gmock.h"
#include "webrtc/modules/video_coding/utility/frame_dropper.h"
+#include "webrtc/test/gmock.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/modules/video_coding/video_coding_robustness_unittest.cc b/modules/video_coding/video_coding_robustness_unittest.cc
index fd3b50b..f407ba2 100644
--- a/modules/video_coding/video_coding_robustness_unittest.cc
+++ b/modules/video_coding/video_coding_robustness_unittest.cc
@@ -10,13 +10,13 @@
#include <memory>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h"
#include "webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h"
+#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h"
#include "webrtc/modules/video_coding/include/video_coding.h"
#include "webrtc/modules/video_coding/test/test_util.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/video_packet_buffer_unittest.cc b/modules/video_coding/video_packet_buffer_unittest.cc
index 53b7a57..7905e85 100644
--- a/modules/video_coding/video_packet_buffer_unittest.cc
+++ b/modules/video_coding/video_packet_buffer_unittest.cc
@@ -13,11 +13,11 @@
#include <set>
#include <utility>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/random.h"
#include "webrtc/modules/video_coding/frame_object.h"
#include "webrtc/modules/video_coding/packet_buffer.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace video_coding {
diff --git a/modules/video_coding/video_receiver_unittest.cc b/modules/video_coding/video_receiver_unittest.cc
index f3c1ccc..81f74fb 100644
--- a/modules/video_coding/video_receiver_unittest.cc
+++ b/modules/video_coding/video_receiver_unittest.cc
@@ -11,13 +11,13 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gtest.h"
-#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h"
#include "webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h"
+#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h"
#include "webrtc/modules/video_coding/include/video_coding.h"
-#include "webrtc/modules/video_coding/video_coding_impl.h"
#include "webrtc/modules/video_coding/test/test_util.h"
+#include "webrtc/modules/video_coding/video_coding_impl.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
using ::testing::_;
using ::testing::NiceMock;
diff --git a/modules/video_coding/video_sender_unittest.cc b/modules/video_coding/video_sender_unittest.cc
index b5ffabf..e32cdac 100644
--- a/modules/video_coding/video_sender_unittest.cc
+++ b/modules/video_coding/video_sender_unittest.cc
@@ -11,17 +11,17 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gtest.h"
-#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h"
#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
#include "webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h"
+#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h"
#include "webrtc/modules/video_coding/include/video_coding.h"
-#include "webrtc/modules/video_coding/video_coding_impl.h"
#include "webrtc/modules/video_coding/test/test_util.h"
+#include "webrtc/modules/video_coding/video_coding_impl.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/test/frame_generator.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
using ::testing::_;
diff --git a/modules/video_processing/test/video_processing_unittest.h b/modules/video_processing/test/video_processing_unittest.h
index 92e9138..5a737ac 100644
--- a/modules/video_processing/test/video_processing_unittest.h
+++ b/modules/video_processing/test/video_processing_unittest.h
@@ -13,9 +13,9 @@
#include <string>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/video_processing/include/video_processing.h"
#include "webrtc/system_wrappers/include/trace.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/system_wrappers/source/condition_variable_unittest.cc b/system_wrappers/source/condition_variable_unittest.cc
index ac61b5c..67e473e 100644
--- a/system_wrappers/source/condition_variable_unittest.cc
+++ b/system_wrappers/source/condition_variable_unittest.cc
@@ -13,13 +13,12 @@
// platforms.
#if defined(WEBRTC_WIN)
-#include "webrtc/system_wrappers/source/condition_variable_event_win.h"
-
-#include "webrtc/test/gtest.h"
#include "webrtc/base/platform_thread.h"
#include "webrtc/base/timeutils.h"
#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
#include "webrtc/system_wrappers/include/trace.h"
+#include "webrtc/system_wrappers/source/condition_variable_event_win.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/system_wrappers/source/critical_section_unittest.cc b/system_wrappers/source/critical_section_unittest.cc
index 0e9f8c8..6d73242 100644
--- a/system_wrappers/source/critical_section_unittest.cc
+++ b/system_wrappers/source/critical_section_unittest.cc
@@ -10,10 +10,10 @@
#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/system_wrappers/include/sleep.h"
#include "webrtc/base/platform_thread.h"
+#include "webrtc/system_wrappers/include/sleep.h"
#include "webrtc/system_wrappers/include/trace.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/system_wrappers/source/data_log_unittest.cc b/system_wrappers/source/data_log_unittest.cc
index 8fb01bc..da3cea3 100644
--- a/system_wrappers/source/data_log_unittest.cc
+++ b/system_wrappers/source/data_log_unittest.cc
@@ -13,9 +13,9 @@
#include <map>
#include <string>
-#include "webrtc/test/gtest.h"
#include "webrtc/system_wrappers/include/data_log_c.h"
#include "webrtc/system_wrappers/source/data_log_c_helpers_unittest.h"
+#include "webrtc/test/gtest.h"
using ::webrtc::DataLog;
diff --git a/system_wrappers/source/event_timer_posix_unittest.cc b/system_wrappers/source/event_timer_posix_unittest.cc
index 47ef47e..f5b3de4 100644
--- a/system_wrappers/source/event_timer_posix_unittest.cc
+++ b/system_wrappers/source/event_timer_posix_unittest.cc
@@ -10,9 +10,9 @@
#include "webrtc/system_wrappers/source/event_timer_posix.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/base/event.h"
#include "webrtc/base/criticalsection.h"
+#include "webrtc/base/event.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/system_wrappers/source/logging_unittest.cc b/system_wrappers/source/logging_unittest.cc
index b7318da..6be4da1 100644
--- a/system_wrappers/source/logging_unittest.cc
+++ b/system_wrappers/source/logging_unittest.cc
@@ -10,10 +10,10 @@
#include "webrtc/system_wrappers/include/logging.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/arraysize.h"
#include "webrtc/base/event.h"
#include "webrtc/system_wrappers/include/trace.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/system_wrappers/source/metrics_default_unittest.cc b/system_wrappers/source/metrics_default_unittest.cc
index 4ffb4c2..c2eefe5 100644
--- a/system_wrappers/source/metrics_default_unittest.cc
+++ b/system_wrappers/source/metrics_default_unittest.cc
@@ -8,10 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
-
#include "webrtc/system_wrappers/include/metrics.h"
#include "webrtc/system_wrappers/include/metrics_default.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/system_wrappers/source/metrics_unittest.cc b/system_wrappers/source/metrics_unittest.cc
index 5494224..95f5554 100644
--- a/system_wrappers/source/metrics_unittest.cc
+++ b/system_wrappers/source/metrics_unittest.cc
@@ -8,10 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
-
#include "webrtc/system_wrappers/include/metrics.h"
#include "webrtc/system_wrappers/include/metrics_default.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/system_wrappers/source/ntp_time_unittest.cc b/system_wrappers/source/ntp_time_unittest.cc
index 50943ae..a505789 100644
--- a/system_wrappers/source/ntp_time_unittest.cc
+++ b/system_wrappers/source/ntp_time_unittest.cc
@@ -8,9 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
-
#include "webrtc/system_wrappers/include/ntp_time.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/system_wrappers/source/rtp_to_ntp_unittest.cc b/system_wrappers/source/rtp_to_ntp_unittest.cc
index ce1f26d..5ba3353 100644
--- a/system_wrappers/source/rtp_to_ntp_unittest.cc
+++ b/system_wrappers/source/rtp_to_ntp_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/system_wrappers/include/rtp_to_ntp.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/test/configurable_frame_size_encoder.cc b/test/configurable_frame_size_encoder.cc
index 1453418..9cb0c87 100644
--- a/test/configurable_frame_size_encoder.cc
+++ b/test/configurable_frame_size_encoder.cc
@@ -12,10 +12,9 @@
#include <string.h>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/common_video/include/video_image.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace test {
diff --git a/test/direct_transport.cc b/test/direct_transport.cc
index 28a67a4..18d3ee6 100644
--- a/test/direct_transport.cc
+++ b/test/direct_transport.cc
@@ -9,10 +9,9 @@
*/
#include "webrtc/test/direct_transport.h"
-#include "webrtc/test/gtest.h"
-
#include "webrtc/call.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace test {
diff --git a/test/fake_audio_device.cc b/test/fake_audio_device.cc
index 220755f..9e5e95f 100644
--- a/test/fake_audio_device.cc
+++ b/test/fake_audio_device.cc
@@ -12,12 +12,12 @@
#include <algorithm>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/platform_thread.h"
#include "webrtc/modules/media_file/media_file_utility.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/system_wrappers/include/event_wrapper.h"
#include "webrtc/system_wrappers/include/file_wrapper.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace test {
diff --git a/test/fake_encoder.cc b/test/fake_encoder.cc
index 3a9ae4e..ac1c6de 100644
--- a/test/fake_encoder.cc
+++ b/test/fake_encoder.cc
@@ -12,11 +12,10 @@
#include <algorithm>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/base/checks.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
#include "webrtc/system_wrappers/include/sleep.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace test {
diff --git a/test/fake_network_pipe_unittest.cc b/test/fake_network_pipe_unittest.cc
index fa58bf5..7374bb1 100644
--- a/test/fake_network_pipe_unittest.cc
+++ b/test/fake_network_pipe_unittest.cc
@@ -10,12 +10,11 @@
#include <memory>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-
#include "webrtc/call.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/test/fake_network_pipe.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
using ::testing::_;
using ::testing::AnyNumber;
diff --git a/test/frame_generator_unittest.cc b/test/frame_generator_unittest.cc
index 4b90458..843a4c3 100644
--- a/test/frame_generator_unittest.cc
+++ b/test/frame_generator_unittest.cc
@@ -13,8 +13,8 @@
#include <memory>
#include <string>
-#include "webrtc/test/gtest.h"
#include "webrtc/test/frame_generator.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/test/mock_voe_channel_proxy.h b/test/mock_voe_channel_proxy.h
index 40fee1b..1847cf4 100644
--- a/test/mock_voe_channel_proxy.h
+++ b/test/mock_voe_channel_proxy.h
@@ -12,6 +12,7 @@
#define WEBRTC_TEST_MOCK_VOE_CHANNEL_PROXY_H_
#include <string>
+
#include "webrtc/test/gmock.h"
#include "webrtc/voice_engine/channel_proxy.h"
diff --git a/test/rtp_file_reader_unittest.cc b/test/rtp_file_reader_unittest.cc
index 0a0d676..a9cd098 100644
--- a/test/rtp_file_reader_unittest.cc
+++ b/test/rtp_file_reader_unittest.cc
@@ -11,8 +11,8 @@
#include <map>
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/rtp_file_reader.h"
#include "webrtc/test/testsupport/fileutils.h"
diff --git a/test/rtp_rtcp_observer.h b/test/rtp_rtcp_observer.h
index 72bcdda..63e97be 100644
--- a/test/rtp_rtcp_observer.h
+++ b/test/rtp_rtcp_observer.h
@@ -14,13 +14,12 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/event.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
#include "webrtc/test/constants.h"
#include "webrtc/test/direct_transport.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
#include "webrtc/video_send_stream.h"
diff --git a/test/test_main.cc b/test/test_main.cc
index df7a82f..b75e78c 100644
--- a/test/test_main.cc
+++ b/test/test_main.cc
@@ -9,10 +9,10 @@
*/
#include "gflags/gflags.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/logging.h"
#include "webrtc/system_wrappers/include/metrics_default.h"
#include "webrtc/test/field_trial.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
DEFINE_string(force_fieldtrials, "",
diff --git a/test/test_suite.cc b/test/test_suite.cc
index 174de02..e7adfc8 100644
--- a/test/test_suite.cc
+++ b/test/test_suite.cc
@@ -11,13 +11,13 @@
#include "webrtc/test/test_suite.h"
#include "gflags/gflags.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/logging.h"
#include "webrtc/system_wrappers/include/metrics_default.h"
+#include "webrtc/test/field_trial.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/testsupport/trace_to_stderr.h"
-#include "webrtc/test/field_trial.h"
DEFINE_bool(logs, false, "print logs to stderr");
diff --git a/tools/agc/activity_metric.cc b/tools/agc/activity_metric.cc
index 7eac140..a98730a 100644
--- a/tools/agc/activity_metric.cc
+++ b/tools/agc/activity_metric.cc
@@ -17,15 +17,15 @@
#include <memory>
#include "gflags/gflags.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_processing/agc/agc.h"
#include "webrtc/modules/audio_processing/agc/loudness_histogram.h"
#include "webrtc/modules/audio_processing/agc/utility.h"
-#include "webrtc/modules/audio_processing/vad/vad_audio_proc.h"
#include "webrtc/modules/audio_processing/vad/common.h"
#include "webrtc/modules/audio_processing/vad/pitch_based_vad.h"
#include "webrtc/modules/audio_processing/vad/standalone_vad.h"
+#include "webrtc/modules/audio_processing/vad/vad_audio_proc.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/test/gtest.h"
static const int kAgcAnalWindowSamples = 100;
static const double kDefaultActivityThreshold = 0.3;
diff --git a/tools/frame_editing/frame_editing_unittest.cc b/tools/frame_editing/frame_editing_unittest.cc
index c068296..d61ec00 100644
--- a/tools/frame_editing/frame_editing_unittest.cc
+++ b/tools/frame_editing/frame_editing_unittest.cc
@@ -14,8 +14,8 @@
#include <fstream>
#include <memory>
-#include "webrtc/test/gtest.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/tools/frame_editing/frame_editing_lib.h"
diff --git a/video/call_stats_unittest.cc b/video/call_stats_unittest.cc
index 7f98c91..8a2a89a 100644
--- a/video/call_stats_unittest.cc
+++ b/video/call_stats_unittest.cc
@@ -10,12 +10,11 @@
#include <memory>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/system_wrappers/include/metrics.h"
#include "webrtc/system_wrappers/include/metrics_default.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/video/call_stats.h"
using ::testing::_;
diff --git a/video/encoder_state_feedback_unittest.cc b/video/encoder_state_feedback_unittest.cc
index fb9cf0c..958977a 100644
--- a/video/encoder_state_feedback_unittest.cc
+++ b/video/encoder_state_feedback_unittest.cc
@@ -10,9 +10,9 @@
#include "webrtc/video/encoder_state_feedback.h"
+#include "webrtc/modules/utility/include/mock/mock_process_thread.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
-#include "webrtc/modules/utility/include/mock/mock_process_thread.h"
#include "webrtc/video/vie_encoder.h"
using ::testing::NiceMock;
diff --git a/video/end_to_end_tests.cc b/video/end_to_end_tests.cc
index 4758817..b9c1c28 100644
--- a/video/end_to_end_tests.cc
+++ b/video/end_to_end_tests.cc
@@ -15,8 +15,6 @@
#include <string>
#include <vector>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/base/checks.h"
#include "webrtc/base/event.h"
#include "webrtc/base/file.h"
@@ -47,6 +45,7 @@
#include "webrtc/test/fake_encoder.h"
#include "webrtc/test/frame_generator.h"
#include "webrtc/test/frame_generator_capturer.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/null_transport.h"
#include "webrtc/test/rtcp_packet_parser.h"
#include "webrtc/test/rtp_rtcp_observer.h"
diff --git a/video/overuse_frame_detector_unittest.cc b/video/overuse_frame_detector_unittest.cc
index 7f69ac0..64747fa 100644
--- a/video/overuse_frame_detector_unittest.cc
+++ b/video/overuse_frame_detector_unittest.cc
@@ -10,13 +10,11 @@
#include <memory>
-#include "webrtc/video/overuse_frame_detector.h"
-
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-
#include "webrtc/base/event.h"
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
+#include "webrtc/video/overuse_frame_detector.h"
#include "webrtc/video_frame.h"
namespace webrtc {
diff --git a/video/payload_router_unittest.cc b/video/payload_router_unittest.cc
index ed8af9f..5b87554 100644
--- a/video/payload_router_unittest.cc
+++ b/video/payload_router_unittest.cc
@@ -10,11 +10,11 @@
#include <memory>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
#include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/video/payload_router.h"
using ::testing::_;
diff --git a/video/replay.cc b/video/replay.cc
index 90bfc33..d88d6b3 100644
--- a/video/replay.cc
+++ b/video/replay.cc
@@ -15,8 +15,6 @@
#include <sstream>
#include "gflags/gflags.h"
-#include "webrtc/test/gtest.h"
-
#include "webrtc/base/checks.h"
#include "webrtc/call.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
@@ -24,8 +22,9 @@
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/system_wrappers/include/sleep.h"
#include "webrtc/test/encoder_settings.h"
-#include "webrtc/test/null_transport.h"
#include "webrtc/test/fake_decoder.h"
+#include "webrtc/test/gtest.h"
+#include "webrtc/test/null_transport.h"
#include "webrtc/test/rtp_file_reader.h"
#include "webrtc/test/run_loop.h"
#include "webrtc/test/run_test.h"
diff --git a/video/report_block_stats_unittest.cc b/video/report_block_stats_unittest.cc
index 557f1f2..d9863a7 100644
--- a/video/report_block_stats_unittest.cc
+++ b/video/report_block_stats_unittest.cc
@@ -9,7 +9,6 @@
*/
#include "webrtc/test/gtest.h"
-
#include "webrtc/video/report_block_stats.h"
namespace webrtc {
diff --git a/video/screenshare_loopback.cc b/video/screenshare_loopback.cc
index b2e68be..65b51f7 100644
--- a/video/screenshare_loopback.cc
+++ b/video/screenshare_loopback.cc
@@ -11,9 +11,8 @@
#include <stdio.h>
#include "gflags/gflags.h"
-#include "webrtc/test/gtest.h"
-
#include "webrtc/test/field_trial.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/run_test.h"
#include "webrtc/video/video_quality_test.h"
diff --git a/video/send_delay_stats_unittest.cc b/video/send_delay_stats_unittest.cc
index 811d63b..0644ad2 100644
--- a/video/send_delay_stats_unittest.cc
+++ b/video/send_delay_stats_unittest.cc
@@ -10,9 +10,9 @@
#include "webrtc/video/send_delay_stats.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/system_wrappers/include/metrics.h"
#include "webrtc/system_wrappers/include/metrics_default.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/video/send_statistics_proxy_unittest.cc b/video/send_statistics_proxy_unittest.cc
index f5bfaeb..46a984b 100644
--- a/video/send_statistics_proxy_unittest.cc
+++ b/video/send_statistics_proxy_unittest.cc
@@ -15,9 +15,9 @@
#include <string>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/system_wrappers/include/metrics.h"
#include "webrtc/system_wrappers/include/metrics_default.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/video/stats_counter_unittest.cc b/video/stats_counter_unittest.cc
index b906532..e04b47f 100644
--- a/video/stats_counter_unittest.cc
+++ b/video/stats_counter_unittest.cc
@@ -10,9 +10,8 @@
#include "webrtc/video/stats_counter.h"
-#include "webrtc/test/gtest.h"
-
#include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/video/video_decoder_unittest.cc b/video/video_decoder_unittest.cc
index 07bce41..5b4d431 100644
--- a/video/video_decoder_unittest.cc
+++ b/video/video_decoder_unittest.cc
@@ -10,9 +10,9 @@
#include "webrtc/video_decoder.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/checks.h"
#include "webrtc/modules/video_coding/include/video_error_codes.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/video/video_encoder_unittest.cc b/video/video_encoder_unittest.cc
index e1cfd23..5f6f17e 100644
--- a/video/video_encoder_unittest.cc
+++ b/video/video_encoder_unittest.cc
@@ -10,9 +10,9 @@
#include "webrtc/video_encoder.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
#include "webrtc/modules/video_coding/include/video_error_codes.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/video/video_loopback.cc b/video/video_loopback.cc
index 9b4f784..3de0b14 100644
--- a/video/video_loopback.cc
+++ b/video/video_loopback.cc
@@ -11,9 +11,8 @@
#include <stdio.h>
#include "gflags/gflags.h"
-#include "webrtc/test/gtest.h"
-
#include "webrtc/test/field_trial.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/run_test.h"
#include "webrtc/video/video_quality_test.h"
diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc
index 6186aaf..41054db 100644
--- a/video/video_quality_test.cc
+++ b/video/video_quality_test.cc
@@ -17,7 +17,6 @@
#include <string>
#include <vector>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/event.h"
#include "webrtc/base/format_macros.h"
@@ -29,6 +28,7 @@
#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
#include "webrtc/system_wrappers/include/cpu_info.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/layer_filtering_transport.h"
#include "webrtc/test/run_loop.h"
#include "webrtc/test/statistics.h"
diff --git a/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc
index cce2955..abfa511 100644
--- a/video/video_send_stream_tests.cc
+++ b/video/video_send_stream_tests.cc
@@ -11,8 +11,6 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gtest.h"
-
#include "webrtc/base/bind.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/criticalsection.h"
@@ -35,6 +33,7 @@
#include "webrtc/test/fake_texture_frame.h"
#include "webrtc/test/frame_generator.h"
#include "webrtc/test/frame_utils.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/null_transport.h"
#include "webrtc/test/testsupport/perf_test.h"
#include "webrtc/video/send_statistics_proxy.h"
diff --git a/video/vie_encoder_unittest.cc b/video/vie_encoder_unittest.cc
index 00e6cef..ae8fc66 100644
--- a/video/vie_encoder_unittest.cc
+++ b/video/vie_encoder_unittest.cc
@@ -10,11 +10,11 @@
#include <utility>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/logging.h"
#include "webrtc/test/encoder_settings.h"
#include "webrtc/test/fake_encoder.h"
#include "webrtc/test/frame_generator.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/video/send_statistics_proxy.h"
#include "webrtc/video/vie_encoder.h"
diff --git a/video/vie_remb_unittest.cc b/video/vie_remb_unittest.cc
index f3f4edd..46ede3f 100644
--- a/video/vie_remb_unittest.cc
+++ b/video/vie_remb_unittest.cc
@@ -11,11 +11,11 @@
#include <memory>
#include <vector>
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
#include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
#include "webrtc/modules/utility/include/mock/mock_process_thread.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/video/vie_remb.h"
using ::testing::_;
diff --git a/voice_engine/network_predictor_unittest.cc b/voice_engine/network_predictor_unittest.cc
index 22f9d3a..9012379 100644
--- a/voice_engine/network_predictor_unittest.cc
+++ b/voice_engine/network_predictor_unittest.cc
@@ -12,9 +12,9 @@
#include <memory>
+#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/test/gtest.h"
#include "webrtc/voice_engine/network_predictor.h"
-#include "webrtc/system_wrappers/include/clock.h"
namespace webrtc {
namespace voe {
diff --git a/voice_engine/test/auto_test/fakes/conference_transport.h b/voice_engine/test/auto_test/fakes/conference_transport.h
index c0f563a..d8a5a49 100644
--- a/voice_engine/test/auto_test/fakes/conference_transport.h
+++ b/voice_engine/test/auto_test/fakes/conference_transport.h
@@ -16,13 +16,13 @@
#include <memory>
#include <utility>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/basictypes.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/platform_thread.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
#include "webrtc/system_wrappers/include/event_wrapper.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/voice_engine/include/voe_base.h"
#include "webrtc/voice_engine/include/voe_codec.h"
#include "webrtc/voice_engine/include/voe_file.h"
diff --git a/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h b/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h
index 75f48b2..7280a3a 100644
--- a/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h
+++ b/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h
@@ -13,6 +13,8 @@
#include "webrtc/common_types.h"
#include "webrtc/engine_configurations.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/voice_engine/include/voe_audio_processing.h"
#include "webrtc/voice_engine/include/voe_base.h"
#include "webrtc/voice_engine/include/voe_codec.h"
@@ -27,9 +29,6 @@
#include "webrtc/voice_engine/include/voe_volume_control.h"
#include "webrtc/voice_engine/test/auto_test/voe_test_common.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-
// This convenient fixture sets up all voice engine interfaces automatically for
// use by testing subclasses. It allocates each interface and releases it once
// which means that if a tests allocates additional interfaces from the voice
diff --git a/voice_engine/test/auto_test/voe_conference_test.cc b/voice_engine/test/auto_test/voe_conference_test.cc
index 770df03..9c4d204 100644
--- a/voice_engine/test/auto_test/voe_conference_test.cc
+++ b/voice_engine/test/auto_test/voe_conference_test.cc
@@ -10,10 +10,10 @@
#include <queue>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/format_macros.h"
#include "webrtc/base/timeutils.h"
#include "webrtc/system_wrappers/include/sleep.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/voice_engine/test/auto_test/fakes/conference_transport.h"
diff --git a/voice_engine/test/auto_test/voe_output_test.cc b/voice_engine/test/auto_test/voe_output_test.cc
index a732a2e..60e1997 100644
--- a/voice_engine/test/auto_test/voe_output_test.cc
+++ b/voice_engine/test/auto_test/voe_output_test.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/base/random.h"
#include "webrtc/base/timeutils.h"
#include "webrtc/system_wrappers/include/sleep.h"
-#include "webrtc/voice_engine/test/channel_transport/channel_transport.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h"
+#include "webrtc/voice_engine/test/channel_transport/channel_transport.h"
namespace {
diff --git a/voice_engine/test/channel_transport/udp_socket_manager_unittest.cc b/voice_engine/test/channel_transport/udp_socket_manager_unittest.cc
index 7fce793..178474a 100644
--- a/voice_engine/test/channel_transport/udp_socket_manager_unittest.cc
+++ b/voice_engine/test/channel_transport/udp_socket_manager_unittest.cc
@@ -15,8 +15,8 @@
// It also uses the static UdpSocketManager object.
// The most important property of these tests is that they do not leak memory.
-#include "webrtc/test/gtest.h"
#include "webrtc/system_wrappers/include/trace.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper.h"
#include "webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.h"
diff --git a/voice_engine/test/channel_transport/udp_transport_unittest.cc b/voice_engine/test/channel_transport/udp_transport_unittest.cc
index 559b8cc..2938b41 100644
--- a/voice_engine/test/channel_transport/udp_transport_unittest.cc
+++ b/voice_engine/test/channel_transport/udp_transport_unittest.cc
@@ -13,9 +13,11 @@
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
#include "webrtc/voice_engine/test/channel_transport/udp_transport.h"
+
// We include the implementation header file to get at the dependency-injecting
// constructor.
#include "webrtc/voice_engine/test/channel_transport/udp_transport_impl.h"
+
// We must mock the socket manager, for which we need its definition.
#include "webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper.h"
diff --git a/voice_engine/test/cmd_test/voe_cmd_test.cc b/voice_engine/test/cmd_test/voe_cmd_test.cc
index fbd5235..350c636 100644
--- a/voice_engine/test/cmd_test/voe_cmd_test.cc
+++ b/voice_engine/test/cmd_test/voe_cmd_test.cc
@@ -19,11 +19,10 @@
#include <vector>
#include "gflags/gflags.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/base/format_macros.h"
#include "webrtc/engine_configurations.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
-#include "webrtc/voice_engine/test/channel_transport/channel_transport.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/testsupport/trace_to_stderr.h"
#include "webrtc/voice_engine/include/voe_audio_processing.h"
@@ -38,6 +37,7 @@
#include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
#include "webrtc/voice_engine/include/voe_video_sync.h"
#include "webrtc/voice_engine/include/voe_volume_control.h"
+#include "webrtc/voice_engine/test/channel_transport/channel_transport.h"
DEFINE_bool(use_log_file, false,
"Output logs to a file; by default they will be printed to stderr.");
diff --git a/voice_engine/utility_unittest.cc b/voice_engine/utility_unittest.cc
index d529682..ecd0baa 100644
--- a/voice_engine/utility_unittest.cc
+++ b/voice_engine/utility_unittest.cc
@@ -10,10 +10,10 @@
#include <math.h>
-#include "webrtc/test/gtest.h"
#include "webrtc/base/format_macros.h"
#include "webrtc/common_audio/resampler/include/push_resampler.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/voice_engine/utility.h"
#include "webrtc/voice_engine/voice_engine_defines.h"
diff --git a/voice_engine/voe_base_unittest.cc b/voice_engine/voe_base_unittest.cc
index f87d324..a300f3b 100644
--- a/voice_engine/voe_base_unittest.cc
+++ b/voice_engine/voe_base_unittest.cc
@@ -10,8 +10,8 @@
#include "webrtc/voice_engine/include/voe_base.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/voice_engine/channel_manager.h"
#include "webrtc/voice_engine/shared_data.h"
#include "webrtc/voice_engine/voice_engine_fixture.h"
diff --git a/voice_engine/voe_codec_unittest.cc b/voice_engine/voe_codec_unittest.cc
index acef75a..c095614 100644
--- a/voice_engine/voe_codec_unittest.cc
+++ b/voice_engine/voe_codec_unittest.cc
@@ -12,8 +12,8 @@
#include "webrtc/voice_engine/include/voe_codec.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_device/include/fake_audio_device.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/voice_engine/include/voe_base.h"
#include "webrtc/voice_engine/include/voe_hardware.h"
#include "webrtc/voice_engine/voice_engine_defines.h"
diff --git a/voice_engine/voice_engine_fixture.h b/voice_engine/voice_engine_fixture.h
index 0dabf28..4f4eaa8 100644
--- a/voice_engine/voice_engine_fixture.h
+++ b/voice_engine/voice_engine_fixture.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
#include "webrtc/modules/audio_device/include/fake_audio_device.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/mock_transport.h"
#include "webrtc/voice_engine/include/voe_base.h"
#include "webrtc/voice_engine/include/voe_network.h"
