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

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

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

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

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

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

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

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

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

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

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

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

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