Sort GYP files under components

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

BUG=456014
TEST=everything should build as before

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

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

28 files changed, 103 insertions, 103 deletions

diff --git a/components/app_modal.gypi b/components/app_modal.gypi
index 73fefdc..cc5576c 100644
--- a/components/app_modal.gypi
+++ b/components/app_modal.gypi
@@ -36,8 +36,8 @@
         }],
         ['toolkit_views==1 and OS!="mac"', {
           'sources': [
-            'app_modal/views/javascript_app_modal_dialog_views.h',
             'app_modal/views/javascript_app_modal_dialog_views.cc',
+            'app_modal/views/javascript_app_modal_dialog_views.h',
           ],
         }],
       ],
diff --git a/components/autofill.gypi b/components/autofill.gypi
index b0d2c23..21d98fd 100644
--- a/components/autofill.gypi
+++ b/components/autofill.gypi
@@ -115,6 +115,7 @@
         'autofill/core/browser/autofill-inl.h',
         'autofill/core/browser/autofill_cc_infobar_delegate.cc',
         'autofill/core/browser/autofill_cc_infobar_delegate.h',
+        'autofill/core/browser/autofill_client.h',
         'autofill/core/browser/autofill_country.cc',
         'autofill/core/browser/autofill_country.h',
         'autofill/core/browser/autofill_data_model.cc',
@@ -130,7 +131,6 @@
         'autofill/core/browser/autofill_ie_toolbar_import_win.h',
         'autofill/core/browser/autofill_manager.cc',
         'autofill/core/browser/autofill_manager.h',
-        'autofill/core/browser/autofill_client.h',
         'autofill/core/browser/autofill_manager_test_delegate.h',
         'autofill/core/browser/autofill_metrics.cc',
         'autofill/core/browser/autofill_metrics.h',
diff --git a/components/captive_portal.gypi b/components/captive_portal.gypi
index c4b6fd9..5525bb0 100644
--- a/components/captive_portal.gypi
+++ b/components/captive_portal.gypi
@@ -23,9 +23,9 @@
         # Note: sources list duplicated in GN build.
         'captive_portal/captive_portal_detector.cc',
         'captive_portal/captive_portal_detector.h',
+        'captive_portal/captive_portal_export.h',
         'captive_portal/captive_portal_types.cc',
         'captive_portal/captive_portal_types.h',
-        'captive_portal/captive_portal_export.h',
       ],
     },
     {
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 7c11ae5..f159ceb 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -103,11 +103,10 @@
             'bookmarks/browser/bookmark_model_unittest.cc',
             'bookmarks/browser/bookmark_utils_unittest.cc',
             'browser_watcher/endsession_watcher_window_win_unittest.cc',
-            'browser_watcher/exit_funnel_win_unittest.cc',
             'browser_watcher/exit_code_watcher_win_unittest.cc',
+            'browser_watcher/exit_funnel_win_unittest.cc',
             'browser_watcher/watcher_client_win_unittest.cc',
             'browser_watcher/watcher_metrics_provider_win_unittest.cc',
-            'crash/app/crash_keys_win_unittest.cc',
             'captive_portal/captive_portal_detector_unittest.cc',
             'cloud_devices/common/cloud_devices_urls_unittest.cc',
             'cloud_devices/common/printer_description_unittest.cc',
@@ -118,6 +117,7 @@
             'content_settings/core/browser/content_settings_utils_unittest.cc',
             'content_settings/core/common/content_settings_pattern_parser_unittest.cc',
             'content_settings/core/common/content_settings_pattern_unittest.cc',
+            'crash/app/crash_keys_win_unittest.cc',
             'crx_file/id_util_unittest.cc',
             'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol_unittest.cc',
             'data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc',
@@ -157,6 +157,7 @@
             'domain_reliability/util_unittest.cc',
             'favicon_base/select_favicon_frames_unittest.cc',
             # Note: GN tests converted to here, need to do the rest.
+
             'enhanced_bookmarks/enhanced_bookmark_model_unittest.cc',
             'enhanced_bookmarks/image_store_ios_unittest.mm',
             'enhanced_bookmarks/image_store_unittest.cc',
@@ -208,10 +209,10 @@
             'navigation_interception/intercept_navigation_resource_throttle_unittest.cc',
             'network_time/network_time_tracker_unittest.cc',
             'omnibox/answers_cache_unittest.cc',
-            'omnibox/base_search_provider_unittest.cc',
             'omnibox/autocomplete_input_unittest.cc',
             'omnibox/autocomplete_match_unittest.cc',
             'omnibox/autocomplete_result_unittest.cc',
+            'omnibox/base_search_provider_unittest.cc',
             'omnibox/keyword_provider_unittest.cc',
             'omnibox/omnibox_field_trial_unittest.cc',
             'omnibox/suggestion_answer_unittest.cc',
@@ -289,13 +290,13 @@
             'suggestions/image_manager_unittest.cc',
             'suggestions/suggestions_service_unittest.cc',
             'suggestions/suggestions_store_unittest.cc',
-            'sync_driver/non_ui_data_type_controller_unittest.cc',
             'sync_driver/data_type_manager_impl_unittest.cc',
             'sync_driver/device_info_data_type_controller_unittest.cc',
             'sync_driver/device_info_sync_service_unittest.cc',
             'sync_driver/generic_change_processor_unittest.cc',
             'sync_driver/model_association_manager_unittest.cc',
             'sync_driver/non_blocking_data_type_controller_unittest.cc',
+            'sync_driver/non_ui_data_type_controller_unittest.cc',
             'sync_driver/shared_change_processor_unittest.cc',
             'sync_driver/sync_prefs_unittest.cc',
             'sync_driver/system_encryptor_unittest.cc',
@@ -319,12 +320,12 @@
             'update_client/test/update_checker_unittest.cc',
             'update_client/test/update_response_unittest.cc',
             'update_client/update_query_params_unittest.cc',
+            'url_fixer/url_fixer_unittest.cc',
             'url_matcher/regex_set_matcher_unittest.cc',
             'url_matcher/string_pattern_unittest.cc',
             'url_matcher/substring_set_matcher_unittest.cc',
             'url_matcher/url_matcher_factory_unittest.cc',
             'url_matcher/url_matcher_unittest.cc',
-            'url_fixer/url_fixer_unittest.cc',
             'variations/active_field_trials_unittest.cc',
             'variations/caching_permuted_entropy_provider_unittest.cc',
             'variations/entropy_provider_unittest.cc',
@@ -484,12 +485,12 @@
             ['OS != "ios"', {
               'sources': [
                 'autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc',
-                'network_hints/renderer/dns_prefetch_queue_unittest.cc',
-                'network_hints/renderer/renderer_dns_prefetch_unittest.cc',
                 'dom_distiller/content/dom_distiller_viewer_source_unittest.cc',
                 'dom_distiller/content/web_contents_main_frame_observer_unittest.cc',
                 'error_page/renderer/net_error_helper_core_unittest.cc',
                 'metrics/gpu/gpu_metrics_provider_unittest.cc',
+                'network_hints/renderer/dns_prefetch_queue_unittest.cc',
+                'network_hints/renderer/renderer_dns_prefetch_unittest.cc',
                 'password_manager/content/browser/credential_manager_dispatcher_unittest.cc',
                 'password_manager/content/common/credential_manager_types_unittest.cc',
                 'power/origin_power_map_unittest.cc',
@@ -632,15 +633,15 @@
                 'invalidation/invalidation_service_android_unittest.cc',
               ],
               'sources!': [
+                'feedback/feedback_common_unittest.cc',
+                'feedback/feedback_data_unittest.cc',
+                'feedback/feedback_uploader_unittest.cc',
                 'gcm_driver/gcm_account_mapper_unittest.cc',
                 'gcm_driver/gcm_channel_status_request_unittest.cc',
                 'gcm_driver/gcm_client_impl_unittest.cc',
                 'gcm_driver/gcm_delayed_task_controller_unittest.cc',
                 'gcm_driver/gcm_driver_desktop_unittest.cc',
                 'gcm_driver/gcm_stats_recorder_impl_unittest.cc',
-                'feedback/feedback_common_unittest.cc',
-                'feedback/feedback_data_unittest.cc',
-                'feedback/feedback_uploader_unittest.cc',
                 'signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc',
                 'storage_monitor/media_storage_util_unittest.cc',
                 'storage_monitor/storage_info_unittest.cc',
@@ -691,8 +692,8 @@
                 'copresence/rpc/rpc_handler_unittest.cc',
                 'copresence/timed_map_unittest.cc',
                 'proximity_auth/base64url_unittest.cc',
-                'proximity_auth/bluetooth_connection_unittest.cc',
                 'proximity_auth/bluetooth_connection_finder_unittest.cc',
+                'proximity_auth/bluetooth_connection_unittest.cc',
                 'proximity_auth/client_unittest.cc',
                 'proximity_auth/connection_unittest.cc',
                 'proximity_auth/cryptauth/cryptauth_account_token_fetcher_unittest.cc',
diff --git a/components/content_settings.gypi b/components/content_settings.gypi
index 3ba3b12..c6700f6 100644
--- a/components/content_settings.gypi
+++ b/components/content_settings.gypi
@@ -41,8 +41,8 @@
         'content_settings/core/browser/content_settings_provider.h',
         'content_settings/core/browser/content_settings_rule.cc',
         'content_settings/core/browser/content_settings_rule.h',
-	'content_settings/core/browser/content_settings_usages_state.cc',
-	'content_settings/core/browser/content_settings_usages_state.h',
+        'content_settings/core/browser/content_settings_usages_state.cc',
+        'content_settings/core/browser/content_settings_usages_state.h',
         'content_settings/core/browser/content_settings_utils.cc',
         'content_settings/core/browser/content_settings_utils.h',
         'content_settings/core/browser/host_content_settings_map.cc',
@@ -74,10 +74,10 @@
         'content_settings/core/common/content_settings_pattern_parser.cc',
         'content_settings/core/common/content_settings_pattern_parser.h',
         'content_settings/core/common/content_settings_types.h',
-        'content_settings/core/common/permission_request_id.h',
         'content_settings/core/common/permission_request_id.cc',
-        'content_settings/core/common/pref_names.h',
+        'content_settings/core/common/permission_request_id.h',
         'content_settings/core/common/pref_names.cc',
+        'content_settings/core/common/pref_names.h',
       ],
     },
     {
diff --git a/components/crash.gypi b/components/crash.gypi
index 70f7b0b..e61d1c0 100644
--- a/components/crash.gypi
+++ b/components/crash.gypi
@@ -8,10 +8,10 @@
       'target_name': 'crash_component_lib',
       'type': 'static_library',
       'sources': [
-        'crash/app/crash_reporter_client.cc',
-        'crash/app/crash_reporter_client.h',
         'crash/app/crash_keys_win.cc',
         'crash/app/crash_keys_win.h',
+        'crash/app/crash_reporter_client.cc',
+        'crash/app/crash_reporter_client.h',
       ],
       'include_dirs': [
         '..',
@@ -127,8 +127,6 @@
           'target_name': 'breakpad_win64',
           'type': 'static_library',
           'sources': [
-            'crash/app/crash_reporter_client.cc',
-            'crash/app/crash_reporter_client.h',
             'crash/app/breakpad_linux.cc',
             'crash/app/breakpad_linux.h',
             'crash/app/breakpad_linux_impl.h',
@@ -139,6 +137,8 @@
             # TODO(siggi): test the x64 version too.
             'crash/app/crash_keys_win.cc',
             'crash/app/crash_keys_win.h',
+            'crash/app/crash_reporter_client.cc',
+            'crash/app/crash_reporter_client.h',
             'crash/app/hard_error_handler_win.cc',
             'crash/app/hard_error_handler_win.h',
           ],
@@ -187,10 +187,10 @@
             '../base/base.gyp:base',
           ],
           'sources': [
-            'crash/app/crash_reporter_client.cc',
-            'crash/app/crash_reporter_client.h',
             'crash/app/breakpad_mac.h',
             'crash/app/breakpad_mac_stubs.mm',
+            'crash/app/crash_reporter_client.cc',
+            'crash/app/crash_reporter_client.h',
           ],
         },
       ],
diff --git a/components/cronet.gypi b/components/cronet.gypi
index 40838968..f492d41 100644
--- a/components/cronet.gypi
+++ b/components/cronet.gypi
@@ -114,15 +114,12 @@
             '../net/net.gyp:net',
           ],
           'sources': [
-            'cronet/url_request_context_config.cc',
-            'cronet/url_request_context_config.h',
-            'cronet/url_request_context_config_list.h',
             'cronet/android/chromium_url_request.cc',
             'cronet/android/chromium_url_request.h',
-            'cronet/android/chromium_url_request_error_list.h',
-            'cronet/android/chromium_url_request_priority_list.h',
             'cronet/android/chromium_url_request_context.cc',
             'cronet/android/chromium_url_request_context.h',
+            'cronet/android/chromium_url_request_error_list.h',
+            'cronet/android/chromium_url_request_priority_list.h',
             'cronet/android/cronet_histogram_manager.cc',
             'cronet/android/cronet_histogram_manager.h',
             'cronet/android/cronet_library_loader.cc',
@@ -141,6 +138,9 @@
             'cronet/android/url_request_context_adapter.h',
             'cronet/android/wrapped_channel_upload_element_reader.cc',
             'cronet/android/wrapped_channel_upload_element_reader.h',
+            'cronet/url_request_context_config.cc',
+            'cronet/url_request_context_config.h',
+            'cronet/url_request_context_config_list.h',
           ],
           'cflags': [
             '-DLOGGING=1',
diff --git a/components/data_reduction_proxy.gypi b/components/data_reduction_proxy.gypi
index 0214220..430324f 100644
--- a/components/data_reduction_proxy.gypi
+++ b/components/data_reduction_proxy.gypi
@@ -52,13 +52,13 @@
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
+        "data_reduction_proxy/core/browser/data_reduction_proxy_debug_ui_service.h",
         'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol.cc',
         'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol.h',
         'data_reduction_proxy/core/browser/data_reduction_proxy_config.cc',
         'data_reduction_proxy/core/browser/data_reduction_proxy_config.h',
         'data_reduction_proxy/core/browser/data_reduction_proxy_configurator.cc',
         'data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h',
-        "data_reduction_proxy/core/browser/data_reduction_proxy_debug_ui_service.h",
         'data_reduction_proxy/core/browser/data_reduction_proxy_delegate.cc',
         'data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h',
         'data_reduction_proxy/core/browser/data_reduction_proxy_interceptor.cc',
@@ -175,4 +175,3 @@
 
   ],
 }
-
diff --git a/components/dom_distiller.gypi b/components/dom_distiller.gypi
index 2c290595..0180f6f 100644
--- a/components/dom_distiller.gypi
+++ b/components/dom_distiller.gypi
@@ -95,10 +95,10 @@
             'dom_distiller/core/theme_list.h',
             'dom_distiller/core/url_constants.cc',
             'dom_distiller/core/url_constants.h',
-            'dom_distiller/core/url_utils_android.cc',
-            'dom_distiller/core/url_utils_android.h',
             'dom_distiller/core/url_utils.cc',
             'dom_distiller/core/url_utils.h',
+            'dom_distiller/core/url_utils_android.cc',
+            'dom_distiller/core/url_utils_android.h',
             'dom_distiller/core/viewer.cc',
             'dom_distiller/core/viewer.h',
           ],
diff --git a/components/error_page.gypi b/components/error_page.gypi
index 29b0120..a281610 100644
--- a/components/error_page.gypi
+++ b/components/error_page.gypi
@@ -18,8 +18,8 @@
       'sources': [
         'error_page/common/error_page_params.cc',
         'error_page/common/error_page_params.h',
-        'error_page/common/net_error_info.h',
         'error_page/common/net_error_info.cc',
+        'error_page/common/net_error_info.h',
       ],
     },
   ],
diff --git a/components/keyed_service.gypi b/components/keyed_service.gypi
index e363ef8..22ebf66 100644
--- a/components/keyed_service.gypi
+++ b/components/keyed_service.gypi
@@ -68,8 +68,8 @@
           'sources': [
             'keyed_service/content/browser_context_dependency_manager.cc',
             'keyed_service/content/browser_context_dependency_manager.h',
-            'keyed_service/content/browser_context_keyed_base_factory.h',
             'keyed_service/content/browser_context_keyed_base_factory.cc',
+            'keyed_service/content/browser_context_keyed_base_factory.h',
             'keyed_service/content/browser_context_keyed_service_factory.cc',
             'keyed_service/content/browser_context_keyed_service_factory.h',
             'keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.cc',
diff --git a/components/metrics.gypi b/components/metrics.gypi
index f144881..c723a15 100644
--- a/components/metrics.gypi
+++ b/components/metrics.gypi
@@ -114,10 +114,10 @@
         'metrics',
       ],
       'sources': [
-        'metrics/net/network_metrics_provider.cc',
-        'metrics/net/network_metrics_provider.h',
         'metrics/net/net_metrics_log_uploader.cc',
         'metrics/net/net_metrics_log_uploader.h',
+        'metrics/net/network_metrics_provider.cc',
+        'metrics/net/network_metrics_provider.h',
         'metrics/net/wifi_access_point_info_provider.cc',
         'metrics/net/wifi_access_point_info_provider.h',
         'metrics/net/wifi_access_point_info_provider_chromeos.cc',
@@ -202,10 +202,10 @@
           'target_name': 'metrics_serialization',
           'type': 'static_library',
           'sources': [
-            'metrics/serialization/serialization_utils.cc',
-            'metrics/serialization/serialization_utils.h',
             'metrics/serialization/metric_sample.cc',
             'metrics/serialization/metric_sample.h',
+            'metrics/serialization/serialization_utils.cc',
+            'metrics/serialization/serialization_utils.h',
           ],
           'dependencies': [
             '../base/base.gyp:base',
diff --git a/components/nacl.gyp b/components/nacl.gyp
index b83c4b3..df9c827 100644
--- a/components/nacl.gyp
+++ b/components/nacl.gyp
@@ -23,13 +23,13 @@
           # Test files are also not included.
           'nacl/loader/nacl_ipc_adapter.cc',
           'nacl/loader/nacl_ipc_adapter.h',
+          'nacl/loader/nacl_listener.cc',
+          'nacl/loader/nacl_listener.h',
           'nacl/loader/nacl_main.cc',
           'nacl/loader/nacl_main_platform_delegate.h',
           'nacl/loader/nacl_main_platform_delegate_linux.cc',
           'nacl/loader/nacl_main_platform_delegate_mac.mm',
           'nacl/loader/nacl_main_platform_delegate_win.cc',
-          'nacl/loader/nacl_listener.cc',
-          'nacl/loader/nacl_listener.h',
           'nacl/loader/nacl_trusted_listener.cc',
           'nacl/loader/nacl_trusted_listener.h',
           'nacl/loader/nacl_validation_db.h',
@@ -146,14 +146,14 @@
             'nacl/renderer/file_downloader.h',
             'nacl/renderer/histogram.cc',
             'nacl/renderer/histogram.h',
+            'nacl/renderer/json_manifest.cc',
+            'nacl/renderer/json_manifest.h',
             'nacl/renderer/manifest_downloader.cc',
             'nacl/renderer/manifest_downloader.h',
             'nacl/renderer/manifest_service_channel.cc',
             'nacl/renderer/manifest_service_channel.h',
             'nacl/renderer/nacl_helper.cc',
             'nacl/renderer/nacl_helper.h',
-            'nacl/renderer/json_manifest.cc',
-            'nacl/renderer/json_manifest.h',
             'nacl/renderer/nexe_load_manager.cc',
             'nacl/renderer/nexe_load_manager.h',
             'nacl/renderer/platform_info.cc',
@@ -250,6 +250,15 @@
                 'IN_NACL_HELPER=1',
               ],
               'sources': [
+                '../ppapi/nacl_irt/irt_manifest.h',
+                '../ppapi/nacl_irt/manifest_service.cc',
+                '../ppapi/nacl_irt/manifest_service.h',
+                '../ppapi/nacl_irt/plugin_main.cc',
+                '../ppapi/nacl_irt/plugin_main.h',
+                '../ppapi/nacl_irt/plugin_startup.cc',
+                '../ppapi/nacl_irt/plugin_startup.h',
+                '../ppapi/nacl_irt/ppapi_dispatcher.cc',
+                '../ppapi/nacl_irt/ppapi_dispatcher.h',
                 'nacl/loader/nonsfi/abi_conversion.cc',
                 'nacl/loader/nonsfi/abi_conversion.h',
                 'nacl/loader/nonsfi/elf_loader.cc',
@@ -276,15 +285,6 @@
                 'nacl/loader/nonsfi/nonsfi_sandbox.h',
                 'nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc',
                 'nacl/loader/sandbox_linux/nacl_sandbox_linux.cc',
-                '../ppapi/nacl_irt/irt_manifest.h',
-                '../ppapi/nacl_irt/manifest_service.cc',
-                '../ppapi/nacl_irt/manifest_service.h',
-                '../ppapi/nacl_irt/plugin_main.cc',
-                '../ppapi/nacl_irt/plugin_main.h',
-                '../ppapi/nacl_irt/plugin_startup.cc',
-                '../ppapi/nacl_irt/plugin_startup.h',
-                '../ppapi/nacl_irt/ppapi_dispatcher.cc',
-                '../ppapi/nacl_irt/ppapi_dispatcher.h',
               ],
               'dependencies': [
                 'nacl',
@@ -392,8 +392,8 @@
                 'nacl/common/nacl_constants.h',
                 'nacl/common/nacl_messages.cc',
                 'nacl/common/nacl_messages.h',
-                'nacl/common/nacl_renderer_messages.h',
                 'nacl/common/nacl_renderer_messages.cc',
+                'nacl/common/nacl_renderer_messages.h',
                 'nacl/common/nacl_types.cc',
                 'nacl/common/nacl_types.h',
                 'nacl/common/nacl_types_param_traits.cc',
@@ -474,15 +474,15 @@
         'nacl/common/nacl_cmd_line.h',
         'nacl/common/nacl_constants.cc',
         'nacl/common/nacl_constants.h',
-        'nacl/common/nacl_host_messages.h',
         'nacl/common/nacl_host_messages.cc',
+        'nacl/common/nacl_host_messages.h',
         'nacl/common/nacl_messages.cc',
         'nacl/common/nacl_messages.h',
         'nacl/common/nacl_nonsfi_util.cc',
         'nacl/common/nacl_nonsfi_util.h',
         'nacl/common/nacl_process_type.h',
-        'nacl/common/nacl_renderer_messages.h',
         'nacl/common/nacl_renderer_messages.cc',
+        'nacl/common/nacl_renderer_messages.h',
         'nacl/common/nacl_sandbox_type_mac.h',
         'nacl/common/nacl_types.cc',
         'nacl/common/nacl_types.h',
diff --git a/components/navigation_interception.gypi b/components/navigation_interception.gypi
index 9243452..3511201 100644
--- a/components/navigation_interception.gypi
+++ b/components/navigation_interception.gypi
@@ -25,8 +25,8 @@
         # Note: sources list duplicated in GN build.
         'navigation_interception/intercept_navigation_resource_throttle.cc',
         'navigation_interception/intercept_navigation_resource_throttle.h',
-        'navigation_interception/navigation_params.h',
         'navigation_interception/navigation_params.cc',
+        'navigation_interception/navigation_params.h',
       ],
       'conditions': [
         ['OS=="android"', {
@@ -39,8 +39,8 @@
             'navigation_interception/component_jni_registrar.h',
             'navigation_interception/intercept_navigation_delegate.cc',
             'navigation_interception/intercept_navigation_delegate.h',
-            'navigation_interception/navigation_params_android.h',
             'navigation_interception/navigation_params_android.cc',
+            'navigation_interception/navigation_params_android.h',
           ],
         }],
       ],
diff --git a/components/network_time.gypi b/components/network_time.gypi
index b432628..f7a8111 100644
--- a/components/network_time.gypi
+++ b/components/network_time.gypi
@@ -16,10 +16,10 @@
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
-        'network_time/network_time_tracker.cc',
-        'network_time/network_time_tracker.h',
         'network_time/network_time_pref_names.cc',
         'network_time/network_time_pref_names.h',
+        'network_time/network_time_tracker.cc',
+        'network_time/network_time_tracker.h',
       ],
     },
   ],
diff --git a/components/omnibox.gypi b/components/omnibox.gypi
index a2a89d1..2680cf0 100644
--- a/components/omnibox.gypi
+++ b/components/omnibox.gypi
@@ -31,8 +31,8 @@
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
-        'omnibox/answers_cache.h',
         'omnibox/answers_cache.cc',
+        'omnibox/answers_cache.h',
         'omnibox/autocomplete_input.cc',
         'omnibox/autocomplete_input.h',
         'omnibox/autocomplete_match.cc',
diff --git a/components/password_manager.gypi b/components/password_manager.gypi
index 977b167..ca7d7f7 100644
--- a/components/password_manager.gypi
+++ b/components/password_manager.gypi
@@ -29,7 +29,6 @@
         # Note: sources list duplicated in GN build.
         'password_manager/core/browser/affiliation_backend.cc',
         'password_manager/core/browser/affiliation_backend.h',
-        'password_manager/core/browser/affiliation_fetcher_delegate.h',
         'password_manager/core/browser/affiliation_database.cc',
         'password_manager/core/browser/affiliation_database.h',
         'password_manager/core/browser/affiliation_fetch_throttler.cc',
@@ -37,6 +36,7 @@
         'password_manager/core/browser/affiliation_fetch_throttler_delegate.h',
         'password_manager/core/browser/affiliation_fetcher.cc',
         'password_manager/core/browser/affiliation_fetcher.h',
+        'password_manager/core/browser/affiliation_fetcher_delegate.h',
         'password_manager/core/browser/affiliation_service.cc',
         'password_manager/core/browser/affiliation_service.h',
         'password_manager/core/browser/affiliation_utils.cc',
@@ -45,9 +45,9 @@
         'password_manager/core/browser/browser_save_password_progress_logger.h',
         'password_manager/core/browser/export/csv_writer.cc',
         'password_manager/core/browser/export/csv_writer.h',
-        'password_manager/core/browser/facet_manager_host.h',
         'password_manager/core/browser/facet_manager.cc',
         'password_manager/core/browser/facet_manager.h',
+        'password_manager/core/browser/facet_manager_host.h',
         'password_manager/core/browser/import/csv_reader.cc',
         'password_manager/core/browser/import/csv_reader.h',
         'password_manager/core/browser/log_receiver.h',
@@ -75,7 +75,7 @@
         'password_manager/core/browser/password_manager_metrics_util.cc',
         'password_manager/core/browser/password_manager_metrics_util.h',
         'password_manager/core/browser/password_manager_url_collection_experiment.cc',
-	'password_manager/core/browser/password_manager_url_collection_experiment.h',
+        'password_manager/core/browser/password_manager_url_collection_experiment.h',
         'password_manager/core/browser/password_store.cc',
         'password_manager/core/browser/password_store.h',
         'password_manager/core/browser/password_store_change.h',
diff --git a/components/pdf.gypi b/components/pdf.gypi
index 0c3b7ef..b2328ba 100644
--- a/components/pdf.gypi
+++ b/components/pdf.gypi
@@ -49,10 +49,10 @@
       'pdf_common',
     ],
     'sources': [
-      'pdf/renderer/pepper_pdf_host.cc',
-      'pdf/renderer/pepper_pdf_host.h',
       'pdf/renderer/pdf_resource_util.cc',
       'pdf/renderer/pdf_resource_util.h',
+      'pdf/renderer/pepper_pdf_host.cc',
+      'pdf/renderer/pepper_pdf_host.h',
       'pdf/renderer/ppb_pdf_impl.cc',
       'pdf/renderer/ppb_pdf_impl.h',
     ],
diff --git a/components/policy/policy_common.gypi b/components/policy/policy_common.gypi
index 674cfa9..95bdf7f 100644
--- a/components/policy/policy_common.gypi
+++ b/components/policy/policy_common.gypi
@@ -199,8 +199,8 @@
       # Chrome can always interface with the PolicyService without having
       # to #ifdef on ENABLE_CONFIGURATION_POLICY.
       'sources': [
-        'core/common/external_data_fetcher.h',
         'core/common/external_data_fetcher.cc',
+        'core/common/external_data_fetcher.h',
         'core/common/external_data_manager.h',
         'core/common/policy_map.cc',
         'core/common/policy_map.h',
diff --git a/components/printing.gypi b/components/printing.gypi
index c2e3d3e..d9244f0 100644
--- a/components/printing.gypi
+++ b/components/printing.gypi
@@ -16,9 +16,9 @@
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
       ],
       'sources': [
-        "printing/common/printing_param_traits_macros.h",
         "printing/common/print_messages.cc",
         "printing/common/print_messages.h",
+        "printing/common/printing_param_traits_macros.h",
       ],
     },{
        # GN: //components/printing/common:printing_renderer
@@ -54,10 +54,10 @@
         'printing_renderer',
       ],
       'sources': [
-        'printing/test/mock_printer.h',
         'printing/test/mock_printer.cc',
-        'printing/test/print_mock_render_thread.h',
+        'printing/test/mock_printer.h',
         'printing/test/print_mock_render_thread.cc',
+        'printing/test/print_mock_render_thread.h',
         'printing/test/print_test_content_renderer_client.cc',
         'printing/test/print_test_content_renderer_client.h',
       ],
diff --git a/components/proximity_auth.gypi b/components/proximity_auth.gypi
index 9cda532..34c6cbd 100644
--- a/components/proximity_auth.gypi
+++ b/components/proximity_auth.gypi
@@ -23,8 +23,8 @@
         "proximity_auth/bluetooth_connection_finder.cc",
         "proximity_auth/bluetooth_connection_finder.h",
         "proximity_auth/bluetooth_util.cc",
-        "proximity_auth/bluetooth_util_chromeos.cc",
         "proximity_auth/bluetooth_util.h",
+        "proximity_auth/bluetooth_util_chromeos.cc",
         "proximity_auth/client.cc",
         "proximity_auth/client.h",
         "proximity_auth/client_observer.h",
@@ -37,9 +37,9 @@
         "proximity_auth/remote_device.h",
         "proximity_auth/remote_status_update.cc",
         "proximity_auth/remote_status_update.h",
+        "proximity_auth/secure_context.h",
         "proximity_auth/switches.cc",
         "proximity_auth/switches.h",
-        "proximity_auth/secure_context.h",
         "proximity_auth/wire_message.cc",
         "proximity_auth/wire_message.h",
       ],
diff --git a/components/session_manager.gypi b/components/session_manager.gypi
index 592473d..828acaa 100644
--- a/components/session_manager.gypi
+++ b/components/session_manager.gypi
@@ -17,8 +17,8 @@
         'SESSION_IMPLEMENTATION',
       ],
       'sources': [
-        'session_manager/core/session_manager.h',
         'session_manager/core/session_manager.cc',
+        'session_manager/core/session_manager.h',
         'session_manager/session_manager_export.h',
       ],
       'conditions': [
diff --git a/components/signin.gypi b/components/signin.gypi
index 5970e8d..cdfcc61 100644
--- a/components/signin.gypi
+++ b/components/signin.gypi
@@ -12,12 +12,12 @@
         '..',
       ],
       'sources': [
+        'signin/core/common/profile_management_switches.cc',
+        'signin/core/common/profile_management_switches.h',
         'signin/core/common/signin_pref_names.cc',
         'signin/core/common/signin_pref_names.h',
         'signin/core/common/signin_switches.cc',
         'signin/core/common/signin_switches.h',
-        'signin/core/common/profile_management_switches.cc',
-        'signin/core/common/profile_management_switches.h',
       ],
     },
     {
@@ -67,10 +67,10 @@
         'signin/core/browser/signin_error_controller.h',
         'signin/core/browser/signin_internals_util.cc',
         'signin/core/browser/signin_internals_util.h',
-        'signin/core/browser/signin_manager_base.cc',
-        'signin/core/browser/signin_manager_base.h',
         'signin/core/browser/signin_manager.cc',
         'signin/core/browser/signin_manager.h',
+        'signin/core/browser/signin_manager_base.cc',
+        'signin/core/browser/signin_manager_base.h',
         'signin/core/browser/signin_manager_cookie_helper.cc',
         'signin/core/browser/signin_manager_cookie_helper.h',
         'signin/core/browser/signin_metrics.cc',
diff --git a/components/sync_driver.gypi b/components/sync_driver.gypi
index 820c393..9704592 100644
--- a/components/sync_driver.gypi
+++ b/components/sync_driver.gypi
@@ -59,11 +59,11 @@
         'sync_driver/pref_names.h',
         'sync_driver/proxy_data_type_controller.cc',
         'sync_driver/proxy_data_type_controller.h',
-        'sync_driver/sync_api_component_factory.h',
         'sync_driver/shared_change_processor.cc',
         'sync_driver/shared_change_processor.h',
         'sync_driver/shared_change_processor_ref.cc',
         'sync_driver/shared_change_processor_ref.h',
+        'sync_driver/sync_api_component_factory.h',
         'sync_driver/sync_frontend.cc',
         'sync_driver/sync_frontend.h',
         'sync_driver/sync_prefs.cc',
diff --git a/components/translate.gypi b/components/translate.gypi
index 80cfb1d..1d8c656 100644
--- a/components/translate.gypi
+++ b/components/translate.gypi
@@ -75,6 +75,8 @@
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
+        'translate/core/common/language_detection_details.cc',
+        'translate/core/common/language_detection_details.h',
         'translate/core/common/translate_constants.cc',
         'translate/core/common/translate_constants.h',
         'translate/core/common/translate_errors.h',
@@ -86,8 +88,6 @@
         'translate/core/common/translate_switches.h',
         'translate/core/common/translate_util.cc',
         'translate/core/common/translate_util.h',
-        'translate/core/common/language_detection_details.cc',
-        'translate/core/common/language_detection_details.h',
       ],
     },
     {
@@ -138,10 +138,10 @@
           ],
           'sources': [
             # Note: sources list duplicated in GN build.
-            'translate/content/browser/browser_cld_data_provider_factory.cc',
-            'translate/content/browser/browser_cld_data_provider_factory.h',
             'translate/content/browser/browser_cld_data_provider.cc',
             'translate/content/browser/browser_cld_data_provider.h',
+            'translate/content/browser/browser_cld_data_provider_factory.cc',
+            'translate/content/browser/browser_cld_data_provider_factory.h',
             'translate/content/browser/browser_cld_utils.cc',
             'translate/content/browser/browser_cld_utils.h',
             'translate/content/browser/content_translate_driver.cc',
@@ -166,12 +166,12 @@
           ],
           'sources': [
             # Note: sources list duplicated in GN build.
-            'translate/content/common/translate_messages.cc',
-            'translate/content/common/translate_messages.h',
             'translate/content/common/cld_data_source.cc',
             'translate/content/common/cld_data_source.h',
             'translate/content/common/data_file_cld_data_provider_messages.cc',
             'translate/content/common/data_file_cld_data_provider_messages.h',
+            'translate/content/common/translate_messages.cc',
+            'translate/content/common/translate_messages.h',
            ],
         },
         {
@@ -195,16 +195,16 @@
           ],
           'sources': [
             # Note: sources list duplicated in GN build.
-            'translate/content/renderer/renderer_cld_data_provider_factory.cc',
-            'translate/content/renderer/renderer_cld_data_provider_factory.h',
+            'translate/content/renderer/data_file_renderer_cld_data_provider.cc',
+            'translate/content/renderer/data_file_renderer_cld_data_provider.h',
             'translate/content/renderer/renderer_cld_data_provider.cc',
             'translate/content/renderer/renderer_cld_data_provider.h',
+            'translate/content/renderer/renderer_cld_data_provider_factory.cc',
+            'translate/content/renderer/renderer_cld_data_provider_factory.h',
             'translate/content/renderer/renderer_cld_utils.cc',
             'translate/content/renderer/renderer_cld_utils.h',
             'translate/content/renderer/translate_helper.cc',
             'translate/content/renderer/translate_helper.h',
-            'translate/content/renderer/data_file_renderer_cld_data_provider.cc',
-            'translate/content/renderer/data_file_renderer_cld_data_provider.h',
            ],
           'conditions': [
             ['cld_version==0 or cld_version==2', {
@@ -236,12 +236,12 @@
           'sources': [
             'translate/ios/browser/ios_translate_driver.h',
             'translate/ios/browser/ios_translate_driver.mm',
-            'translate/ios/browser/language_detection_controller.h',
-            'translate/ios/browser/language_detection_controller.mm',
             'translate/ios/browser/js_language_detection_manager.h',
             'translate/ios/browser/js_language_detection_manager.mm',
             'translate/ios/browser/js_translate_manager.h',
             'translate/ios/browser/js_translate_manager.mm',
+            'translate/ios/browser/language_detection_controller.h',
+            'translate/ios/browser/language_detection_controller.mm',
             'translate/ios/browser/translate_controller.h',
             'translate/ios/browser/translate_controller.mm',
           ],
diff --git a/components/update_client.gypi b/components/update_client.gypi
index 7e8cda1..b35dd68 100644
--- a/components/update_client.gypi
+++ b/components/update_client.gypi
@@ -31,23 +31,23 @@
         'update_client/component_patcher_operation.h',
         'update_client/component_unpacker.cc',
         'update_client/component_unpacker.h',
-        'update_client/ping_manager.cc',
-        'update_client/ping_manager.h',
-        'update_client/crx_update_item.h',
         'update_client/crx_downloader.cc',
         'update_client/crx_downloader.h',
+        'update_client/crx_update_item.h',
+        'update_client/ping_manager.cc',
+        'update_client/ping_manager.h',
         'update_client/request_sender.cc',
         'update_client/request_sender.h',
         'update_client/update_checker.cc',
         'update_client/update_checker.h',
         'update_client/update_client.cc',
         'update_client/update_client.h',
-        'update_client/update_response.cc',
-        'update_client/update_response.h',
         'update_client/update_query_params.cc',
         'update_client/update_query_params.h',
         'update_client/update_query_params_delegate.cc',
         'update_client/update_query_params_delegate.h',
+        'update_client/update_response.cc',
+        'update_client/update_response.h',
         'update_client/url_fetcher_downloader.cc',
         'update_client/url_fetcher_downloader.h',
         'update_client/utils.cc',
diff --git a/components/user_manager.gypi b/components/user_manager.gypi
index dac32c3..027e415 100644
--- a/components/user_manager.gypi
+++ b/components/user_manager.gypi
@@ -8,8 +8,8 @@
     'user_manager_shared_sources': [
       'user_manager/empty_user_info.cc',
       'user_manager/empty_user_info.h',
-      'user_manager/user_info.h',
       'user_manager/user_info.cc',
+      'user_manager/user_info.h',
       'user_manager/user_info_impl.cc',
       'user_manager/user_info_impl.h',
       'user_manager/user_manager_export.h',
@@ -17,12 +17,12 @@
     # Chrome OS user_manager sources.
     'user_manager_chromeos_sources': [
       'user_manager/remove_user_delegate.h',
+      'user_manager/user.cc',
+      'user_manager/user.h',
       'user_manager/user_image/default_user_images.cc',
       'user_manager/user_image/default_user_images.h',
       'user_manager/user_image/user_image.cc',
       'user_manager/user_image/user_image.h',
-      'user_manager/user.cc',
-      'user_manager/user.h',
       'user_manager/user_manager.cc',
       'user_manager/user_manager.h',
       'user_manager/user_manager_base.cc',
diff --git a/components/webdata.gypi b/components/webdata.gypi
index 478a59c..d82f846 100644
--- a/components/webdata.gypi
+++ b/components/webdata.gypi
@@ -19,12 +19,6 @@
         'WEBDATA_IMPLEMENTATION',
       ],
       'sources': [
-        'webdata/common/web_database.cc',
-        'webdata/common/web_database.h',
-        'webdata/common/web_database_service.cc',
-        'webdata/common/web_database_service.h',
-        'webdata/common/web_database_table.cc',
-        'webdata/common/web_database_table.h',
         'webdata/common/web_data_request_manager.cc',
         'webdata/common/web_data_request_manager.h',
         'webdata/common/web_data_results.h',
@@ -33,6 +27,12 @@
         'webdata/common/web_data_service_base.cc',
         'webdata/common/web_data_service_base.h',
         'webdata/common/web_data_service_consumer.h',
+        'webdata/common/web_database.cc',
+        'webdata/common/web_database.h',
+        'webdata/common/web_database_service.cc',
+        'webdata/common/web_database_service.h',
+        'webdata/common/web_database_table.cc',
+        'webdata/common/web_database_table.h',
         'webdata/common/webdata_constants.cc',
         'webdata/common/webdata_constants.h',
         'webdata/common/webdata_export.h'