Cleanup: ASCII sort file lists in chrome_browser.gypi.

NOTRY=true

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

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

1 files changed, 129 insertions, 129 deletions

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 031eb5b..4ade20f 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -41,10 +41,10 @@
       'browser/android/chromium_application.h',
       'browser/android/content_view_util.cc',
       'browser/android/content_view_util.h',
-      'browser/android/dev_tools_server.cc',
-      'browser/android/dev_tools_server.h',
       'browser/android/dev_tools_manager_delegate_android.cc',
       'browser/android/dev_tools_manager_delegate_android.h',
+      'browser/android/dev_tools_server.cc',
+      'browser/android/dev_tools_server.h',
       'browser/android/dom_distiller/feedback_reporter_android.cc',
       'browser/android/dom_distiller/feedback_reporter_android.h',
       'browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc',
@@ -57,23 +57,23 @@
       'browser/android/find_in_page/find_in_page_bridge.h',
       'browser/android/foreign_session_helper.cc',
       'browser/android/foreign_session_helper.h',
+      'browser/android/google_location_settings_helper.h',
+      'browser/android/intent_helper.cc',
+      'browser/android/intent_helper.h',
+      'browser/android/intercept_download_resource_throttle.cc',
+      'browser/android/intercept_download_resource_throttle.h',
       'browser/android/logo_bridge.cc',
       'browser/android/logo_bridge.h',
       'browser/android/logo_service.cc',
       'browser/android/logo_service.h',
       'browser/android/meta_tag_observer.cc',
       'browser/android/meta_tag_observer.h',
+      'browser/android/most_visited_sites.cc',
+      'browser/android/most_visited_sites.h',
       'browser/android/new_tab_page_prefs.cc',
       'browser/android/new_tab_page_prefs.h',
       'browser/android/new_tab_page_url_handler.cc',
       'browser/android/new_tab_page_url_handler.h',
-      'browser/android/google_location_settings_helper.h',
-      'browser/android/intent_helper.cc',
-      'browser/android/intent_helper.h',
-      'browser/android/intercept_download_resource_throttle.cc',
-      'browser/android/intercept_download_resource_throttle.h',
-      'browser/android/most_visited_sites.cc',
-      'browser/android/most_visited_sites.h',
       'browser/android/omnibox/answers_image_bridge.cc',
       'browser/android/omnibox/answers_image_bridge.h',
       'browser/android/omnibox/autocomplete_controller_android.cc',
@@ -95,9 +95,9 @@
       'browser/android/provider/run_on_ui_thread_blocking.h',
       'browser/android/recently_closed_tabs_bridge.cc',
       'browser/android/recently_closed_tabs_bridge.h',
+      'browser/android/resource_id.h',
       'browser/android/resource_mapper.cc',
       'browser/android/resource_mapper.h',
-      'browser/android/resource_id.h',
       'browser/android/shortcut_helper.cc',
       'browser/android/shortcut_helper.h',
       'browser/android/signin/account_management_screen_helper.cc',
@@ -131,10 +131,6 @@
       'browser/autocomplete/autocomplete_classifier.h',
       'browser/autocomplete/autocomplete_classifier_factory.cc',
       'browser/autocomplete/autocomplete_classifier_factory.h',
-      'browser/bitmap_fetcher/bitmap_fetcher_service.cc',
-      'browser/bitmap_fetcher/bitmap_fetcher_service.h',
-      'browser/bitmap_fetcher/bitmap_fetcher_service_factory.cc',
-      'browser/bitmap_fetcher/bitmap_fetcher_service_factory.h',
       'browser/autocomplete/autocomplete_controller.cc',
       'browser/autocomplete/autocomplete_controller.h',
       'browser/autocomplete/autocomplete_controller_delegate.h',
@@ -170,6 +166,10 @@
       'browser/autofill/validation_rules_storage_factory.h',
       'browser/bitmap_fetcher/bitmap_fetcher.cc',
       'browser/bitmap_fetcher/bitmap_fetcher.h',
+      'browser/bitmap_fetcher/bitmap_fetcher_service.cc',
+      'browser/bitmap_fetcher/bitmap_fetcher_service.h',
+      'browser/bitmap_fetcher/bitmap_fetcher_service_factory.cc',
+      'browser/bitmap_fetcher/bitmap_fetcher_service_factory.h',
       'browser/bitmap_fetcher_delegate.h',
       'browser/bookmarks/bookmark_model_factory.cc',
       'browser/bookmarks/bookmark_model_factory.h',
@@ -216,14 +216,14 @@
       'browser/browsing_data/browsing_data_indexed_db_helper.h',
       'browser/browsing_data/browsing_data_local_storage_helper.cc',
       'browser/browsing_data/browsing_data_local_storage_helper.h',
-      'browser/browsing_data/browsing_data_service_worker_helper.cc',
-      'browser/browsing_data/browsing_data_service_worker_helper.h',
       'browser/browsing_data/browsing_data_quota_helper.cc',
       'browser/browsing_data/browsing_data_quota_helper.h',
       'browser/browsing_data/browsing_data_quota_helper_impl.cc',
       'browser/browsing_data/browsing_data_quota_helper_impl.h',
       'browser/browsing_data/browsing_data_remover.cc',
       'browser/browsing_data/browsing_data_remover.h',
+      'browser/browsing_data/browsing_data_service_worker_helper.cc',
+      'browser/browsing_data/browsing_data_service_worker_helper.h',
       'browser/browsing_data/canonical_cookie_hash.cc',
       'browser/browsing_data/canonical_cookie_hash.h',
       'browser/browsing_data/cookies_tree_model.cc',
@@ -232,8 +232,6 @@
       'browser/browsing_data/local_data_container.h',
       'browser/character_encoding.cc',
       'browser/character_encoding.h',
-      'browser/chrome_net_benchmarking_message_filter.cc',
-      'browser/chrome_net_benchmarking_message_filter.h',
       'browser/chrome_browser_application_mac.h',
       'browser/chrome_browser_application_mac.mm',
       'browser/chrome_browser_field_trials.cc',
@@ -254,15 +252,17 @@
       'browser/chrome_content_browser_client_parts.h',
       'browser/chrome_elf_init_win.cc',
       'browser/chrome_elf_init_win.h',
+      'browser/chrome_net_benchmarking_message_filter.cc',
+      'browser/chrome_net_benchmarking_message_filter.h',
       'browser/chrome_notification_types.h',
       'browser/chrome_page_zoom.cc',
       'browser/chrome_page_zoom.h',
       'browser/chrome_page_zoom_constants.cc',
       'browser/chrome_page_zoom_constants.h',
-      'browser/chrome_select_file_dialog_factory_win.cc',
-      'browser/chrome_select_file_dialog_factory_win.h',
       'browser/chrome_quota_permission_context.cc',
       'browser/chrome_quota_permission_context.h',
+      'browser/chrome_select_file_dialog_factory_win.cc',
+      'browser/chrome_select_file_dialog_factory_win.h',
       'browser/command_observer.h',
       'browser/command_updater.cc',
       'browser/command_updater.h',
@@ -440,12 +440,16 @@
       'browser/global_keyboard_shortcuts_mac.mm',
       'browser/google/chrome_google_url_tracker_client.cc',
       'browser/google/chrome_google_url_tracker_client.h',
+      'browser/google/google_brand.cc',
+      'browser/google/google_brand.h',
+      'browser/google/google_brand_chromeos.cc',
+      'browser/google/google_brand_chromeos.h',
+      'browser/google/google_profile_helper.cc',
+      'browser/google/google_profile_helper.h',
       'browser/google/google_search_counter.cc',
       'browser/google/google_search_counter.h',
       'browser/google/google_search_counter_android.cc',
       'browser/google/google_search_counter_android.h',
-      'browser/google/google_profile_helper.cc',
-      'browser/google/google_profile_helper.h',
       'browser/google/google_update_settings_posix.cc',
       'browser/google/google_update_win.cc',
       'browser/google/google_update_win.h',
@@ -453,10 +457,6 @@
       'browser/google/google_url_tracker_factory.h',
       'browser/google/google_url_tracker_navigation_helper_impl.cc',
       'browser/google/google_url_tracker_navigation_helper_impl.h',
-      'browser/google/google_brand.cc',
-      'browser/google/google_brand.h',
-      'browser/google/google_brand_chromeos.cc',
-      'browser/google/google_brand_chromeos.h',
       'browser/gpu/gl_string_manager.cc',
       'browser/gpu/gl_string_manager.h',
       'browser/gpu/gpu_feature_checker.cc',
@@ -612,10 +612,10 @@
       'browser/lifetime/application_lifetime_android.h',
       'browser/lifetime/application_lifetime_mac.mm',
       'browser/lifetime/application_lifetime_win.cc',
-      'browser/mac/dock.h',
-      'browser/mac/dock.mm',
       'browser/mac/bluetooth_utility.h',
       'browser/mac/bluetooth_utility.mm',
+      'browser/mac/dock.h',
+      'browser/mac/dock.mm',
       'browser/mac/install_from_dmg.h',
       'browser/mac/install_from_dmg.mm',
       'browser/mac/keystone_glue.h',
@@ -803,8 +803,8 @@
       'browser/password_manager/chrome_password_manager_client.h',
       'browser/password_manager/password_manager_util.h',
       'browser/password_manager/password_manager_util_android.cc',
-      'browser/password_manager/password_manager_util_mac.mm',
       'browser/password_manager/password_manager_util_linux.cc',
+      'browser/password_manager/password_manager_util_mac.mm',
       'browser/password_manager/password_manager_util_win.cc',
       'browser/password_manager/password_store_factory.cc',
       'browser/password_manager/password_store_factory.h',
@@ -927,12 +927,12 @@
       'browser/prefs/tracked/tracked_split_preference.h',
       'browser/prerender/external_prerender_handler_android.cc',
       'browser/prerender/external_prerender_handler_android.h',
-      'browser/prerender/prerender_cookie_store.cc',
-      'browser/prerender/prerender_cookie_store.h',
       'browser/prerender/prerender_config.cc',
       'browser/prerender/prerender_config.h',
       'browser/prerender/prerender_contents.cc',
       'browser/prerender/prerender_contents.h',
+      'browser/prerender/prerender_cookie_store.cc',
+      'browser/prerender/prerender_cookie_store.h',
       'browser/prerender/prerender_events.cc',
       'browser/prerender/prerender_events.h',
       'browser/prerender/prerender_field_trial.cc',
@@ -1000,6 +1000,8 @@
       'browser/profiles/profile_android.h',
       'browser/profiles/profile_avatar_downloader.cc',
       'browser/profiles/profile_avatar_downloader.h',
+      'browser/profiles/profile_avatar_icon_util.cc',
+      'browser/profiles/profile_avatar_icon_util.h',
       'browser/profiles/profile_destroyer.cc',
       'browser/profiles/profile_destroyer.h',
       'browser/profiles/profile_downloader.cc',
@@ -1013,8 +1015,6 @@
       'browser/profiles/profile_info_cache.h',
       'browser/profiles/profile_info_cache_observer.h',
       'browser/profiles/profile_info_interface.h',
-      'browser/profiles/profile_avatar_icon_util.cc',
-      'browser/profiles/profile_avatar_icon_util.h',
       'browser/profiles/profile_io_data.cc',
       'browser/profiles/profile_io_data.h',
       'browser/profiles/profile_list.h',
@@ -1072,7 +1072,7 @@
       'browser/search/local_ntp_source.cc',
       'browser/search/local_ntp_source.h',
       'browser/search/most_visited_iframe_source.cc',
-      'browser/searuch/most_visited_iframe_source.h',
+      'browser/search/most_visited_iframe_source.h',
       'browser/search/search.cc',
       'browser/search/search.h',
       'browser/search/suggestions/image_fetcher_impl.cc',
@@ -1119,9 +1119,9 @@
       'browser/services/gcm/push_messaging_service_impl.h',
       'browser/sessions/base_session_service.cc',
       'browser/sessions/base_session_service.h',
+      'browser/sessions/base_session_service_delegate.h',
       'browser/sessions/base_session_service_delegate_impl.cc',
       'browser/sessions/base_session_service_delegate_impl.h',
-      'browser/sessions/base_session_service_delegate.h',
       'browser/sessions/session_data_deleter.cc',
       'browser/sessions/session_data_deleter.h',
       'browser/sessions/session_restore_android.cc',
@@ -1161,16 +1161,16 @@
       'browser/signin/profile_oauth2_token_service_factory.h',
       'browser/signin/screenlock_bridge.cc',
       'browser/signin/screenlock_bridge.h',
+      'browser/signin/signin_header_helper.cc',
+      'browser/signin/signin_header_helper.h',
       'browser/signin/signin_manager_factory.cc',
       'browser/signin/signin_manager_factory.h',
       'browser/signin/signin_names_io_thread.cc',
       'browser/signin/signin_names_io_thread.h',
-      'browser/signin/signin_header_helper.cc',
-      'browser/signin/signin_header_helper.h',
-      'browser/signin/signin_tracker_factory.cc',
-      'browser/signin/signin_tracker_factory.h',
       'browser/signin/signin_promo.cc',
       'browser/signin/signin_promo.h',
+      'browser/signin/signin_tracker_factory.cc',
+      'browser/signin/signin_tracker_factory.h',
       'browser/site_details.cc',
       'browser/site_details.h',
       'browser/speech/chrome_speech_recognition_manager_delegate.cc',
@@ -1182,10 +1182,10 @@
       'browser/speech/tts_controller_impl.cc',
       'browser/speech/tts_controller_impl.h',
       'browser/speech/tts_mac.mm',
-      'browser/speech/tts_platform.cc',
-      'browser/speech/tts_platform.h',
       'browser/speech/tts_message_filter.cc',
       'browser/speech/tts_message_filter.h',
+      'browser/speech/tts_platform.cc',
+      'browser/speech/tts_platform.h',
       'browser/speech/tts_win.cc',
       'browser/ssl/chrome_ssl_host_state_delegate.cc',
       'browser/ssl/chrome_ssl_host_state_delegate.h',
@@ -1194,10 +1194,10 @@
       'browser/ssl/ssl_blocking_page.cc',
       'browser/ssl/ssl_blocking_page.h',
       'browser/ssl/ssl_client_certificate_selector.h',
-      'browser/ssl/ssl_error_info.cc',
-      'browser/ssl/ssl_error_info.h',
       'browser/ssl/ssl_error_classification.cc',
       'browser/ssl/ssl_error_classification.h',
+      'browser/ssl/ssl_error_info.cc',
+      'browser/ssl/ssl_error_info.h',
       'browser/status_icons/status_icon.cc',
       'browser/status_icons/status_icon.h',
       'browser/status_icons/status_icon_menu_model.cc',
@@ -1213,8 +1213,6 @@
       'browser/sync/backend_unrecoverable_error_handler.h',
       'browser/sync/backup_rollback_controller.cc',
       'browser/sync/backup_rollback_controller.h',
-      'browser/sync/open_tabs_ui_delegate.cc',
-      'browser/sync/open_tabs_ui_delegate.h',
       'browser/sync/glue/autofill_data_type_controller.cc',
       'browser/sync/glue/autofill_data_type_controller.h',
       'browser/sync/glue/autofill_profile_data_type_controller.cc',
@@ -1280,6 +1278,8 @@
       'browser/sync/glue/typed_url_model_associator.h',
       'browser/sync/glue/ui_model_worker.cc',
       'browser/sync/glue/ui_model_worker.h',
+      'browser/sync/open_tabs_ui_delegate.cc',
+      'browser/sync/open_tabs_ui_delegate.h',
       'browser/sync/profile_sync_auth_provider.cc',
       'browser/sync/profile_sync_auth_provider.h',
       'browser/sync/profile_sync_components_factory.h',
@@ -1382,10 +1382,10 @@
     ],
     # Sources (generally "desktop OS importers") used only on Mac & Windows.
     'chrome_browser_win_mac_sources': [
-      'browser/media_galleries/fileapi/iapps_data_provider.cc',
-      'browser/media_galleries/fileapi/iapps_data_provider.h',
       'browser/media_galleries/fileapi/file_path_watcher_util.cc',
       'browser/media_galleries/fileapi/file_path_watcher_util.h',
+      'browser/media_galleries/fileapi/iapps_data_provider.cc',
+      'browser/media_galleries/fileapi/iapps_data_provider.h',
       'browser/media_galleries/fileapi/itunes_data_provider.cc',
       'browser/media_galleries/fileapi/itunes_data_provider.h',
       'browser/media_galleries/fileapi/itunes_file_util.cc',
@@ -1412,13 +1412,13 @@
       'browser/content_settings/content_settings_custom_extension_provider.h',
       'browser/content_settings/content_settings_internal_extension_provider.cc',
       'browser/content_settings/content_settings_internal_extension_provider.h',
-      'browser/drive/drive_app_registry.cc',
-      'browser/drive/drive_app_registry.h',
-      'browser/drive/drive_app_registry_observer.h',
       'browser/drive/drive_api_service.cc',
       'browser/drive/drive_api_service.h',
       'browser/drive/drive_api_util.cc',
       'browser/drive/drive_api_util.h',
+      'browser/drive/drive_app_registry.cc',
+      'browser/drive/drive_app_registry.h',
+      'browser/drive/drive_app_registry_observer.h',
       'browser/drive/drive_notification_manager.cc',
       'browser/drive/drive_notification_manager.h',
       'browser/drive/drive_notification_manager_factory.cc',
@@ -1609,8 +1609,8 @@
       'browser/background/background_contents_service_factory.h',
       'browser/background/background_mode_manager.cc',
       'browser/background/background_mode_manager.h',
-      'browser/background/background_mode_manager_chromeos.cc',
       'browser/background/background_mode_manager_aura.cc',
+      'browser/background/background_mode_manager_chromeos.cc',
       'browser/background/background_mode_manager_mac.mm',
       'browser/background/background_mode_manager_win.cc',
     ],
@@ -1701,10 +1701,10 @@
       'browser/plugins/plugin_data_remover_helper.h',
       'browser/plugins/plugin_finder.cc',
       'browser/plugins/plugin_finder.h',
-      'browser/plugins/plugin_infobar_delegates.cc',
-      'browser/plugins/plugin_infobar_delegates.h',
       'browser/plugins/plugin_info_message_filter.cc',
       'browser/plugins/plugin_info_message_filter.h',
+      'browser/plugins/plugin_infobar_delegates.cc',
+      'browser/plugins/plugin_infobar_delegates.h',
       'browser/plugins/plugin_metadata.cc',
       'browser/plugins/plugin_metadata.h',
       'browser/plugins/plugin_observer.cc',
@@ -1717,8 +1717,8 @@
       'browser/plugins/plugin_status_pref_setter.h',
       'browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc',
       'browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h',
-      'browser/renderer_host/pepper/device_id_fetcher.h',
       'browser/renderer_host/pepper/device_id_fetcher.cc',
+      'browser/renderer_host/pepper/device_id_fetcher.h',
       'browser/renderer_host/pepper/monitor_finder_mac.h',
       'browser/renderer_host/pepper/monitor_finder_mac.mm',
       'browser/renderer_host/pepper/pepper_broker_message_filter.cc',
@@ -1768,15 +1768,13 @@
       'browser/notifications/desktop_notification_service.h',
       'browser/notifications/desktop_notification_service_factory.cc',
       'browser/notifications/desktop_notification_service_factory.h',
-      'browser/notifications/message_center_notification_manager_win.cc',
-      'browser/notifications/notification.cc',
-      'browser/notifications/notification.h',
-      'browser/notifications/screen_lock_notification_blocker.cc',
-      'browser/notifications/screen_lock_notification_blocker.h',
       'browser/notifications/fullscreen_notification_blocker.cc',
       'browser/notifications/fullscreen_notification_blocker.h',
       'browser/notifications/login_state_notification_blocker_chromeos.cc',
       'browser/notifications/login_state_notification_blocker_chromeos.h',
+      'browser/notifications/message_center_notification_manager_win.cc',
+      'browser/notifications/notification.cc',
+      'browser/notifications/notification.h',
       'browser/notifications/notification_delegate.h',
       'browser/notifications/notification_object_proxy.cc',
       'browser/notifications/notification_object_proxy.h',
@@ -1785,6 +1783,8 @@
       'browser/notifications/notification_ui_manager.h',
       'browser/notifications/notification_ui_manager_android.cc',
       'browser/notifications/notification_ui_manager_android.h',
+      'browser/notifications/screen_lock_notification_blocker.cc',
+      'browser/notifications/screen_lock_notification_blocker.h',
     ],
     # Used on non-Android platforms when notifications are enabled.
     'chrome_browser_non_android_notifications_sources': [
@@ -1800,13 +1800,13 @@
       'browser/notifications/message_center_settings_controller.h',
       'browser/notifications/message_center_stats_collector.cc',
       'browser/notifications/message_center_stats_collector.h',
-      'browser/notifications/notification_conversion_helper.h',
       'browser/notifications/notification_conversion_helper.cc',
+      'browser/notifications/notification_conversion_helper.h',
       'browser/notifications/notification_ui_manager_desktop.cc',
       'browser/notifications/sync_notifier/chrome_notifier_service.cc',
+      'browser/notifications/sync_notifier/chrome_notifier_service.h',
       'browser/notifications/sync_notifier/chrome_notifier_service_factory.cc',
       'browser/notifications/sync_notifier/chrome_notifier_service_factory.h',
-      'browser/notifications/sync_notifier/chrome_notifier_service.h',
     ],
     'chrome_browser_themes_sources': [
       'browser/sync/glue/theme_data_type_controller.cc',
@@ -1818,9 +1818,9 @@
       'browser/themes/theme_properties.cc',
       'browser/themes/theme_properties.h',
       'browser/themes/theme_service.cc',
+      'browser/themes/theme_service.h',
       'browser/themes/theme_service_factory.cc',
       'browser/themes/theme_service_factory.h',
-      'browser/themes/theme_service.h',
       'browser/themes/theme_service_mac.mm',
       'browser/themes/theme_syncable_service.cc',
       'browser/themes/theme_syncable_service.h',
@@ -1849,15 +1849,11 @@
       'browser/printing/background_printing_manager.cc',
       'browser/printing/background_printing_manager.h',
       'browser/printing/cloud_print/cloud_print_proxy_service.cc',
+      'browser/printing/cloud_print/cloud_print_proxy_service.h',
       'browser/printing/cloud_print/cloud_print_proxy_service_factory.cc',
       'browser/printing/cloud_print/cloud_print_proxy_service_factory.h',
-      'browser/printing/cloud_print/cloud_print_proxy_service.h',
       'browser/printing/print_dialog_cloud.cc',
       'browser/printing/print_dialog_cloud.h',
-      'browser/printing/printer_manager_dialog.h',
-      'browser/printing/printer_manager_dialog_linux.cc',
-      'browser/printing/printer_manager_dialog_mac.mm',
-      'browser/printing/printer_manager_dialog_win.cc',
       'browser/printing/print_error_dialog.cc',
       'browser/printing/print_error_dialog.h',
       'browser/printing/print_preview_context_menu_observer.cc',
@@ -1871,6 +1867,10 @@
       'browser/printing/print_view_manager.cc',
       'browser/printing/print_view_manager.h',
       'browser/printing/print_view_manager_observer.h',
+      'browser/printing/printer_manager_dialog.h',
+      'browser/printing/printer_manager_dialog_linux.cc',
+      'browser/printing/printer_manager_dialog_mac.mm',
+      'browser/printing/printer_manager_dialog_win.cc',
       'browser/service_process/service_process_control.cc',
       'browser/service_process/service_process_control.h',
       'browser/service_process/service_process_control_mac.mm',
@@ -1894,6 +1894,12 @@
       'browser/sessions/session_service_factory.h',
     ],
     'chrome_browser_android_sources': [
+      'browser/media/protected_media_identifier_infobar_delegate.cc',
+      'browser/media/protected_media_identifier_infobar_delegate.h',
+      'browser/media/protected_media_identifier_permission_context.cc',
+      'browser/media/protected_media_identifier_permission_context.h',
+      'browser/media/protected_media_identifier_permission_context_factory.cc',
+      'browser/media/protected_media_identifier_permission_context_factory.h',
       'browser/metrics/android_metrics_provider.cc',
       'browser/metrics/android_metrics_provider.h',
       'browser/sessions/in_memory_tab_restore_service.cc',
@@ -1903,12 +1909,6 @@
       'browser/ssl/ssl_add_certificate_android.cc',
       'browser/web_resource/notification_promo_mobile_ntp.cc',
       'browser/web_resource/notification_promo_mobile_ntp.h',
-      'browser/media/protected_media_identifier_infobar_delegate.cc',
-      'browser/media/protected_media_identifier_infobar_delegate.h',
-      'browser/media/protected_media_identifier_permission_context.cc',
-      'browser/media/protected_media_identifier_permission_context.h',
-      'browser/media/protected_media_identifier_permission_context_factory.cc',
-      'browser/media/protected_media_identifier_permission_context_factory.h',
     ],
     # Used everywhere but Android.
     'chrome_browser_non_android_sources': [
@@ -1951,9 +1951,9 @@
       'browser/download/download_danger_prompt.cc',
       'browser/download/download_danger_prompt.h',
       'browser/download/download_shelf.cc',
+      'browser/download/download_shelf.h',
       'browser/download/download_shelf_context_menu.cc',
       'browser/download/download_shelf_context_menu.h',
-      'browser/download/download_shelf.h',
       'browser/external_protocol/external_protocol_observer.cc',
       'browser/external_protocol/external_protocol_observer.h',
       'browser/feedback/feedback_profile_observer.cc',
@@ -1970,8 +1970,8 @@
       'browser/feedback/system_logs/system_logs_fetcher_base.cc',
       'browser/feedback/system_logs/system_logs_fetcher_base.h',
       'browser/first_run/first_run.cc',
-      'browser/first_run/first_run_dialog.h',
       'browser/first_run/first_run.h',
+      'browser/first_run/first_run_dialog.h',
       'browser/first_run/first_run_internal.h',
       'browser/first_run/first_run_internal_linux.cc',
       'browser/first_run/first_run_internal_mac.mm',
@@ -2072,9 +2072,9 @@
       'browser/media_galleries/media_galleries_permission_controller.cc',
       'browser/media_galleries/media_galleries_permission_controller.h',
       'browser/media_galleries/media_galleries_preferences.cc',
+      'browser/media_galleries/media_galleries_preferences.h',
       'browser/media_galleries/media_galleries_preferences_factory.cc',
       'browser/media_galleries/media_galleries_preferences_factory.h',
-      'browser/media_galleries/media_galleries_preferences.h',
       'browser/media_galleries/media_galleries_scan_result_controller.cc',
       'browser/media_galleries/media_galleries_scan_result_controller.h',
       'browser/media_galleries/media_gallery_context_menu.cc',
@@ -2106,11 +2106,11 @@
       'browser/process_singleton_startup_lock.cc',
       'browser/process_singleton_startup_lock.h',
       'browser/profile_resetter/automatic_profile_resetter.cc',
+      'browser/profile_resetter/automatic_profile_resetter.h',
       'browser/profile_resetter/automatic_profile_resetter_delegate.cc',
       'browser/profile_resetter/automatic_profile_resetter_delegate.h',
       'browser/profile_resetter/automatic_profile_resetter_factory.cc',
       'browser/profile_resetter/automatic_profile_resetter_factory.h',
-      'browser/profile_resetter/automatic_profile_resetter.h',
       'browser/profile_resetter/automatic_profile_resetter_mementos.cc',
       'browser/profile_resetter/automatic_profile_resetter_mementos.h',
       'browser/profile_resetter/brandcode_config_fetcher.cc',
@@ -2326,9 +2326,9 @@
     ],
     'chrome_browser_undo_sources': [
       'browser/undo/bookmark_undo_service.cc',
+      'browser/undo/bookmark_undo_service.h',
       'browser/undo/bookmark_undo_service_factory.cc',
       'browser/undo/bookmark_undo_service_factory.h',
-      'browser/undo/bookmark_undo_service.h',
       'browser/undo/bookmark_undo_utils.cc',
       'browser/undo/bookmark_undo_utils.h',
       'browser/undo/undo_manager.cc',
@@ -2437,10 +2437,10 @@
     ],
     'chrome_browser_rlz_sources': [
       'browser/rlz/rlz.cc',
+      'browser/rlz/rlz.h',
       'browser/rlz/rlz_chromeos.cc',
       'browser/rlz/rlz_mac.cc',
       'browser/rlz/rlz_win.cc',
-      'browser/rlz/rlz.h',
     ],
     'chrome_browser_wifi_bootstrapping_sources': [
        'browser/local_discovery/wifi/bootstrapping_device_lister.cc',
@@ -2465,12 +2465,12 @@
       'browser/net/proxy_policy_handler.h',
       'browser/policy/cloud/cloud_policy_invalidator.cc',
       'browser/policy/cloud/cloud_policy_invalidator.h',
-      'browser/policy/cloud/policy_header_service_factory.h',
       'browser/policy/cloud/policy_header_service_factory.cc',
-      'browser/policy/cloud/user_cloud_policy_invalidator_factory.cc',
-      'browser/policy/cloud/user_cloud_policy_invalidator_factory.h',
+      'browser/policy/cloud/policy_header_service_factory.h',
       'browser/policy/cloud/user_cloud_policy_invalidator.cc',
       'browser/policy/cloud/user_cloud_policy_invalidator.h',
+      'browser/policy/cloud/user_cloud_policy_invalidator_factory.cc',
+      'browser/policy/cloud/user_cloud_policy_invalidator_factory.h',
       'browser/policy/configuration_policy_handler_list_factory.cc',
       'browser/policy/configuration_policy_handler_list_factory.h',
       'browser/policy/managed_bookmarks_policy_handler.cc',
@@ -2519,10 +2519,10 @@
     # Files to compile when configuration policy is disabled. Note that the
     # connector factory is also used when policy is enabled.
     'chrome_browser_policy_disabled_sources': [
-      'browser/policy/profile_policy_connector_stub.cc',
       'browser/policy/profile_policy_connector.h',
       'browser/policy/profile_policy_connector_factory.cc',
       'browser/policy/profile_policy_connector_factory.h',
+      'browser/policy/profile_policy_connector_stub.cc',
     ],
     # Policy sources used only on Android and iOS (CrOS not counted).
     'chrome_browser_policy_mobile_sources': [
@@ -2543,10 +2543,10 @@
     'chrome_browser_basic_safe_browsing_sources': [
       'browser/renderer_host/safe_browsing_resource_throttle_factory.cc',
       'browser/renderer_host/safe_browsing_resource_throttle_factory.h',
-      'browser/safe_browsing/malware_details_cache.cc',
-      'browser/safe_browsing/malware_details_cache.h',
       'browser/safe_browsing/malware_details.cc',
       'browser/safe_browsing/malware_details.h',
+      'browser/safe_browsing/malware_details_cache.cc',
+      'browser/safe_browsing/malware_details_cache.h',
       'browser/safe_browsing/malware_details_history.cc',
       'browser/safe_browsing/malware_details_history.h',
       'browser/safe_browsing/ping_manager.cc',
@@ -2609,12 +2609,12 @@
       'browser/safe_browsing/incident_reporting/environment_data_collection_win.h',
       'browser/safe_browsing/incident_reporting/incident_handler_util.cc',
       'browser/safe_browsing/incident_reporting/incident_handler_util.h',
-      'browser/safe_browsing/incident_reporting/incident_reporting_service.cc',
-      'browser/safe_browsing/incident_reporting/incident_reporting_service.h',
       'browser/safe_browsing/incident_reporting/incident_report_uploader.cc',
       'browser/safe_browsing/incident_reporting/incident_report_uploader.h',
       'browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc',
       'browser/safe_browsing/incident_reporting/incident_report_uploader_impl.h',
+      'browser/safe_browsing/incident_reporting/incident_reporting_service.cc',
+      'browser/safe_browsing/incident_reporting/incident_reporting_service.h',
       'browser/safe_browsing/incident_reporting/last_download_finder.cc',
       'browser/safe_browsing/incident_reporting/last_download_finder.h',
       'browser/safe_browsing/incident_reporting/module_integrity_verifier_win.cc',
@@ -2636,9 +2636,9 @@
       'browser/safe_browsing/safe_browsing_database.cc',
       'browser/safe_browsing/safe_browsing_database.h',
       'browser/safe_browsing/safe_browsing_store.cc',
+      'browser/safe_browsing/safe_browsing_store.h',
       'browser/safe_browsing/safe_browsing_store_file.cc',
       'browser/safe_browsing/safe_browsing_store_file.h',
-      'browser/safe_browsing/safe_browsing_store.h',
       'browser/safe_browsing/sandboxed_zip_analyzer.cc',
       'browser/safe_browsing/sandboxed_zip_analyzer.h',
       'browser/safe_browsing/two_phase_uploader.cc',
@@ -2662,10 +2662,10 @@
     'chrome_browser_non_chromeos_sources': [
       # TODO(brettw) it's suspicious that these _desktop.cc files are compiled
       # for Android. We should test removing them on Android.
-      'browser/profiles/avatar_menu_desktop.cc',
-      'browser/profiles/avatar_menu_observer.h',
       'browser/profiles/avatar_menu_actions_desktop.cc',
       'browser/profiles/avatar_menu_actions_desktop.h',
+      'browser/profiles/avatar_menu_desktop.cc',
+      'browser/profiles/avatar_menu_observer.h',
       'browser/profiles/profile_list_desktop.cc',
       'browser/profiles/profile_list_desktop.h',
       'browser/signin/signin_global_error.cc',
@@ -2686,15 +2686,15 @@
       'browser/google/chrome_google_url_tracker_client.cc',
       'browser/google/chrome_google_url_tracker_client.h',
       'browser/google/google_brand.cc',
+      'browser/google/google_brand.h',
       'browser/google/google_brand_chromeos.cc',
       'browser/google/google_brand_chromeos.h',
-      'browser/google/google_brand.h',
       'browser/google/google_profile_helper.cc',
       'browser/google/google_profile_helper.h',
-      'browser/google/google_search_counter_android.cc',
-      'browser/google/google_search_counter_android.h',
       'browser/google/google_search_counter.cc',
       'browser/google/google_search_counter.h',
+      'browser/google/google_search_counter_android.cc',
+      'browser/google/google_search_counter_android.h',
       'browser/google/google_update_settings_posix.cc',
       'browser/google/google_update_win.cc',
       'browser/google/google_update_win.h',
@@ -2710,74 +2710,74 @@
     'chrome_browser_jni_sources': [
       'android/java/src/org/chromium/chrome/browser/AccessibilityUtil.java',
       'android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java',
+      'android/java/src/org/chromium/chrome/browser/BookmarksBridge.java',
+      'android/java/src/org/chromium/chrome/browser/CertificateViewer.java',
+      'android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java',
+      'android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java',
+      'android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java',
+      'android/java/src/org/chromium/chrome/browser/ChromiumApplication.java',
+      'android/java/src/org/chromium/chrome/browser/ContentViewUtil.java',
+      'android/java/src/org/chromium/chrome/browser/DevToolsServer.java',
+      'android/java/src/org/chromium/chrome/browser/EnhancedBookmarksBridge.java',
+      'android/java/src/org/chromium/chrome/browser/ForeignSessionHelper.java',
+      'android/java/src/org/chromium/chrome/browser/IntentHelper.java',
+      'android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java',
+      'android/java/src/org/chromium/chrome/browser/LogoBridge.java',
+      'android/java/src/org/chromium/chrome/browser/NavigationPopup.java',
+      'android/java/src/org/chromium/chrome/browser/NewTabPagePrefs.java',
+      'android/java/src/org/chromium/chrome/browser/PasswordUIView.java',
+      'android/java/src/org/chromium/chrome/browser/RecentlyClosedBridge.java',
+      'android/java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java',
+      'android/java/src/org/chromium/chrome/browser/ShortcutHelper.java',
+      'android/java/src/org/chromium/chrome/browser/Tab.java',
+      'android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java',
+      'android/java/src/org/chromium/chrome/browser/UmaBridge.java',
+      'android/java/src/org/chromium/chrome/browser/UmaUtils.java',
+      'android/java/src/org/chromium/chrome/browser/UrlUtilities.java',
+      'android/java/src/org/chromium/chrome/browser/VoiceSearchTabHelper.java',
+      'android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java',
+      'android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopupLegacy.java',
       'android/java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java',
       'android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerAndroid.java',
       'android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogResult.java',
       'android/java/src/org/chromium/chrome/browser/autofill/AutofillLogger.java',
       'android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupBridge.java',
       'android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java',
-      'android/java/src/org/chromium/chrome/browser/BookmarksBridge.java',
       'android/java/src/org/chromium/chrome/browser/banners/AppBannerManager.java',
-      'android/java/src/org/chromium/chrome/browser/CertificateViewer.java',
-      'android/java/src/org/chromium/chrome/browser/ChromiumApplication.java',
-      'android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java',
-      'android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java',
-      'android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java',
-      'android/java/src/org/chromium/chrome/browser/ContentViewUtil.java',
       'android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java',
       'android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuParams.java',
-      'android/java/src/org/chromium/chrome/browser/DevToolsServer.java',
       'android/java/src/org/chromium/chrome/browser/database/SQLiteCursor.java',
       'android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerFeedbackReporter.java',
       'android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerServiceFactory.java',
       'android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerTabUtils.java',
-      'android/java/src/org/chromium/chrome/browser/EnhancedBookmarksBridge.java',
       'android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java',
       'android/java/src/org/chromium/chrome/browser/findinpage/FindInPageBridge.java',
-      'android/java/src/org/chromium/chrome/browser/ForeignSessionHelper.java',
-      'android/java/src/org/chromium/chrome/browser/LogoBridge.java',
-      'android/java/src/org/chromium/chrome/browser/NewTabPagePrefs.java',
-      'android/java/src/org/chromium/chrome/browser/IntentHelper.java',
-      'android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java',
-      'android/java/src/org/chromium/chrome/browser/NavigationPopup.java',
+      'android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java',
+      'android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java',
+      'android/java/src/org/chromium/chrome/browser/infobar/DataReductionProxyInfoBarDelegate.java',
+      'android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java',
+      'android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java',
+      'android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBarDelegate.java',
+      'android/java/src/org/chromium/chrome/browser/invalidation/InvalidationServiceFactory.java',
       'android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java',
       'android/java/src/org/chromium/chrome/browser/omnibox/AnswersImage.java',
       'android/java/src/org/chromium/chrome/browser/omnibox/AutocompleteController.java',
       'android/java/src/org/chromium/chrome/browser/omnibox/OmniboxPrerender.java',
       'android/java/src/org/chromium/chrome/browser/omnibox/OmniboxViewUtil.java',
       'android/java/src/org/chromium/chrome/browser/password_manager/PasswordAuthenticationManager.java',
-      'android/java/src/org/chromium/chrome/browser/PasswordUIView.java',
       'android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java',
+      'android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java',
       'android/java/src/org/chromium/chrome/browser/profiles/MostVisitedSites.java',
       'android/java/src/org/chromium/chrome/browser/profiles/Profile.java',
       'android/java/src/org/chromium/chrome/browser/profiles/ProfileDownloader.java',
-      'android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java',
-      'android/java/src/org/chromium/chrome/browser/RecentlyClosedBridge.java',
-      'android/java/src/org/chromium/chrome/browser/ShortcutHelper.java',
-      'android/java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java',
       'android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java',
       'android/java/src/org/chromium/chrome/browser/signin/AccountManagementScreenHelper.java',
       'android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java',
       'android/java/src/org/chromium/chrome/browser/signin/SigninManager.java',
       'android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java',
       'android/java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java',
-      'android/java/src/org/chromium/chrome/browser/Tab.java',
-      'android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java',
-      'android/java/src/org/chromium/chrome/browser/UmaBridge.java',
-      'android/java/src/org/chromium/chrome/browser/UmaUtils.java',
-      'android/java/src/org/chromium/chrome/browser/UrlUtilities.java',
-      'android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java',
-      'android/java/src/org/chromium/chrome/browser/VoiceSearchTabHelper.java',
-      'android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java',
-      'android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopupLegacy.java',
-      'android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java',
-      'android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java',
-      'android/java/src/org/chromium/chrome/browser/infobar/DataReductionProxyInfoBarDelegate.java',
-      'android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java',
-      'android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java',
-      'android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBarDelegate.java',
-      'android/java/src/org/chromium/chrome/browser/invalidation/InvalidationServiceFactory.java',
       'android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java'
+      'android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java',
     ],
   },
   'targets': [