Split the chrome_browser.gypi source list a bit more

This is a follow-up to https://codereview.chromium.org/725343003 to
pull out a few more blocks of sources that are currently needed for
downstream iOS.

BUG=432994

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

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

1 files changed, 87 insertions, 75 deletions

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 90663e9..c45032b 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -152,19 +152,6 @@
       'browser/bitmap_fetcher_delegate.h',
       'browser/browser_about_handler.cc',
       'browser/browser_about_handler.h',
-      'browser/browser_process.cc',
-      'browser/browser_process.h',
-      'browser/browser_process_impl.cc',
-      'browser/browser_process_impl.h',
-      'browser/browser_process_platform_part.h',
-      'browser/browser_process_platform_part_android.cc',
-      'browser/browser_process_platform_part_android.h',
-      'browser/browser_process_platform_part_base.cc',
-      'browser/browser_process_platform_part_base.h',
-      'browser/browser_process_platform_part_chromeos.cc',
-      'browser/browser_process_platform_part_chromeos.h',
-      'browser/browser_process_platform_part_mac.h',
-      'browser/browser_process_platform_part_mac.mm',
       'browser/browser_shutdown.cc',
       'browser/browser_shutdown.h',
       'browser/browser_util_win.cc',
@@ -248,28 +235,6 @@
       'browser/component_updater/sw_reporter_installer_win.h',
       'browser/component_updater/swiftshader_component_installer.cc',
       'browser/component_updater/swiftshader_component_installer.h',
-      'browser/content_settings/chrome_content_settings_client.cc',
-      'browser/content_settings/chrome_content_settings_client.h',
-      'browser/content_settings/chrome_content_settings_utils.cc',
-      'browser/content_settings/chrome_content_settings_utils.h',
-      'browser/content_settings/content_settings_usages_state.cc',
-      'browser/content_settings/content_settings_usages_state.h',
-      'browser/content_settings/cookie_settings.cc',
-      'browser/content_settings/cookie_settings.h',
-      'browser/content_settings/local_shared_objects_container.cc',
-      'browser/content_settings/local_shared_objects_container.h',
-      'browser/content_settings/permission_bubble_request_impl.cc',
-      'browser/content_settings/permission_bubble_request_impl.h',
-      'browser/content_settings/permission_context_base.cc',
-      'browser/content_settings/permission_context_base.h',
-      'browser/content_settings/permission_context_uma_util.cc',
-      'browser/content_settings/permission_context_uma_util.h',
-      'browser/content_settings/permission_infobar_delegate.cc',
-      'browser/content_settings/permission_infobar_delegate.h',
-      'browser/content_settings/permission_queue_controller.cc',
-      'browser/content_settings/permission_queue_controller.h',
-      'browser/content_settings/tab_specific_content_settings.cc',
-      'browser/content_settings/tab_specific_content_settings.h',
       'browser/crash_upload_list.cc',
       'browser/crash_upload_list.h',
       'browser/crash_upload_list_win.cc',
@@ -614,20 +579,6 @@
       'browser/search/suggestions/suggestions_service_factory.h',
       'browser/search/suggestions/suggestions_source.cc',
       'browser/search/suggestions/suggestions_source.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',
-      'browser/sessions/session_tab_helper.cc',
-      'browser/sessions/session_tab_helper.h',
-      'browser/sessions/tab_restore_service.cc',
-      'browser/sessions/tab_restore_service.h',
-      'browser/sessions/tab_restore_service_factory.cc',
-      'browser/sessions/tab_restore_service_factory.h',
-      'browser/sessions/tab_restore_service_helper.cc',
-      'browser/sessions/tab_restore_service_helper.h',
       'browser/shell_integration.cc',
       'browser/shell_integration.h',
       'browser/shell_integration_android.cc',
@@ -650,17 +601,6 @@
       'browser/speech/tts_message_filter.cc',
       'browser/speech/tts_message_filter.h',
       'browser/speech/tts_win.cc',
-      'browser/ssl/chrome_ssl_host_state_delegate.cc',
-      'browser/ssl/chrome_ssl_host_state_delegate.h',
-      'browser/ssl/chrome_ssl_host_state_delegate_factory.cc',
-      'browser/ssl/chrome_ssl_host_state_delegate_factory.h',
-      '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/status_icons/status_icon.cc',
       'browser/status_icons/status_icon.h',
       'browser/status_icons/status_icon_menu_model.cc',
@@ -1006,6 +946,45 @@
       'browser/enhanced_bookmarks/enhanced_bookmark_model_factory.cc',
       'browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h',
     ],
+    'chrome_browser_browser_process_sources': [
+      'browser/browser_process.cc',
+      'browser/browser_process.h',
+      'browser/browser_process_impl.cc',
+      'browser/browser_process_impl.h',
+      'browser/browser_process_platform_part.h',
+      'browser/browser_process_platform_part_android.cc',
+      'browser/browser_process_platform_part_android.h',
+      'browser/browser_process_platform_part_base.cc',
+      'browser/browser_process_platform_part_base.h',
+      'browser/browser_process_platform_part_chromeos.cc',
+      'browser/browser_process_platform_part_chromeos.h',
+      'browser/browser_process_platform_part_mac.h',
+      'browser/browser_process_platform_part_mac.mm',
+    ],
+    'chrome_browser_content_settings_sources': [
+      'browser/content_settings/chrome_content_settings_client.cc',
+      'browser/content_settings/chrome_content_settings_client.h',
+      'browser/content_settings/chrome_content_settings_utils.cc',
+      'browser/content_settings/chrome_content_settings_utils.h',
+      'browser/content_settings/content_settings_usages_state.cc',
+      'browser/content_settings/content_settings_usages_state.h',
+      'browser/content_settings/cookie_settings.cc',
+      'browser/content_settings/cookie_settings.h',
+      'browser/content_settings/local_shared_objects_container.cc',
+      'browser/content_settings/local_shared_objects_container.h',
+      'browser/content_settings/permission_bubble_request_impl.cc',
+      'browser/content_settings/permission_bubble_request_impl.h',
+      'browser/content_settings/permission_context_base.cc',
+      'browser/content_settings/permission_context_base.h',
+      'browser/content_settings/permission_context_uma_util.cc',
+      'browser/content_settings/permission_context_uma_util.h',
+      'browser/content_settings/permission_infobar_delegate.cc',
+      'browser/content_settings/permission_infobar_delegate.h',
+      'browser/content_settings/permission_queue_controller.cc',
+      'browser/content_settings/permission_queue_controller.h',
+      'browser/content_settings/tab_specific_content_settings.cc',
+      'browser/content_settings/tab_specific_content_settings.h',
+    ],
     'chrome_browser_favicon_sources': [
       'browser/favicon/chrome_favicon_client.cc',
       'browser/favicon/chrome_favicon_client.h',
@@ -1486,6 +1465,37 @@
       'browser/services/gcm/push_messaging_service_impl.cc',
       'browser/services/gcm/push_messaging_service_impl.h',
     ],
+    'chrome_browser_session_sources': [
+      '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',
+      'browser/sessions/session_tab_helper.cc',
+      'browser/sessions/session_tab_helper.h',
+      'browser/sessions/tab_restore_service.cc',
+      'browser/sessions/tab_restore_service.h',
+      'browser/sessions/tab_restore_service_factory.cc',
+      'browser/sessions/tab_restore_service_factory.h',
+      'browser/sessions/tab_restore_service_helper.cc',
+      'browser/sessions/tab_restore_service_helper.h',
+    ],
+    'chrome_browser_session_service_sources': [
+      'browser/sessions/persistent_tab_restore_service.cc',
+      'browser/sessions/persistent_tab_restore_service.h',
+      'browser/sessions/session_restore.cc',
+      'browser/sessions/session_restore.h',
+      'browser/sessions/session_service.cc',
+      'browser/sessions/session_service.h',
+      'browser/sessions/session_service_factory.cc',
+      'browser/sessions/session_service_factory.h',
+      'browser/sessions/session_service_utils.cc',
+      'browser/sessions/session_service_utils.h',
+      'browser/sessions/tab_loader_delegate.cc',
+      'browser/sessions/tab_loader_delegate.h',
+      'browser/sessions/tab_loader_delegate_chromeos.cc',
+    ],
     'chrome_browser_signin_sources': [
       'browser/signin/about_signin_internals_factory.cc',
       'browser/signin/about_signin_internals_factory.h',
@@ -1518,6 +1528,19 @@
       'browser/signin/signin_tracker_factory.cc',
       'browser/signin/signin_tracker_factory.h',
     ],
+    'chrome_browser_ssl_sources': [
+      'browser/ssl/chrome_ssl_host_state_delegate.cc',
+      'browser/ssl/chrome_ssl_host_state_delegate.h',
+      'browser/ssl/chrome_ssl_host_state_delegate_factory.cc',
+      'browser/ssl/chrome_ssl_host_state_delegate_factory.h',
+      'browser/ssl/ssl_blocking_page.cc',
+      'browser/ssl/ssl_blocking_page.h',
+      'browser/ssl/ssl_client_certificate_selector.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',
+    ],
     'chrome_browser_sync_sources': [
       'browser/sync/about_sync_util.cc',
       'browser/sync/about_sync_util.h',
@@ -1918,21 +1941,6 @@
       'browser/printing/pdf_to_emf_converter.cc',
       'browser/printing/pdf_to_emf_converter.h',
     ],
-    'chrome_browser_session_service_sources': [
-      'browser/sessions/persistent_tab_restore_service.cc',
-      'browser/sessions/persistent_tab_restore_service.h',
-      'browser/sessions/session_restore.cc',
-      'browser/sessions/session_restore.h',
-      'browser/sessions/session_service.cc',
-      'browser/sessions/session_service.h',
-      'browser/sessions/session_service_factory.cc',
-      'browser/sessions/session_service_factory.h',
-      'browser/sessions/session_service_utils.cc',
-      'browser/sessions/session_service_utils.h',
-      'browser/sessions/tab_loader_delegate.cc',
-      'browser/sessions/tab_loader_delegate.h',
-      'browser/sessions/tab_loader_delegate_chromeos.cc',
-    ],
     'chrome_browser_android_sources': [
       'browser/metrics/android_metrics_provider.cc',
       'browser/metrics/android_metrics_provider.h',
@@ -3010,6 +3018,8 @@
             '<@(chrome_browser_non_ios_sources)',
             '<@(chrome_browser_autocomplete_sources)',
             '<@(chrome_browser_bookmark_sources)',
+            '<@(chrome_browser_browser_process_sources)',
+            '<@(chrome_browser_content_settings_sources)',
             '<@(chrome_browser_favicon_sources)',
             '<@(chrome_browser_google_sources)',
             '<@(chrome_browser_history_sources)',
@@ -3021,7 +3031,9 @@
             '<@(chrome_browser_profiles_sources)',
             '<@(chrome_browser_search_engines_sources)',
             '<@(chrome_browser_services_sources)',
+            '<@(chrome_browser_session_sources)',
             '<@(chrome_browser_signin_sources)',
+            '<@(chrome_browser_ssl_sources)',
             '<@(chrome_browser_sync_sources)',
             '<@(chrome_browser_web_resource_sources)',