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-Commit-Position: refs/heads/master@{#14464}

webrtc/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)
 

webrtc/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 {

webrtc/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"
 

webrtc/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"

webrtc/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"

webrtc/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 {
 

webrtc/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;
 

webrtc/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;

webrtc/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 {

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

webrtc/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 {

webrtc/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"

webrtc/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 {
 

webrtc/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 {
 

webrtc/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 {

webrtc/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 {

webrtc/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 {

webrtc/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 {

webrtc/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 {
 

webrtc/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 {
 

webrtc/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,

webrtc/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 {
 

webrtc/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 {
 

webrtc/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 {
 

webrtc/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 {

webrtc/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 {

webrtc/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 {
 

webrtc/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 {
 

webrtc/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 {

webrtc/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 {
 

webrtc/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 {

webrtc/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 {

webrtc/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 {
 

webrtc/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 {

webrtc/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;

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