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}

3 files changed, 13 insertions, 13 deletions

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',