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/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::_;
