Sort GYP and GN files under media

For tools/sort_sources.py to be useful, existing GYP and GN files
should be sorted.

BUG=456014
TEST=everything should build as before

Review URL: https://codereview.chromium.org/915053003

Cr-Commit-Position: refs/heads/master@{#316748}

9 files changed, 166 insertions, 166 deletions

diff --git a/media/BUILD.gn b/media/BUILD.gn
index d9e2399..864eafe 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -152,6 +152,32 @@ component("media") {
     "filters/webvtt_util.h",
     "filters/wsola_internals.cc",
     "filters/wsola_internals.h",
+    "formats/common/offset_byte_queue.cc",
+    "formats/common/offset_byte_queue.h",
+    "formats/webm/webm_audio_client.cc",
+    "formats/webm/webm_audio_client.h",
+    "formats/webm/webm_cluster_parser.cc",
+    "formats/webm/webm_cluster_parser.h",
+    "formats/webm/webm_constants.cc",
+    "formats/webm/webm_constants.h",
+    "formats/webm/webm_content_encodings.cc",
+    "formats/webm/webm_content_encodings.h",
+    "formats/webm/webm_content_encodings_client.cc",
+    "formats/webm/webm_content_encodings_client.h",
+    "formats/webm/webm_crypto_helpers.cc",
+    "formats/webm/webm_crypto_helpers.h",
+    "formats/webm/webm_info_parser.cc",
+    "formats/webm/webm_info_parser.h",
+    "formats/webm/webm_parser.cc",
+    "formats/webm/webm_parser.h",
+    "formats/webm/webm_stream_parser.cc",
+    "formats/webm/webm_stream_parser.h",
+    "formats/webm/webm_tracks_parser.cc",
+    "formats/webm/webm_tracks_parser.h",
+    "formats/webm/webm_video_client.cc",
+    "formats/webm/webm_video_client.h",
+    "formats/webm/webm_webvtt_parser.cc",
+    "formats/webm/webm_webvtt_parser.h",
     "midi/midi_manager.cc",
     "midi/midi_manager.h",
     "midi/midi_manager_mac.cc",
@@ -176,10 +202,10 @@ component("media") {
     "midi/usb_midi_output_stream.h",
     "video/capture/file_video_capture_device.cc",
     "video/capture/file_video_capture_device.h",
-    "video/capture/linux/video_capture_device_linux.cc",
-    "video/capture/linux/video_capture_device_linux.h",
     "video/capture/linux/video_capture_device_chromeos.cc",
     "video/capture/linux/video_capture_device_chromeos.h",
+    "video/capture/linux/video_capture_device_linux.cc",
+    "video/capture/linux/video_capture_device_linux.h",
     "video/capture/mac/platform_video_capturing_mac.h",
     "video/capture/mac/video_capture_device_avfoundation_mac.h",
     "video/capture/mac/video_capture_device_avfoundation_mac.mm",
@@ -224,32 +250,6 @@ component("media") {
     "video/video_decode_accelerator.h",
     "video/video_encode_accelerator.cc",
     "video/video_encode_accelerator.h",
-    "formats/common/offset_byte_queue.cc",
-    "formats/common/offset_byte_queue.h",
-    "formats/webm/webm_audio_client.cc",
-    "formats/webm/webm_audio_client.h",
-    "formats/webm/webm_cluster_parser.cc",
-    "formats/webm/webm_cluster_parser.h",
-    "formats/webm/webm_constants.cc",
-    "formats/webm/webm_constants.h",
-    "formats/webm/webm_content_encodings.cc",
-    "formats/webm/webm_content_encodings.h",
-    "formats/webm/webm_content_encodings_client.cc",
-    "formats/webm/webm_content_encodings_client.h",
-    "formats/webm/webm_crypto_helpers.cc",
-    "formats/webm/webm_crypto_helpers.h",
-    "formats/webm/webm_info_parser.cc",
-    "formats/webm/webm_info_parser.h",
-    "formats/webm/webm_parser.cc",
-    "formats/webm/webm_parser.h",
-    "formats/webm/webm_stream_parser.cc",
-    "formats/webm/webm_stream_parser.h",
-    "formats/webm/webm_tracks_parser.cc",
-    "formats/webm/webm_tracks_parser.h",
-    "formats/webm/webm_video_client.cc",
-    "formats/webm/webm_video_client.h",
-    "formats/webm/webm_webvtt_parser.cc",
-    "formats/webm/webm_webvtt_parser.h",
   ]
 
   configs += [ ":media_config" ]
@@ -450,10 +450,10 @@ component("media") {
       "formats/mpeg/adts_constants.h",
       "formats/mpeg/adts_stream_parser.cc",
       "formats/mpeg/adts_stream_parser.h",
-      "formats/mpeg/mpeg_audio_stream_parser_base.cc",
-      "formats/mpeg/mpeg_audio_stream_parser_base.h",
       "formats/mpeg/mpeg1_audio_stream_parser.cc",
       "formats/mpeg/mpeg1_audio_stream_parser.h",
+      "formats/mpeg/mpeg_audio_stream_parser_base.cc",
+      "formats/mpeg/mpeg_audio_stream_parser_base.h",
     ]
   }
 
@@ -555,16 +555,6 @@ test("media_unittests") {
     "filters/video_renderer_impl_unittest.cc",
     "filters/vp8_bool_decoder_unittest.cc",
     "filters/vp8_parser_unittest.cc",
-    "midi/midi_manager_unittest.cc",
-    "midi/midi_manager_usb_unittest.cc",
-    "midi/midi_message_queue_unittest.cc",
-    "midi/midi_message_util_unittest.cc",
-    "midi/usb_midi_descriptor_parser_unittest.cc",
-    "midi/usb_midi_input_stream_unittest.cc",
-    "midi/usb_midi_output_stream_unittest.cc",
-    "video/capture/fake_video_capture_device_unittest.cc",
-    "video/capture/video_capture_device_unittest.cc",
-    "video/h264_poc_unittest.cc",
     "formats/common/offset_byte_queue_unittest.cc",
     "formats/webm/cluster_builder.cc",
     "formats/webm/cluster_builder.h",
@@ -577,6 +567,16 @@ test("media_unittests") {
     "formats/webm/webm_parser_unittest.cc",
     "formats/webm/webm_tracks_parser_unittest.cc",
     "formats/webm/webm_webvtt_parser_unittest.cc",
+    "midi/midi_manager_unittest.cc",
+    "midi/midi_manager_usb_unittest.cc",
+    "midi/midi_message_queue_unittest.cc",
+    "midi/midi_message_util_unittest.cc",
+    "midi/usb_midi_descriptor_parser_unittest.cc",
+    "midi/usb_midi_input_stream_unittest.cc",
+    "midi/usb_midi_output_stream_unittest.cc",
+    "video/capture/fake_video_capture_device_unittest.cc",
+    "video/capture/video_capture_device_unittest.cc",
+    "video/h264_poc_unittest.cc",
   ]
 
   deps = [
diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
index 9820b46..fa9a657 100644
--- a/media/audio/BUILD.gn
+++ b/media/audio/BUILD.gn
@@ -88,8 +88,8 @@ source_set("audio") {
     "fake_audio_consumer.h",
     "fake_audio_input_stream.cc",
     "fake_audio_input_stream.h",
-    "fake_audio_log_factory.h",
     "fake_audio_log_factory.cc",
+    "fake_audio_log_factory.h",
     "fake_audio_manager.cc",
     "fake_audio_manager.h",
     "fake_audio_output_stream.cc",
diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn
index 2091a5d..138d1f5 100644
--- a/media/base/BUILD.gn
+++ b/media/base/BUILD.gn
@@ -15,11 +15,11 @@ source_set("base") {
     "audio_block_fifo.h",
     "audio_buffer.cc",
     "audio_buffer.h",
+    "audio_buffer_converter.cc",
+    "audio_buffer_converter.h",
     "audio_buffer_queue.cc",
     "audio_buffer_queue.h",
     "audio_capturer_source.h",
-    "audio_buffer_converter.cc",
-    "audio_buffer_converter.h",
     "audio_converter.cc",
     "audio_converter.h",
     "audio_decoder.cc",
@@ -101,9 +101,9 @@ source_set("base") {
     "key_system_info.h",
     "key_systems.cc",
     "key_systems.h",
+    "key_systems.h",
     "key_systems_support_uma.cc",
     "key_systems_support_uma.h",
-    "key_systems.h",
     "media.cc",
     "media.h",
     "media_client.cc",
@@ -304,8 +304,8 @@ source_set("unittests") {
   sources = [
     "audio_block_fifo_unittest.cc",
     "audio_buffer_converter_unittest.cc",
-    "audio_buffer_unittest.cc",
     "audio_buffer_queue_unittest.cc",
+    "audio_buffer_unittest.cc",
     "audio_bus_unittest.cc",
     "audio_converter_unittest.cc",
     "audio_discard_helper_unittest.cc",
@@ -334,8 +334,8 @@ source_set("unittests") {
     "pipeline_unittest.cc",
     "ranges_unittest.cc",
     "run_all_unittests.cc",
-    "serial_runner_unittest.cc",
     "seekable_buffer_unittest.cc",
+    "serial_runner_unittest.cc",
     "sinc_resampler_unittest.cc",
     "stream_parser_unittest.cc",
     "text_ranges_unittest.cc",
@@ -343,8 +343,8 @@ source_set("unittests") {
     "user_input_monitor_unittest.cc",
     "vector_math_testing.h",
     "vector_math_unittest.cc",
-    "video_frame_unittest.cc",
     "video_frame_pool_unittest.cc",
+    "video_frame_unittest.cc",
     "video_util_unittest.cc",
     "wall_clock_time_source_unittest.cc",
     "yuv_convert_unittest.cc",
diff --git a/media/base/mac/BUILD.gn b/media/base/mac/BUILD.gn
index c82d1d6..2bb7294 100644
--- a/media/base/mac/BUILD.gn
+++ b/media/base/mac/BUILD.gn
@@ -10,8 +10,8 @@ source_set("mac") {
     "coremedia_glue.h",
     "coremedia_glue.mm",
     "corevideo_glue.h",
-    "video_frame_mac.h",
     "video_frame_mac.cc",
+    "video_frame_mac.h",
     "videotoolbox_glue.h",
     "videotoolbox_glue.mm",
   ]
diff --git a/media/blink/media_blink.gyp b/media/blink/media_blink.gyp
index 6c6ccc7..fa6042f 100644
--- a/media/blink/media_blink.gyp
+++ b/media/blink/media_blink.gyp
@@ -57,8 +57,8 @@
         'webcontentdecryptionmoduleaccess_impl.h',
         'webcontentdecryptionmodulesession_impl.cc',
         'webcontentdecryptionmodulesession_impl.h',
-        "webencryptedmediaclient_impl.cc",
-        "webencryptedmediaclient_impl.h",
+        'webencryptedmediaclient_impl.cc',
+        'webencryptedmediaclient_impl.h',
         'webinbandtexttrack_impl.cc',
         'webinbandtexttrack_impl.h',
         'webmediaplayer_delegate.h',
diff --git a/media/cast/BUILD.gn b/media/cast/BUILD.gn
index 99c3332..ec91639 100644
--- a/media/cast/BUILD.gn
+++ b/media/cast/BUILD.gn
@@ -69,34 +69,34 @@ source_set("net") {
     "net/pacing/paced_sender.cc",
     "net/pacing/paced_sender.h",
     "net/rtcp/receiver_rtcp_event_subscriber.cc",
-    "net/rtcp/rtcp_defines.cc",
-    "net/rtcp/rtcp_defines.h",
-    "net/rtcp/rtcp.h",
     "net/rtcp/rtcp.cc",
+    "net/rtcp/rtcp.h",
     "net/rtcp/rtcp_builder.cc",
     "net/rtcp/rtcp_builder.h",
+    "net/rtcp/rtcp_defines.cc",
+    "net/rtcp/rtcp_defines.h",
     "net/rtcp/rtcp_utility.cc",
     "net/rtcp/rtcp_utility.h",
-    "net/rtp/packet_storage.cc",
-    "net/rtp/packet_storage.h",
-    "net/rtp/rtp_packetizer.cc",
-    "net/rtp/rtp_packetizer.h",
-    "net/rtp/rtp_sender.cc",
-    "net/rtp/rtp_sender.h",
-    "net/udp_transport.cc",
-    "net/udp_transport.h",
     "net/rtp/cast_message_builder.cc",
     "net/rtp/cast_message_builder.h",
     "net/rtp/frame_buffer.cc",
     "net/rtp/frame_buffer.h",
     "net/rtp/framer.cc",
     "net/rtp/framer.h",
+    "net/rtp/packet_storage.cc",
+    "net/rtp/packet_storage.h",
     "net/rtp/receiver_stats.cc",
     "net/rtp/receiver_stats.h",
+    "net/rtp/rtp_packetizer.cc",
+    "net/rtp/rtp_packetizer.h",
     "net/rtp/rtp_parser.cc",
     "net/rtp/rtp_parser.h",
     "net/rtp/rtp_receiver_defines.cc",
     "net/rtp/rtp_receiver_defines.h",
+    "net/rtp/rtp_sender.cc",
+    "net/rtp/rtp_sender.h",
+    "net/udp_transport.cc",
+    "net/udp_transport.h",
   ]
 
   deps = [
@@ -109,28 +109,28 @@ source_set("sender") {
     "cast_sender.h",
     "cast_sender_impl.cc",
     "cast_sender_impl.h",
-    "sender/audio_encoder.h",
     "sender/audio_encoder.cc",
-    "sender/audio_sender.h",
+    "sender/audio_encoder.h",
     "sender/audio_sender.cc",
-    "sender/congestion_control.h",
+    "sender/audio_sender.h",
     "sender/congestion_control.cc",
-    "sender/external_video_encoder.h",
+    "sender/congestion_control.h",
     "sender/external_video_encoder.cc",
-    "sender/fake_software_video_encoder.h",
+    "sender/external_video_encoder.h",
     "sender/fake_software_video_encoder.cc",
+    "sender/fake_software_video_encoder.h",
     "sender/frame_sender.cc",
     "sender/frame_sender.h",
     "sender/size_adaptable_video_encoder_base.cc",
     "sender/size_adaptable_video_encoder_base.h",
     "sender/software_video_encoder.h",
-    "sender/video_encoder.h",
     "sender/video_encoder.cc",
-    "sender/video_encoder_impl.h",
+    "sender/video_encoder.h",
     "sender/video_encoder_impl.cc",
+    "sender/video_encoder_impl.h",
     "sender/video_frame_factory.h",
-    "sender/video_sender.h",
     "sender/video_sender.cc",
+    "sender/video_sender.h",
     "sender/vp8_encoder.cc",
     "sender/vp8_encoder.h",
   ]
@@ -154,10 +154,10 @@ source_set("sender") {
       "//third_party/opus",
     ]
     sources -= [
-      "sender/external_video_encoder.h",
       "sender/external_video_encoder.cc",
-      "sender/video_encoder_impl.h",
+      "sender/external_video_encoder.h",
       "sender/video_encoder_impl.cc",
+      "sender/video_encoder_impl.h",
       "sender/vp8_encoder.cc",
       "sender/vp8_encoder.h",
     ]
@@ -214,12 +214,12 @@ static_library("test_support") {
     #    "test/fake_media_source.h",
     "test/fake_single_thread_task_runner.cc",
     "test/fake_single_thread_task_runner.h",
+    "test/loopback_transport.cc",
+    "test/loopback_transport.h",
     "test/skewed_single_thread_task_runner.cc",
     "test/skewed_single_thread_task_runner.h",
     "test/skewed_tick_clock.cc",
     "test/skewed_tick_clock.h",
-    "test/loopback_transport.cc",
-    "test/loopback_transport.h",
     "test/utility/audio_utility.cc",
     "test/utility/audio_utility.h",
     "test/utility/barcode.cc",
@@ -234,10 +234,10 @@ static_library("test_support") {
     "test/utility/net_utility.h",
     "test/utility/standalone_cast_environment.cc",
     "test/utility/standalone_cast_environment.h",
-    "test/utility/video_utility.cc",
-    "test/utility/video_utility.h",
     "test/utility/udp_proxy.cc",
     "test/utility/udp_proxy.h",
+    "test/utility/video_utility.cc",
+    "test/utility/video_utility.h",
   ]
 
   deps = [
@@ -258,10 +258,10 @@ static_library("test_support") {
 test("cast_unittests") {
   sources = [
     "logging/encoding_event_subscriber_unittest.cc",
-    "logging/serialize_deserialize_test.cc",
     "logging/logging_impl_unittest.cc",
     "logging/logging_raw_unittest.cc",
     "logging/receiver_time_offset_estimator_impl_unittest.cc",
+    "logging/serialize_deserialize_test.cc",
     "logging/simple_event_subscriber_unittest.cc",
     "logging/stats_event_subscriber_unittest.cc",
     "net/cast_transport_sender_impl_unittest.cc",
@@ -270,10 +270,10 @@ test("cast_unittests") {
     "net/pacing/mock_paced_packet_sender.cc",
     "net/pacing/mock_paced_packet_sender.h",
     "net/pacing/paced_sender_unittest.cc",
+    "net/rtcp/receiver_rtcp_event_subscriber_unittest.cc",
     "net/rtcp/rtcp_builder_unittest.cc",
     "net/rtcp/rtcp_unittest.cc",
     "net/rtcp/rtcp_utility_unittest.cc",
-    "net/rtcp/receiver_rtcp_event_subscriber_unittest.cc",
 
     # TODO(miu): The following two are test utility modules.  Rename/move the files.
     "net/rtcp/test_rtcp_packet_builder.cc",
@@ -288,8 +288,8 @@ test("cast_unittests") {
     "net/rtp/rtp_header_parser.cc",
     "net/rtp/rtp_header_parser.h",
     "net/rtp/rtp_packet_builder.cc",
-    "net/rtp/rtp_parser_unittest.cc",
     "net/rtp/rtp_packetizer_unittest.cc",
+    "net/rtp/rtp_parser_unittest.cc",
     "net/rtp/rtp_receiver_defines.h",
     "net/udp_transport_unittest.cc",
     "receiver/audio_decoder_unittest.cc",
diff --git a/media/cast/cast.gyp b/media/cast/cast.gyp
index 82ba1f4..1d6594f 100644
--- a/media/cast/cast.gyp
+++ b/media/cast/cast.gyp
@@ -99,14 +99,6 @@
       ],
       'sources': [
         'cast_receiver.h',
-        'receiver/audio_decoder.cc',
-        'receiver/audio_decoder.h',
-        'receiver/cast_receiver_impl.cc',
-        'receiver/cast_receiver_impl.h',
-        'receiver/frame_receiver.cc',
-        'receiver/frame_receiver.h',
-        'receiver/video_decoder.cc',
-        'receiver/video_decoder.h',
         'net/rtp/cast_message_builder.cc',
         'net/rtp/cast_message_builder.h',
         'net/rtp/frame_buffer.cc',
@@ -117,6 +109,14 @@
         'net/rtp/receiver_stats.h',
         'net/rtp/rtp_receiver_defines.cc',
         'net/rtp/rtp_receiver_defines.h',
+        'receiver/audio_decoder.cc',
+        'receiver/audio_decoder.h',
+        'receiver/cast_receiver_impl.cc',
+        'receiver/cast_receiver_impl.h',
+        'receiver/frame_receiver.cc',
+        'receiver/frame_receiver.h',
+        'receiver/video_decoder.cc',
+        'receiver/video_decoder.h',
       ], # source
       'conditions': [
         # use a restricted subset of media and no software codecs on iOS
@@ -150,28 +150,28 @@
         'cast_sender.h',
         'cast_sender_impl.cc',
         'cast_sender_impl.h',
-        'sender/audio_encoder.h',
         'sender/audio_encoder.cc',
-        'sender/audio_sender.h',
+        'sender/audio_encoder.h',
         'sender/audio_sender.cc',
-        'sender/congestion_control.h',
+        'sender/audio_sender.h',
         'sender/congestion_control.cc',
-        'sender/external_video_encoder.h',
+        'sender/congestion_control.h',
         'sender/external_video_encoder.cc',
-        'sender/fake_software_video_encoder.h',
+        'sender/external_video_encoder.h',
         'sender/fake_software_video_encoder.cc',
+        'sender/fake_software_video_encoder.h',
         'sender/frame_sender.cc',
         'sender/frame_sender.h',
         'sender/size_adaptable_video_encoder_base.cc',
         'sender/size_adaptable_video_encoder_base.h',
         'sender/software_video_encoder.h',
-        'sender/video_encoder.h',
         'sender/video_encoder.cc',
-        'sender/video_encoder_impl.h',
+        'sender/video_encoder.h',
         'sender/video_encoder_impl.cc',
+        'sender/video_encoder_impl.h',
         'sender/video_frame_factory.h',
-        'sender/video_sender.h',
         'sender/video_sender.cc',
+        'sender/video_sender.h',
         'sender/vp8_encoder.cc',
         'sender/vp8_encoder.h',
       ], # source
@@ -185,10 +185,10 @@
             '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
           ],
           'sources!': [
-            'sender/external_video_encoder.h',
             'sender/external_video_encoder.cc',
-            'sender/video_encoder_impl.h',
+            'sender/external_video_encoder.h',
             'sender/video_encoder_impl.cc',
+            'sender/video_encoder_impl.h',
             'sender/vp8_encoder.cc',
             'sender/vp8_encoder.h',
           ],
@@ -224,12 +224,12 @@
         'net/pacing/paced_sender.cc',
         'net/pacing/paced_sender.h',
         'net/rtcp/receiver_rtcp_event_subscriber.cc',
+        'net/rtcp/rtcp.cc',
+        'net/rtcp/rtcp.h',
         'net/rtcp/rtcp_builder.cc',
         'net/rtcp/rtcp_builder.h',
         'net/rtcp/rtcp_defines.cc',
         'net/rtcp/rtcp_defines.h',
-        'net/rtcp/rtcp.h',
-        'net/rtcp/rtcp.cc',
         'net/rtcp/rtcp_utility.cc',
         'net/rtcp/rtcp_utility.h',
         'net/rtp/packet_storage.cc',
diff --git a/media/cast/cast_testing.gypi b/media/cast/cast_testing.gypi
index 22a2182..29d6901 100644
--- a/media/cast/cast_testing.gypi
+++ b/media/cast/cast_testing.gypi
@@ -21,6 +21,8 @@
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
       ],
       'sources': [
+	'test/loopback_transport.cc',
+	'test/loopback_transport.h',
         'test/fake_media_source.cc',
         'test/fake_media_source.h',
         'test/fake_single_thread_task_runner.cc',
@@ -29,8 +31,6 @@
         'test/skewed_single_thread_task_runner.h',
         'test/skewed_tick_clock.cc',
         'test/skewed_tick_clock.h',
-	'test/loopback_transport.cc',
-	'test/loopback_transport.h',
         'test/utility/audio_utility.cc',
         'test/utility/audio_utility.h',
         'test/utility/barcode.cc',
@@ -45,10 +45,10 @@
         'test/utility/net_utility.h',
         'test/utility/standalone_cast_environment.cc',
         'test/utility/standalone_cast_environment.h',
-        'test/utility/video_utility.cc',
-        'test/utility/video_utility.h',
         'test/utility/udp_proxy.cc',
         'test/utility/udp_proxy.h',
+        'test/utility/video_utility.cc',
+        'test/utility/video_utility.h',
       ], # source
     },
     {
@@ -75,10 +75,10 @@
       'sources': [
         '<(DEPTH)/media/base/run_all_unittests.cc',
         'logging/encoding_event_subscriber_unittest.cc',
-        'logging/serialize_deserialize_test.cc',
         'logging/logging_impl_unittest.cc',
         'logging/logging_raw_unittest.cc',
         'logging/receiver_time_offset_estimator_impl_unittest.cc',
+        'logging/serialize_deserialize_test.cc',
         'logging/simple_event_subscriber_unittest.cc',
         'logging/stats_event_subscriber_unittest.cc',
         'net/cast_transport_sender_impl_unittest.cc',
@@ -88,10 +88,10 @@
         'net/pacing/mock_paced_packet_sender.cc',
         'net/pacing/mock_paced_packet_sender.h',
         'net/pacing/paced_sender_unittest.cc',
+        'net/rtcp/receiver_rtcp_event_subscriber_unittest.cc',
         'net/rtcp/rtcp_builder_unittest.cc',
         'net/rtcp/rtcp_unittest.cc',
         'net/rtcp/rtcp_utility_unittest.cc',
-        'net/rtcp/receiver_rtcp_event_subscriber_unittest.cc',
 # TODO(miu): The following two are test utility modules.  Rename/move the files.
         'net/rtcp/test_rtcp_packet_builder.cc',
         'net/rtcp/test_rtcp_packet_builder.h',
@@ -105,8 +105,8 @@
         'net/rtp/rtp_header_parser.cc',
         'net/rtp/rtp_header_parser.h',
         'net/rtp/rtp_packet_builder.cc',
-        'net/rtp/rtp_parser_unittest.cc',
         'net/rtp/rtp_packetizer_unittest.cc',
+        'net/rtp/rtp_parser_unittest.cc',
         'net/rtp/rtp_receiver_defines.h',
         'net/udp_transport_unittest.cc',
         'receiver/audio_decoder_unittest.cc',
diff --git a/media/media.gyp b/media/media.gyp
index 0a3f4a4..0de3fad 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -144,8 +144,8 @@
         'audio/fake_audio_consumer.h',
         'audio/fake_audio_input_stream.cc',
         'audio/fake_audio_input_stream.h',
-        'audio/fake_audio_log_factory.h',
         'audio/fake_audio_log_factory.cc',
+        'audio/fake_audio_log_factory.h',
         'audio/fake_audio_manager.cc',
         'audio/fake_audio_manager.h',
         'audio/fake_audio_output_stream.cc',
@@ -211,10 +211,10 @@
         'base/audio_block_fifo.h',
         'base/audio_buffer.cc',
         'base/audio_buffer.h',
-        'base/audio_buffer_queue.cc',
-        'base/audio_buffer_queue.h',
         'base/audio_buffer_converter.cc',
         'base/audio_buffer_converter.h',
+        'base/audio_buffer_queue.cc',
+        'base/audio_buffer_queue.h',
         'base/audio_capturer_source.h',
         'base/audio_converter.cc',
         'base/audio_converter.h',
@@ -298,10 +298,10 @@
         'base/eme_constants.h',
         'base/key_system_info.cc',
         'base/key_system_info.h',
-        'base/key_systems_support_uma.cc',
-        'base/key_systems_support_uma.h',
         'base/key_systems.cc',
         'base/key_systems.h',
+        'base/key_systems_support_uma.cc',
+        'base/key_systems_support_uma.h',
         'base/keyboard_event_counter.cc',
         'base/keyboard_event_counter.h',
         'base/mac/avfoundation_glue.h',
@@ -309,10 +309,10 @@
         'base/mac/coremedia_glue.h',
         'base/mac/coremedia_glue.mm',
         'base/mac/corevideo_glue.h',
+        'base/mac/video_frame_mac.cc',
+        'base/mac/video_frame_mac.h',
         'base/mac/videotoolbox_glue.h',
         'base/mac/videotoolbox_glue.mm',
-        'base/mac/video_frame_mac.h',
-        'base/mac/video_frame_mac.cc',
         'base/media.cc',
         'base/media.h',
         'base/media_client.cc',
@@ -324,9 +324,9 @@
         'base/media_log.cc',
         'base/media_log.h',
         'base/media_log_event.h',
-        'base/media_posix.cc',
         'base/media_permission.cc',
         'base/media_permission.h',
+        'base/media_posix.cc',
         'base/media_switches.cc',
         'base/media_switches.h',
         'base/media_win.cc',
@@ -392,10 +392,10 @@
         'base/video_rotation.h',
         'base/video_util.cc',
         'base/video_util.h',
-        'base/yuv_convert.cc',
-        'base/yuv_convert.h',
         'base/wall_clock_time_source.cc',
         'base/wall_clock_time_source.h',
+        'base/yuv_convert.cc',
+        'base/yuv_convert.h',
         'cdm/aes_decryptor.cc',
         'cdm/aes_decryptor.h',
         'cdm/default_cdm_factory.cc',
@@ -436,10 +436,10 @@
         'filters/decrypting_demuxer_stream.h',
         'filters/decrypting_video_decoder.cc',
         'filters/decrypting_video_decoder.h',
-        'filters/default_renderer_factory.cc',
-        'filters/default_renderer_factory.h',
         'filters/default_media_permission.cc',
         'filters/default_media_permission.h',
+        'filters/default_renderer_factory.cc',
+        'filters/default_renderer_factory.h',
         'filters/ffmpeg_audio_decoder.cc',
         'filters/ffmpeg_audio_decoder.h',
         'filters/ffmpeg_bitstream_converter.h',
@@ -493,6 +493,31 @@
         'filters/webvtt_util.h',
         'filters/wsola_internals.cc',
         'filters/wsola_internals.h',
+        'formats/common/offset_byte_queue.cc',
+        'formats/common/offset_byte_queue.h',
+        'formats/webm/webm_audio_client.cc',
+        'formats/webm/webm_audio_client.h',
+        'formats/webm/webm_cluster_parser.cc',
+        'formats/webm/webm_cluster_parser.h',
+        'formats/webm/webm_constants.cc',
+        'formats/webm/webm_constants.h',
+        'formats/webm/webm_content_encodings.cc',
+        'formats/webm/webm_content_encodings.h',
+        'formats/webm/webm_content_encodings_client.cc',
+        'formats/webm/webm_content_encodings_client.h',
+        'formats/webm/webm_crypto_helpers.cc',
+        'formats/webm/webm_crypto_helpers.h',
+        'formats/webm/webm_info_parser.cc',
+        'formats/webm/webm_info_parser.h',
+        'formats/webm/webm_parser.cc',
+        'formats/webm/webm_parser.h',
+        'formats/webm/webm_stream_parser.cc',
+        'formats/webm/webm_stream_parser.h',
+        'formats/webm/webm_tracks_parser.cc',
+        'formats/webm/webm_tracks_parser.h',
+        'formats/webm/webm_video_client.cc',
+        'formats/webm/webm_video_client.h',
+        'formats/webm/webm_webvtt_parser.cc',
         'midi/midi_manager.cc',
         'midi/midi_manager.h',
         'midi/midi_manager_alsa.cc',
@@ -530,18 +555,18 @@
         'video/capture/android/video_capture_device_factory_android.h',
         'video/capture/fake_video_capture_device.cc',
         'video/capture/fake_video_capture_device.h',
-        'video/capture/fake_video_capture_device_factory.h',
         'video/capture/fake_video_capture_device_factory.cc',
+        'video/capture/fake_video_capture_device_factory.h',
         'video/capture/file_video_capture_device.cc',
         'video/capture/file_video_capture_device.h',
-        'video/capture/file_video_capture_device_factory.h',
         'video/capture/file_video_capture_device_factory.cc',
+        'video/capture/file_video_capture_device_factory.h',
+        'video/capture/linux/video_capture_device_chromeos.cc',
+        'video/capture/linux/video_capture_device_chromeos.h',
         'video/capture/linux/video_capture_device_factory_linux.cc',
         'video/capture/linux/video_capture_device_factory_linux.h',
         'video/capture/linux/video_capture_device_linux.cc',
         'video/capture/linux/video_capture_device_linux.h',
-        'video/capture/linux/video_capture_device_chromeos.cc',
-        'video/capture/linux/video_capture_device_chromeos.h',
         'video/capture/mac/platform_video_capturing_mac.h',
         'video/capture/mac/video_capture_device_avfoundation_mac.h',
         'video/capture/mac/video_capture_device_avfoundation_mac.mm',
@@ -588,31 +613,6 @@
         'video/video_decode_accelerator.h',
         'video/video_encode_accelerator.cc',
         'video/video_encode_accelerator.h',
-        'formats/common/offset_byte_queue.cc',
-        'formats/common/offset_byte_queue.h',
-        'formats/webm/webm_audio_client.cc',
-        'formats/webm/webm_audio_client.h',
-        'formats/webm/webm_cluster_parser.cc',
-        'formats/webm/webm_cluster_parser.h',
-        'formats/webm/webm_constants.cc',
-        'formats/webm/webm_constants.h',
-        'formats/webm/webm_content_encodings.cc',
-        'formats/webm/webm_content_encodings.h',
-        'formats/webm/webm_content_encodings_client.cc',
-        'formats/webm/webm_content_encodings_client.h',
-        'formats/webm/webm_crypto_helpers.cc',
-        'formats/webm/webm_crypto_helpers.h',
-        'formats/webm/webm_info_parser.cc',
-        'formats/webm/webm_info_parser.h',
-        'formats/webm/webm_parser.cc',
-        'formats/webm/webm_parser.h',
-        'formats/webm/webm_stream_parser.cc',
-        'formats/webm/webm_stream_parser.h',
-        'formats/webm/webm_tracks_parser.cc',
-        'formats/webm/webm_tracks_parser.h',
-        'formats/webm/webm_video_client.cc',
-        'formats/webm/webm_video_client.h',
-        'formats/webm/webm_webvtt_parser.cc',
         'formats/webm/webm_webvtt_parser.h'
       ],
       'direct_dependent_settings': {
@@ -1050,10 +1050,10 @@
             'formats/mpeg/adts_constants.h',
             'formats/mpeg/adts_stream_parser.cc',
             'formats/mpeg/adts_stream_parser.h',
-            'formats/mpeg/mpeg_audio_stream_parser_base.cc',
-            'formats/mpeg/mpeg_audio_stream_parser_base.h',
             'formats/mpeg/mpeg1_audio_stream_parser.cc',
             'formats/mpeg/mpeg1_audio_stream_parser.h',
+            'formats/mpeg/mpeg_audio_stream_parser_base.cc',
+            'formats/mpeg/mpeg_audio_stream_parser_base.h',
           ],
         }],
         ['target_arch=="ia32" or target_arch=="x64"', {
@@ -1073,8 +1073,8 @@
         }],
         ['use_low_memory_buffer==1', {
           'sources': [
-            'filters/source_buffer_platform_lowmem.cc',
             'filters/source_buffer_platform.h',
+            'filters/source_buffer_platform_lowmem.cc',
           ]
         }, {  # 'use_low_memory_buffer==0'
           'sources': [
@@ -1121,8 +1121,8 @@
         '../url/url.gyp:url_lib',
       ],
       'sources': [
-        'audio/android/audio_android_unittest.cc',
         'audio/alsa/alsa_output_unittest.cc',
+        'audio/android/audio_android_unittest.cc',
         'audio/audio_input_controller_unittest.cc',
         'audio/audio_input_unittest.cc',
         'audio/audio_input_volume_unittest.cc',
@@ -1155,8 +1155,8 @@
         'base/android/media_source_player_unittest.cc',
         'base/audio_block_fifo_unittest.cc',
         'base/audio_buffer_converter_unittest.cc',
-        'base/audio_buffer_unittest.cc',
         'base/audio_buffer_queue_unittest.cc',
+        'base/audio_buffer_unittest.cc',
         'base/audio_bus_unittest.cc',
         'base/audio_converter_unittest.cc',
         'base/audio_discard_helper_unittest.cc',
@@ -1189,8 +1189,8 @@
         'base/pipeline_unittest.cc',
         'base/ranges_unittest.cc',
         'base/run_all_unittests.cc',
-        'base/serial_runner_unittest.cc',
         'base/seekable_buffer_unittest.cc',
+        'base/serial_runner_unittest.cc',
         'base/sinc_resampler_unittest.cc',
         'base/stream_parser_unittest.cc',
         'base/text_ranges_unittest.cc',
@@ -1199,8 +1199,8 @@
         'base/user_input_monitor_unittest.cc',
         'base/vector_math_testing.h',
         'base/vector_math_unittest.cc',
-        'base/video_frame_unittest.cc',
         'base/video_frame_pool_unittest.cc',
+        'base/video_frame_unittest.cc',
         'base/video_util_unittest.cc',
         'base/wall_clock_time_source_unittest.cc',
         'base/yuv_convert_unittest.cc',
@@ -1208,8 +1208,8 @@
         'cdm/json_web_key_unittest.cc',
         'ffmpeg/ffmpeg_common_unittest.cc',
         'filters/audio_clock_unittest.cc',
-        'filters/audio_decoder_unittest.cc',
         'filters/audio_decoder_selector_unittest.cc',
+        'filters/audio_decoder_unittest.cc',
         'filters/audio_file_reader_unittest.cc',
         'filters/audio_renderer_algorithm_unittest.cc',
         'filters/audio_renderer_impl_unittest.cc',
@@ -1243,16 +1243,6 @@
         'filters/video_renderer_impl_unittest.cc',
         'filters/vp8_bool_decoder_unittest.cc',
         'filters/vp8_parser_unittest.cc',
-        'midi/midi_manager_unittest.cc',
-        'midi/midi_manager_usb_unittest.cc',
-        'midi/midi_message_queue_unittest.cc',
-        'midi/midi_message_util_unittest.cc',
-        'midi/usb_midi_descriptor_parser_unittest.cc',
-        'midi/usb_midi_input_stream_unittest.cc',
-        'midi/usb_midi_output_stream_unittest.cc',
-        'video/capture/fake_video_capture_device_unittest.cc',
-        'video/capture/video_capture_device_unittest.cc',
-        'video/h264_poc_unittest.cc',
         'formats/common/offset_byte_queue_unittest.cc',
         'formats/webm/cluster_builder.cc',
         'formats/webm/cluster_builder.h',
@@ -1265,8 +1255,18 @@
         'formats/webm/webm_parser_unittest.cc',
         'formats/webm/webm_tracks_parser_unittest.cc',
         'formats/webm/webm_webvtt_parser_unittest.cc',
+        'midi/midi_manager_unittest.cc',
+        'midi/midi_manager_usb_unittest.cc',
+        'midi/midi_message_queue_unittest.cc',
+        'midi/midi_message_util_unittest.cc',
+        'midi/usb_midi_descriptor_parser_unittest.cc',
+        'midi/usb_midi_input_stream_unittest.cc',
+        'midi/usb_midi_output_stream_unittest.cc',
         'test/pipeline_integration_test.cc',
         'test/pipeline_integration_test_base.cc',
+        'video/capture/fake_video_capture_device_unittest.cc',
+        'video/capture/video_capture_device_unittest.cc',
+        'video/h264_poc_unittest.cc',
       ],
       'include_dirs': [
         # Needed by media_drm_bridge.cc.
@@ -1878,10 +1878,10 @@
             'base/mac/coremedia_glue.h',
             'base/mac/coremedia_glue.mm',
             'base/mac/corevideo_glue.h',
+            'base/mac/video_frame_mac.cc',
+            'base/mac/video_frame_mac.h',
             'base/mac/videotoolbox_glue.h',
             'base/mac/videotoolbox_glue.mm',
-            'base/mac/video_frame_mac.h',
-            'base/mac/video_frame_mac.cc',
             'base/video_frame.cc',
             'base/video_frame.h',
           ],