Re-sort GYP files with the latest version of tools/source_list.py

In crrev.com/316164, a bug was fixed to handle comments in
a source list correctly.

In this patch, a bug was fixed to handle comments at the
end of a source list.

Along the way, sort some GYP files in sub directories under
base and net, which I forgot to sort previously.

BUG=456014
TEST=everything should build as before

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

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

12 files changed, 68 insertions, 66 deletions

diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index c20325d..d426c9c 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -106,9 +106,9 @@
             '<(tcmalloc_dir)/src/base/abort.cc',
             '<(tcmalloc_dir)/src/base/abort.h',
             '<(tcmalloc_dir)/src/base/arm_instruction_set_select.h',
-            '<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h',
             '<(tcmalloc_dir)/src/base/atomicops-internals-arm-generic.h',
             '<(tcmalloc_dir)/src/base/atomicops-internals-arm-v6plus.h',
+            '<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h',
             '<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h',
             '<(tcmalloc_dir)/src/base/atomicops-internals-windows.h',
             '<(tcmalloc_dir)/src/base/atomicops-internals-x86.cc',
@@ -322,10 +322,10 @@
             # cpuprofiler
             '<(tcmalloc_dir)/src/base/thread_lister.c',
             '<(tcmalloc_dir)/src/base/thread_lister.h',
-            '<(tcmalloc_dir)/src/profiledata.cc',
-            '<(tcmalloc_dir)/src/profiledata.h',
             '<(tcmalloc_dir)/src/profile-handler.cc',
             '<(tcmalloc_dir)/src/profile-handler.h',
+            '<(tcmalloc_dir)/src/profiledata.cc',
+            '<(tcmalloc_dir)/src/profiledata.h',
             '<(tcmalloc_dir)/src/profiler.cc',
           ],
         }],
@@ -434,9 +434,9 @@
             '../..',
           ],
           'sources': [
-            'allocator_unittest.cc',
             '../profiler/alternate_timer.cc',
             '../profiler/alternate_timer.h',
+            'allocator_unittest.cc',
           ],
         },
       ],
@@ -499,10 +499,10 @@
             '../..',
           ],
           'sources': [
-            'type_profiler_tcmalloc.cc',
-            'type_profiler_tcmalloc.h',
             '<(tcmalloc_dir)/src/gperftools/type_profiler_map.h',
             '<(tcmalloc_dir)/src/type_profiler_map.cc',
+            'type_profiler_tcmalloc.cc',
+            'type_profiler_tcmalloc.h',
           ],
         },
         {
@@ -542,9 +542,9 @@
             '../..',
           ],
           'sources': [
-            'type_profiler_map_unittest.cc',
             '<(tcmalloc_dir)/src/gperftools/type_profiler_map.h',
             '<(tcmalloc_dir)/src/type_profiler_map.cc',
+            'type_profiler_map_unittest.cc',
           ],
         },
       ],
diff --git a/base/third_party/dynamic_annotations/dynamic_annotations.gyp b/base/third_party/dynamic_annotations/dynamic_annotations.gyp
index 12cfb65..8d2e9ec 100644
--- a/base/third_party/dynamic_annotations/dynamic_annotations.gyp
+++ b/base/third_party/dynamic_annotations/dynamic_annotations.gyp
@@ -12,9 +12,9 @@
         '../../../',
       ],
       'sources': [
+        '../valgrind/valgrind.h',
         'dynamic_annotations.c',
         'dynamic_annotations.h',
-        '../valgrind/valgrind.h',
       ],
       'includes': [
         '../../../build/android/increase_size_for_speed.gypi',
diff --git a/chrome/chrome_debugger.gypi b/chrome/chrome_debugger.gypi
index 02b2f00..09b182a 100644
--- a/chrome/chrome_debugger.gypi
+++ b/chrome/chrome_debugger.gypi
@@ -20,6 +20,9 @@
         '..',
       ],
       'sources': [
+        # These files are generated by devtools_protocol_constants_generator.py.
+        '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/devtools/devtools_protocol_constants.cc',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/devtools/devtools_protocol_constants.h',
         'browser/devtools/devtools_network_conditions.cc',
         'browser/devtools/devtools_network_conditions.h',
         'browser/devtools/devtools_network_controller.cc',
@@ -34,9 +37,6 @@
         'browser/devtools/devtools_network_transaction_factory.h',
         'browser/devtools/devtools_protocol.cc',
         'browser/devtools/devtools_protocol.h',
-        # These files are generated by devtools_protocol_constants_generator.py.
-        '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/devtools/devtools_protocol_constants.cc',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/devtools/devtools_protocol_constants.h',
       ],
       'conditions': [
         ['OS!="android"', {
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 81fcfeb..00dc15588 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -58,6 +58,10 @@
         'enable_wexit_time_destructors': 1,
       },
       'sources': [
+        # Note that due to InitializeSandboxInfo, this must be directly linked
+        # into chrome.exe, not into a dependent.
+        '<(DEPTH)/content/app/startup_helper_win.cc',
+        '<(DEPTH)/content/public/common/content_switches.cc',
         'app/chrome_exe_main_aura.cc',
         'app/chrome_exe_main_mac.cc',
         'app/chrome_exe_main_win.cc',
@@ -70,10 +74,6 @@
         'app/client_util.h',
         'app/signature_validator_win.cc',
         'app/signature_validator_win.h',
-        # Note that due to InitializeSandboxInfo, this must be directly linked
-        # into chrome.exe, not into a dependent.
-        '<(DEPTH)/content/app/startup_helper_win.cc',
-        '<(DEPTH)/content/public/common/content_switches.cc',
       ],
       'mac_bundle_resources': [
         'app/app-Info.plist',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 1b42d24..df13900 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -24,6 +24,9 @@
       # The list of sources which is only used by chrome browser tests.
       '../apps/app_restore_service_browsertest.cc',
       '../apps/load_and_launch_browsertest.cc',
+      # TODO(craig): Rename this and run from base_unittests when the test
+      # is safe to run there. See http://crbug.com/78722 for details.
+      '../base/files/file_path_watcher_browsertest.cc',
       '../components/autofill/content/renderer/test_password_autofill_agent.cc',
       '../components/autofill/content/renderer/test_password_autofill_agent.h',
       '../components/autofill/content/renderer/test_password_generation_agent.cc',
@@ -565,9 +568,6 @@
       'test/data/webui/webui_resource_browsertest.cc',
       'test/gpu/webgl_infobar_browsertest.cc',
       'test/ppapi/ppapi_browsertest.cc',
-      # TODO(craig): Rename this and run from base_unittests when the test
-      # is safe to run there. See http://crbug.com/78722 for details.
-      '../base/files/file_path_watcher_browsertest.cc',
     ],
     # Cross-platform views browser tests ready for toolkit-views on Mac.
     'chrome_browser_tests_views_sources': [
@@ -667,10 +667,10 @@
       'browser/chromeos/login/mixin_based_browser_test.cc',
       'browser/chromeos/login/mixin_based_browser_test.h',
       'browser/chromeos/login/oobe_localization_browsertest.cc',
-      'browser/chromeos/login/reset_browsertest.cc',
       # TODO(nkostylev) Re-enable ResourceLoaderBrowserTest.
       #'browser/chromeos/login/resource_loader_browsertest.cc',
       'browser/chromeos/login/proxy_auth_dialog_browsertest.cc',
+      'browser/chromeos/login/reset_browsertest.cc',
       'browser/chromeos/login/saml/saml_browsertest.cc',
       'browser/chromeos/login/screens/mock_base_screen_delegate.cc',
       'browser/chromeos/login/screens/mock_base_screen_delegate.h',
@@ -2252,11 +2252,11 @@
             # TODO(rouslan): This test depends on hunspell and we cannot run it
             # on Mac, which does use hunspell by default.
             'browser/ui/webui/options/language_options_dictionary_download_browsertest.js',
-            # ProcessSingletonMac doesn't do anything.
-            'browser/process_singleton_browsertest.cc',
             # This test depends on GetCommandLineForRelaunch, which is not
             # available on Mac.
             'browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc',
+            # ProcessSingletonMac doesn't do anything.
+            'browser/process_singleton_browsertest.cc',
             # single-process mode hangs on Mac sometimes because of multiple UI
             # message loops. See 306348
             'renderer/safe_browsing/phishing_classifier_browsertest.cc',
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index ac1346f..bc3a996 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -233,9 +233,9 @@
       'public/browser/stream_handle.h',
       'public/browser/stream_info.cc',
       'public/browser/stream_info.h',
-      'public/browser/tracing_controller.h',
       'public/browser/trace_uploader.h',
-      'public_browser/tracing_delegate.h',
+      'public/browser/tracing_controller.h',
+      'public/browser/tracing_delegate.h',
       'public/browser/url_data_source.cc',
       'public/browser/url_data_source.h',
       'public/browser/user_metrics.h',
@@ -262,6 +262,15 @@
       'public/browser/zygote_host_linux.h',
     ],
     'private_browser_sources': [
+      # These files are generated by GRIT.
+      '<(SHARED_INTERMEDIATE_DIR)/blink/grit/devtools_resources.h',
+      '<(SHARED_INTERMEDIATE_DIR)/blink/grit/devtools_resources_map.cc',
+      '<(SHARED_INTERMEDIATE_DIR)/blink/grit/devtools_resources_map.h',
+      # These files are generated by devtools_protocol_handler_generator.py.
+      '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/protocol/devtools_protocol_dispatcher.cc',
+      '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/protocol/devtools_protocol_dispatcher.h',
+      '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/grit/tracing_resources.h',
+      '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/webui_resources_map.cc',
       'browser/accessibility/accessibility_mode_helper.cc',
       'browser/accessibility/accessibility_mode_helper.h',
       'browser/accessibility/accessibility_tree_formatter.cc',
@@ -1452,15 +1461,6 @@
       'zygote/zygote_linux.cc',
       'zygote/zygote_linux.h',
       'zygote/zygote_main_linux.cc',
-      # These files are generated by GRIT.
-      '<(SHARED_INTERMEDIATE_DIR)/blink/grit/devtools_resources.h',
-      '<(SHARED_INTERMEDIATE_DIR)/blink/grit/devtools_resources_map.cc',
-      '<(SHARED_INTERMEDIATE_DIR)/blink/grit/devtools_resources_map.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/grit/tracing_resources.h',
-      '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/webui_resources_map.cc',
-      # These files are generated by devtools_protocol_handler_generator.py.
-      '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/protocol/devtools_protocol_dispatcher.cc',
-      '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/protocol/devtools_protocol_dispatcher.h',
     ],
     'android_browser_sources': [
       'browser/android/java/gin_java_bound_object.cc',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 6805adc..dc28aee 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -15,6 +15,19 @@
       'test/test_video_frame_provider.h',
     ],
     'test_support_content_sources': [
+      # TODO(phajdan.jr): All of those files should live in content/test (if
+      # they're only used by content) or content/public/test (if they're used
+      # by other embedders).
+      'browser/download/mock_download_file.cc',
+      'browser/download/mock_download_file.h',
+      'browser/geolocation/fake_access_token_store.cc',
+      'browser/geolocation/fake_access_token_store.h',
+      'browser/geolocation/mock_location_arbitrator.cc',
+      'browser/geolocation/mock_location_arbitrator.h',
+      'browser/geolocation/mock_location_provider.cc',
+      'browser/geolocation/mock_location_provider.h',
+      'browser/renderer_host/media/mock_media_observer.cc',
+      'browser/renderer_host/media/mock_media_observer.h',
       'public/test/async_file_test_helper.cc',
       'public/test/async_file_test_helper.h',
       'public/test/browser_test.h',
@@ -92,19 +105,6 @@
       'public/test/web_contents_observer_sanity_checker.h',
       'public/test/web_contents_tester.cc',
       'public/test/web_contents_tester.h',
-      # TODO(phajdan.jr): All of those files should live in content/test (if
-      # they're only used by content) or content/public/test (if they're used
-      # by other embedders).
-      'browser/download/mock_download_file.cc',
-      'browser/download/mock_download_file.h',
-      'browser/geolocation/fake_access_token_store.cc',
-      'browser/geolocation/fake_access_token_store.h',
-      'browser/geolocation/mock_location_arbitrator.cc',
-      'browser/geolocation/mock_location_arbitrator.h',
-      'browser/geolocation/mock_location_provider.cc',
-      'browser/geolocation/mock_location_provider.h',
-      'browser/renderer_host/media/mock_media_observer.cc',
-      'browser/renderer_host/media/mock_media_observer.h',
       'test/appcache_test_helper.cc',
       'test/appcache_test_helper.h',
       'test/blink_test_environment.cc',
@@ -1375,8 +1375,6 @@
               ],
               'sources': [
                 '<@(content_browsertests_win_sources)',
-                'shell/app/resource.h',
-                'shell/app/shell.rc',
                 # TODO:  It would be nice to have these pulled in
                 # automatically from direct_dependent_settings in
                 # their various targets (net.gyp:net_resources, etc.),
@@ -1385,6 +1383,8 @@
                 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+                'shell/app/resource.h',
+                'shell/app/shell.rc',
               ],
               'dependencies': [
                 '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
@@ -2080,6 +2080,12 @@
           'conditions': [
             ['OS!="win"', {
               'sources!': [
+                 # windows-specific resources
+                'test/plugin/npapi_test.def',
+                'test/plugin/npapi_test.rc',
+                 # Seems windows specific.
+                'test/plugin/plugin_create_instance_in_paint.cc',
+                'test/plugin/plugin_create_instance_in_paint.h',
                 # TODO(port):  Port these.
                 # plugin_npobject_lifetime_test.cc has win32-isms
                 #   (HWND, CALLBACK).
@@ -2087,12 +2093,6 @@
                  # The window APIs are necessarily platform-specific.
                 'test/plugin/plugin_window_size_test.cc',
                 'test/plugin/plugin_windowed_test.cc',
-                 # Seems windows specific.
-                'test/plugin/plugin_create_instance_in_paint.cc',
-                'test/plugin/plugin_create_instance_in_paint.h',
-                 # windows-specific resources
-                'test/plugin/npapi_test.def',
-                'test/plugin/npapi_test.rc',
               ],
             }],
             ['OS=="mac"', {
diff --git a/net/net.gyp b/net/net.gyp
index 6bf0067..0fdc518 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -772,15 +772,15 @@
               'disk_cache/blockfile/block_files_unittest.cc',
               # Need to read input data files.
               'filter/gzip_filter_unittest.cc',
-              'socket/ssl_server_socket_unittest.cc',
-              'spdy/fuzzing/hpack_fuzz_util_test.cc',
               # Need TestServer.
               'proxy/proxy_script_fetcher_impl_unittest.cc',
               'socket/ssl_client_socket_unittest.cc',
-              'url_request/url_fetcher_impl_unittest.cc',
-              'url_request/url_request_context_builder_unittest.cc',
+              'socket/ssl_server_socket_unittest.cc',
+              'spdy/fuzzing/hpack_fuzz_util_test.cc',
               # Needs GetAppOutput().
               'test/python_utils_unittest.cc',
+              'url_request/url_fetcher_impl_unittest.cc',
+              'url_request/url_request_context_builder_unittest.cc',
 
               # The following tests are disabled because they don't apply to
               # iOS.
diff --git a/net/net.gypi b/net/net.gypi
index ceeb96a..a31edc2 100644
--- a/net/net.gypi
+++ b/net/net.gypi
@@ -235,6 +235,9 @@
       'base/keygen_handler_nss.cc',
       'base/keygen_handler_openssl.cc',
       'base/keygen_handler_win.cc',
+      # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types?
+      'base/layered_network_delegate.cc',
+      'base/layered_network_delegate.h',
       'base/linked_hash_map.h',
       'base/load_flags.h',
       'base/load_flags_list.h',
@@ -273,9 +276,6 @@
       'base/nss_memio.c',
       'base/nss_memio.h',
       'base/platform_mime_util.h',
-      # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types?
-      'base/layered_network_delegate.cc',
-      'base/layered_network_delegate.h',
       'base/platform_mime_util_linux.cc',
       'base/platform_mime_util_mac.mm',
       'base/platform_mime_util_win.cc',
diff --git a/net/third_party/nss/ssl.gyp b/net/third_party/nss/ssl.gyp
index 64d8551..1d2bab8 100644
--- a/net/third_party/nss/ssl.gyp
+++ b/net/third_party/nss/ssl.gyp
@@ -25,7 +25,9 @@
       'type': '<(component)',
       'product_name': 'crssl',  # Don't conflict with OpenSSL's libssl
       'sources': [
+        'ssl/SSLerrs.h',
         'ssl/authcert.c',
+        'ssl/bodge/secitem_array.c',
         'ssl/cmpcert.c',
         'ssl/derive.c',
         'ssl/dtlscon.c',
@@ -45,7 +47,6 @@
         'ssl/sslenum.c',
         'ssl/sslerr.c',
         'ssl/sslerr.h',
-        'ssl/SSLerrs.h',
         'ssl/sslerrstrs.c',
         'ssl/sslgathr.c',
         'ssl/sslimpl.h',
@@ -67,7 +68,6 @@
         'ssl/unix_err.h',
         'ssl/win32err.c',
         'ssl/win32err.h',
-        'ssl/bodge/secitem_array.c',
       ],
       'sources!': [
         'ssl/os2_err.c',
diff --git a/net/tools/tld_cleanup/tld_cleanup.gyp b/net/tools/tld_cleanup/tld_cleanup.gyp
index c698550..dc0c45f 100644
--- a/net/tools/tld_cleanup/tld_cleanup.gyp
+++ b/net/tools/tld_cleanup/tld_cleanup.gyp
@@ -15,8 +15,8 @@
         '../../../url/url.gyp:url_lib',
       ],
       'sources': [
-        'tld_cleanup_util.h',
         'tld_cleanup_util.cc',
+        'tld_cleanup_util.h',
       ],
     },
   ],
diff --git a/tools/sort_sources.py b/tools/sort_sources.py
index 60d3881..63f1afd 100755
--- a/tools/sort_sources.py
+++ b/tools/sort_sources.py
@@ -49,14 +49,16 @@ def SortSources(original_lines):
       sources.append([line, comments])
       comments = []
     else:
-      if comments:
-        output_lines.extend(comments)
-        comments = []
+      # |sources| should be flushed first, to handle comments at the end of a
+      # source list correctly.
       if sources:
         for source_line, source_comments in sorted(sources):
           output_lines.extend(source_comments)
           output_lines.append(source_line)
         sources = []
+      if comments:
+        output_lines.extend(comments)
+        comments = []
       output_lines.append(line)
   return output_lines