Inline chrome/browser sources in GN build.

chrome/browser/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/split_static_library.gni")
 import("//chrome/common/features.gni")
 import("//components/os_crypt/features.gni")
 import("//media/media_options.gni")
 import("//third_party/protobuf/proto_library.gni")
 
 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
 # produces a conflict for the "grit" template so we have to only include one.
 if (is_android) {
   import("//build/config/android/rules.gni")
 } else {
   import("//tools/grit/grit_rule.gni")
 }
 
 additional_modules_list_file =
     "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt"
 
-gypi_values = exec_script("//build/gypi_to_gn.py",
-                          [ rebase_path("../chrome_browser.gypi") ],
-                          "scope",
-                          [ "../chrome_browser.gypi" ])
-
 if (is_win) {
   # This is in a separate config so the flags can be applied to dependents.
   # ldflags in GN aren't automatically inherited.
   config("browser_win_linker_flags") {
     libs = [
       "credui.lib",
       "cryptui.lib",
       "dwmapi.lib",
       "netapi32.lib",
       "ndfapi.lib",  # Used by browser/net/net_error_diagnostics_dialog_win.h
@@ skipping 1386 matching lines @@
     "//ui/web_dialogs",
     "//v8",
   ]
   data_deps = []
 
   if (is_chromeos && use_cras) {
     defines += [ "USE_CRAS" ]
   }
 
   if (android_java_ui) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_sync_android_java_ui_sources,
-                    ".",
-                    "//chrome")
-    sources +=
-        rebase_path(gypi_values.chrome_browser_ssl_android_java_ui_sources,
-                    ".",
-                    "//chrome")
-    sources +=
-        rebase_path(gypi_values.chrome_browser_history_android_java_ui_sources,
-                    ".",
-                    "//chrome")
-    sources += rebase_path(
-            gypi_values.chrome_browser_permissions_android_java_ui_sources,
-            ".",
-            "//chrome")
-    sources += rebase_path(
-            gypi_values.chrome_browser_search_engines_android_java_ui_sources,
-            ".",
-            "//chrome")
+    sources += [
+      "history/android/android_history_provider_service.cc",
+      "history/android/android_history_provider_service.h",
+      "history/android/android_provider_backend.cc",
+      "history/android/android_provider_backend.h",
+      "history/android/bookmark_model_sql_handler.cc",
+      "history/android/bookmark_model_sql_handler.h",
+      "history/android/sqlite_cursor.cc",
+      "history/android/sqlite_cursor.h",
+      "permissions/grouped_permission_infobar_delegate.cc",
+      "permissions/grouped_permission_infobar_delegate.h",
+      "permissions/permission_update_infobar_delegate_android.cc",
+      "permissions/permission_update_infobar_delegate_android.h",
+      "search_engines/template_url_service_android.cc",
+      "search_engines/template_url_service_android.h",
+      "ssl/security_state_model_android.cc",
+      "ssl/security_state_model_android.h",
+      "sync/glue/synced_tab_delegate_android.cc",
+      "sync/glue/synced_tab_delegate_android.h",
+      "sync/glue/synced_window_delegate_android.cc",
+      "sync/glue/synced_window_delegate_android.h",
+      "sync/glue/synced_window_delegates_getter_android.cc",
+      "sync/glue/synced_window_delegates_getter_android.h",
+      "sync/profile_sync_service_android.cc",
+      "sync/profile_sync_service_android.h",
+      "sync/sync_sessions_metrics_android.cc",
+      "sync/sync_sessions_metrics_android.h",
+    ]
     if (enable_supervised_users) {
-      sources += rebase_path(
-              gypi_values.chrome_browser_supervised_user_android_java_ui_sources,
-              ".",
-              "//chrome")
+      sources += [
+        "supervised_user/child_accounts/child_account_feedback_reporter_android.cc",
+        "supervised_user/child_accounts/child_account_feedback_reporter_android.h",
+        "supervised_user/child_accounts/child_account_service_android.cc",
+        "supervised_user/child_accounts/child_account_service_android.h",
+      ]
     }
   }
 
   if (toolkit_views) {
     deps += [ "//ui/views" ]
   }
 
   if (is_win || is_mac) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_win_mac_sources, ".", "//chrome")
+    # Sources (generally "desktop OS importers") used only on Mac & Windows.
+    sources += [
+      "crash_upload_list/crash_upload_list_crashpad.cc",
+      "crash_upload_list/crash_upload_list_crashpad.h",
+      "media_galleries/fileapi/file_path_watcher_util.cc",
+      "media_galleries/fileapi/file_path_watcher_util.h",
+      "media_galleries/fileapi/iapps_data_provider.cc",
+      "media_galleries/fileapi/iapps_data_provider.h",
+      "media_galleries/fileapi/itunes_data_provider.cc",
+      "media_galleries/fileapi/itunes_data_provider.h",
+      "media_galleries/fileapi/itunes_file_util.cc",
+      "media_galleries/fileapi/itunes_file_util.h",
+      "media_galleries/fileapi/picasa_data_provider.cc",
+      "media_galleries/fileapi/picasa_data_provider.h",
+      "media_galleries/fileapi/picasa_file_util.cc",
+      "media_galleries/fileapi/picasa_file_util.h",
+      "media_galleries/fileapi/safe_iapps_library_parser.cc",
+      "media_galleries/fileapi/safe_iapps_library_parser.h",
+      "media_galleries/fileapi/safe_itunes_pref_parser_win.cc",
+      "media_galleries/fileapi/safe_itunes_pref_parser_win.h",
+      "media_galleries/fileapi/safe_picasa_album_table_reader.cc",
+      "media_galleries/fileapi/safe_picasa_album_table_reader.h",
+      "media_galleries/fileapi/safe_picasa_albums_indexer.cc",
+      "media_galleries/fileapi/safe_picasa_albums_indexer.h",
+      "recovery/recovery_install_global_error.cc",
+      "recovery/recovery_install_global_error.h",
+      "recovery/recovery_install_global_error_factory.cc",
+      "recovery/recovery_install_global_error_factory.h",
+    ]
   }
   if (!is_win && !is_mac) {
     sources += [ "net/net_error_diagnostics_dialog_generic.cc" ]
   }
   if (!is_android && !is_chromeos) {
     sources += [
       "net/disk_cache_dir_policy_handler.cc",
       "net/disk_cache_dir_policy_handler.h",
     ]
   }
   if (is_mac) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_mac_sources, ".", "//chrome")
+    sources += [
+      "media/window_icon_util_mac.mm",
+      "password_manager/password_manager_util_mac.h",
+      "password_manager/password_manager_util_mac.mm",
+    ]
     deps += [
       "//chrome/app_shim",
       "//chrome/browser/apps/app_shim",
     ]
   }
   if (enable_extensions) {
+    sources += [
+      "accessibility/accessibility_extension_api.cc",
+      "accessibility/accessibility_extension_api.h",
+      "accessibility/animation_policy_prefs.cc",
+      "accessibility/animation_policy_prefs.h",
+      "autocomplete/keyword_extensions_delegate_impl.cc",
+      "autocomplete/keyword_extensions_delegate_impl.h",
+      "browsing_data/hosted_apps_counter.cc",
+      "browsing_data/hosted_apps_counter.h",
+      "content_settings/content_settings_internal_extension_provider.cc",
+      "content_settings/content_settings_internal_extension_provider.h",
+      "drive/drive_notification_manager_factory.cc",
+      "drive/drive_notification_manager_factory.h",
+      "guest_view/app_view/chrome_app_view_guest_delegate.cc",
+      "guest_view/app_view/chrome_app_view_guest_delegate.h",
+      "guest_view/chrome_guest_view_manager_delegate.cc",
+      "guest_view/chrome_guest_view_manager_delegate.h",
+      "guest_view/extension_options/chrome_extension_options_guest_delegate.cc",
+      "guest_view/extension_options/chrome_extension_options_guest_delegate.h",
+      "guest_view/mime_handler_view/chrome_mime_handler_view_guest_delegate.cc",
+      "guest_view/mime_handler_view/chrome_mime_handler_view_guest_delegate.h",
+      "guest_view/web_view/chrome_web_view_guest_delegate.cc",
+      "guest_view/web_view/chrome_web_view_guest_delegate.h",
+      "guest_view/web_view/chrome_web_view_permission_helper_delegate.cc",
+      "guest_view/web_view/chrome_web_view_permission_helper_delegate.h",
+      "guest_view/web_view/context_menu_content_type_web_view.cc",
+      "guest_view/web_view/context_menu_content_type_web_view.h",
+      "media/capture_access_handler_base.cc",
+      "media/capture_access_handler_base.h",
+      "media/cast_transport_host_filter.cc",
+      "media/cast_transport_host_filter.h",
+      "media/desktop_capture_access_handler.cc",
+      "media/desktop_capture_access_handler.h",
+      "media/extension_media_access_handler.cc",
+      "media/extension_media_access_handler.h",
+      "media/tab_capture_access_handler.cc",
+      "media/tab_capture_access_handler.h",
+      "metrics/extensions_metrics_provider.cc",
+      "metrics/extensions_metrics_provider.h",
+      "renderer_context_menu/context_menu_content_type_app_mode.cc",
+      "renderer_context_menu/context_menu_content_type_app_mode.h",
+      "renderer_context_menu/context_menu_content_type_extension_popup.cc",
+      "renderer_context_menu/context_menu_content_type_extension_popup.h",
+      "renderer_context_menu/context_menu_content_type_platform_app.cc",
+      "renderer_context_menu/context_menu_content_type_platform_app.h",
+      "renderer_host/chrome_extension_message_filter.cc",
+      "renderer_host/chrome_extension_message_filter.h",
+      "search/hotword_audio_history_handler.cc",
+      "search/hotword_audio_history_handler.h",
+      "search/hotword_client.h",
+      "search/hotword_service.cc",
+      "search/hotword_service.h",
+      "search/hotword_service_factory.cc",
+      "search/hotword_service_factory.h",
+      "signin/chrome_proximity_auth_client.cc",
+      "signin/chrome_proximity_auth_client.h",
+      "signin/easy_unlock_app_manager.cc",
+      "signin/easy_unlock_app_manager.h",
+      "signin/easy_unlock_auth_attempt.cc",
+      "signin/easy_unlock_auth_attempt.h",
+      "signin/easy_unlock_metrics.cc",
+      "signin/easy_unlock_metrics.h",
+      "signin/easy_unlock_screenlock_state_handler.cc",
+      "signin/easy_unlock_screenlock_state_handler.h",
+      "signin/easy_unlock_service.cc",
+      "signin/easy_unlock_service.h",
+      "signin/easy_unlock_service_factory.cc",
+      "signin/easy_unlock_service_factory.h",
+      "signin/easy_unlock_service_regular.cc",
+      "signin/easy_unlock_service_regular.h",
+      "signin/easy_unlock_service_signin_chromeos.cc",
+      "signin/easy_unlock_service_signin_chromeos.h",
+      "speech/extension_api/tts_engine_extension_api.cc",
+      "speech/extension_api/tts_engine_extension_api.h",
+      "speech/extension_api/tts_engine_extension_observer.cc",
+      "speech/extension_api/tts_engine_extension_observer.h",
+      "speech/extension_api/tts_extension_api.cc",
+      "speech/extension_api/tts_extension_api.h",
+      "sync_file_system/conflict_resolution_policy.h",
+      "sync_file_system/drive_backend/callback_helper.h",
+      "sync_file_system/drive_backend/callback_tracker.cc",
+      "sync_file_system/drive_backend/callback_tracker.h",
+      "sync_file_system/drive_backend/callback_tracker_internal.cc",
+      "sync_file_system/drive_backend/callback_tracker_internal.h",
+      "sync_file_system/drive_backend/conflict_resolver.cc",
+      "sync_file_system/drive_backend/conflict_resolver.h",
+      "sync_file_system/drive_backend/drive_backend_constants.cc",
+      "sync_file_system/drive_backend/drive_backend_constants.h",
+      "sync_file_system/drive_backend/drive_backend_util.cc",
+      "sync_file_system/drive_backend/drive_backend_util.h",
+      "sync_file_system/drive_backend/drive_service_on_worker.cc",
+      "sync_file_system/drive_backend/drive_service_on_worker.h",
+      "sync_file_system/drive_backend/drive_service_wrapper.cc",
+      "sync_file_system/drive_backend/drive_service_wrapper.h",
+      "sync_file_system/drive_backend/drive_uploader_on_worker.cc",
+      "sync_file_system/drive_backend/drive_uploader_on_worker.h",
+      "sync_file_system/drive_backend/drive_uploader_wrapper.cc",
+      "sync_file_system/drive_backend/drive_uploader_wrapper.h",
+      "sync_file_system/drive_backend/folder_creator.cc",
+      "sync_file_system/drive_backend/folder_creator.h",
+      "sync_file_system/drive_backend/leveldb_wrapper.cc",
+      "sync_file_system/drive_backend/leveldb_wrapper.h",
+      "sync_file_system/drive_backend/list_changes_task.cc",
+      "sync_file_system/drive_backend/list_changes_task.h",
+      "sync_file_system/drive_backend/local_to_remote_syncer.cc",
+      "sync_file_system/drive_backend/local_to_remote_syncer.h",
+      "sync_file_system/drive_backend/metadata_database.cc",
+      "sync_file_system/drive_backend/metadata_database.h",
+      "sync_file_system/drive_backend/metadata_database_index.cc",
+      "sync_file_system/drive_backend/metadata_database_index.h",
+      "sync_file_system/drive_backend/metadata_database_index_interface.h",
+      "sync_file_system/drive_backend/metadata_database_index_on_disk.cc",
+      "sync_file_system/drive_backend/metadata_database_index_on_disk.h",
+      "sync_file_system/drive_backend/metadata_db_migration_util.cc",
+      "sync_file_system/drive_backend/metadata_db_migration_util.h",
+      "sync_file_system/drive_backend/register_app_task.cc",
+      "sync_file_system/drive_backend/register_app_task.h",
+      "sync_file_system/drive_backend/remote_change_processor_on_worker.cc",
+      "sync_file_system/drive_backend/remote_change_processor_on_worker.h",
+      "sync_file_system/drive_backend/remote_change_processor_wrapper.cc",
+      "sync_file_system/drive_backend/remote_change_processor_wrapper.h",
+      "sync_file_system/drive_backend/remote_to_local_syncer.cc",
+      "sync_file_system/drive_backend/remote_to_local_syncer.h",
+      "sync_file_system/drive_backend/sync_engine.cc",
+      "sync_file_system/drive_backend/sync_engine.h",
+      "sync_file_system/drive_backend/sync_engine_context.cc",
+      "sync_file_system/drive_backend/sync_engine_context.h",
+      "sync_file_system/drive_backend/sync_engine_initializer.cc",
+      "sync_file_system/drive_backend/sync_engine_initializer.h",
+      "sync_file_system/drive_backend/sync_task.cc",
+      "sync_file_system/drive_backend/sync_task.h",
+      "sync_file_system/drive_backend/sync_task_manager.cc",
+      "sync_file_system/drive_backend/sync_task_manager.h",
+      "sync_file_system/drive_backend/sync_task_token.cc",
+      "sync_file_system/drive_backend/sync_task_token.h",
+      "sync_file_system/drive_backend/sync_worker.cc",
+      "sync_file_system/drive_backend/sync_worker.h",
+      "sync_file_system/drive_backend/sync_worker_interface.h",
+      "sync_file_system/drive_backend/task_dependency_manager.cc",
+      "sync_file_system/drive_backend/task_dependency_manager.h",
+      "sync_file_system/drive_backend/tracker_id_set.cc",
+      "sync_file_system/drive_backend/tracker_id_set.h",
+      "sync_file_system/drive_backend/uninstall_app_task.cc",
+      "sync_file_system/drive_backend/uninstall_app_task.h",
+      "sync_file_system/file_change.cc",
+      "sync_file_system/file_change.h",
+      "sync_file_system/file_status_observer.h",
+      "sync_file_system/local/local_file_change_tracker.cc",
+      "sync_file_system/local/local_file_change_tracker.h",
+      "sync_file_system/local/local_file_sync_context.cc",
+      "sync_file_system/local/local_file_sync_context.h",
+      "sync_file_system/local/local_file_sync_service.cc",
+      "sync_file_system/local/local_file_sync_service.h",
+      "sync_file_system/local/local_file_sync_status.cc",
+      "sync_file_system/local/local_file_sync_status.h",
+      "sync_file_system/local/local_origin_change_observer.h",
+      "sync_file_system/local/root_delete_helper.cc",
+      "sync_file_system/local/root_delete_helper.h",
+      "sync_file_system/local/sync_file_system_backend.cc",
+      "sync_file_system/local/sync_file_system_backend.h",
+      "sync_file_system/local/syncable_file_operation_runner.cc",
+      "sync_file_system/local/syncable_file_operation_runner.h",
+      "sync_file_system/local/syncable_file_system_operation.cc",
+      "sync_file_system/local/syncable_file_system_operation.h",
+      "sync_file_system/local_change_processor.h",
+      "sync_file_system/logger.cc",
+      "sync_file_system/logger.h",
+      "sync_file_system/remote_change_processor.h",
+      "sync_file_system/remote_file_sync_service.cc",
+      "sync_file_system/remote_file_sync_service.h",
+      "sync_file_system/subtree_set.cc",
+      "sync_file_system/subtree_set.h",
+      "sync_file_system/sync_action.cc",
+      "sync_file_system/sync_action.h",
+      "sync_file_system/sync_callbacks.h",
+      "sync_file_system/sync_direction.h",
+      "sync_file_system/sync_event_observer.h",
+      "sync_file_system/sync_file_metadata.cc",
+      "sync_file_system/sync_file_metadata.h",
+      "sync_file_system/sync_file_status.h",
+      "sync_file_system/sync_file_system_service.cc",
+      "sync_file_system/sync_file_system_service.h",
+      "sync_file_system/sync_file_system_service_factory.cc",
+      "sync_file_system/sync_file_system_service_factory.h",
+      "sync_file_system/sync_file_type.h",
+      "sync_file_system/sync_operation_type.cc",
+      "sync_file_system/sync_operation_type.h",
+      "sync_file_system/sync_process_runner.cc",
+      "sync_file_system/sync_process_runner.h",
+      "sync_file_system/sync_service_state.h",
+      "sync_file_system/sync_status_code.cc",
+      "sync_file_system/sync_status_code.h",
+      "sync_file_system/syncable_file_system_util.cc",
+      "sync_file_system/syncable_file_system_util.h",
+      "sync_file_system/task_logger.cc",
+      "sync_file_system/task_logger.h",
+    ]
     public_deps += [ "//chrome/browser/extensions" ]
     allow_circular_includes_from += [ "//chrome/browser/extensions" ]
     deps += [
       "//chrome/browser/sync_file_system/drive_backend:sync_file_system_drive_proto",
       "//chrome/common/extensions/api",
       "//chrome/common/extensions/api:api_registration",
       "//chrome/common/extensions/api:extensions_features",
       "//components/drive",
       "//components/proximity_auth/ble",
       "//components/proximity_auth/cryptauth",
       "//extensions/components/javascript_dialog_extensions_client",
       "//media/cast:net",
     ]
-    sources += rebase_path(gypi_values.chrome_browser_extensions_sources,
-                           ".",
-                           "//chrome")
   }
   if (enable_background) {
-    sources += rebase_path(gypi_values.chrome_browser_background_sources,
-                           ".",
-                           "//chrome")
+    sources += [
+      "background/background_application_list_model.cc",
+      "background/background_application_list_model.h",
+      "background/background_contents_service.cc",
+      "background/background_contents_service.h",
+      "background/background_contents_service_factory.cc",
+      "background/background_contents_service_factory.h",
+      "background/background_mode_manager.cc",
+      "background/background_mode_manager.h",
+      "background/background_mode_manager_aura.cc",
+      "background/background_mode_manager_chromeos.cc",
+      "background/background_mode_manager_mac.mm",
+      "background/background_mode_manager_win.cc",
+      "background/background_mode_optimizer.cc",
+      "background/background_mode_optimizer.h",
+      "background/background_trigger.h",
+    ]
     if (!use_aura || is_win || is_chromeos) {
       sources -= [ "background/background_mode_manager_aura.cc" ]
     }
   }
   if (enable_task_manager) {
-    sources += rebase_path(gypi_values.chrome_browser_task_manager_sources,
-                           ".",
-                           "//chrome")
+    sources += [
+      "task_manager/providers/browser_process_task.cc",
+      "task_manager/providers/browser_process_task.h",
+      "task_manager/providers/browser_process_task_provider.cc",
+      "task_manager/providers/browser_process_task_provider.h",
+      "task_manager/providers/child_process_task.cc",
+      "task_manager/providers/child_process_task.h",
+      "task_manager/providers/child_process_task_provider.cc",
+      "task_manager/providers/child_process_task_provider.h",
+      "task_manager/providers/task.cc",
+      "task_manager/providers/task.h",
+      "task_manager/providers/task_provider.cc",
+      "task_manager/providers/task_provider.h",
+      "task_manager/providers/task_provider_observer.h",
+      "task_manager/providers/web_contents/background_contents_tag.cc",
+      "task_manager/providers/web_contents/background_contents_tag.h",
+      "task_manager/providers/web_contents/background_contents_task.cc",
+      "task_manager/providers/web_contents/background_contents_task.h",
+      "task_manager/providers/web_contents/devtools_tag.cc",
+      "task_manager/providers/web_contents/devtools_tag.h",
+      "task_manager/providers/web_contents/devtools_task.cc",
+      "task_manager/providers/web_contents/devtools_task.h",
+      "task_manager/providers/web_contents/extension_tag.cc",
+      "task_manager/providers/web_contents/extension_tag.h",
+      "task_manager/providers/web_contents/extension_task.cc",
+      "task_manager/providers/web_contents/extension_task.h",
+      "task_manager/providers/web_contents/guest_tag.cc",
+      "task_manager/providers/web_contents/guest_tag.h",
+      "task_manager/providers/web_contents/guest_task.cc",
+      "task_manager/providers/web_contents/guest_task.h",
+      "task_manager/providers/web_contents/prerender_tag.cc",
+      "task_manager/providers/web_contents/prerender_tag.h",
+      "task_manager/providers/web_contents/prerender_task.cc",
+      "task_manager/providers/web_contents/prerender_task.h",
+      "task_manager/providers/web_contents/printing_tag.cc",
+      "task_manager/providers/web_contents/printing_tag.h",
+      "task_manager/providers/web_contents/printing_task.cc",
+      "task_manager/providers/web_contents/printing_task.h",
+      "task_manager/providers/web_contents/renderer_task.cc",
+      "task_manager/providers/web_contents/renderer_task.h",
+      "task_manager/providers/web_contents/subframe_task.cc",
+      "task_manager/providers/web_contents/subframe_task.h",
+      "task_manager/providers/web_contents/tab_contents_tag.cc",
+      "task_manager/providers/web_contents/tab_contents_tag.h",
+      "task_manager/providers/web_contents/tab_contents_task.cc",
+      "task_manager/providers/web_contents/tab_contents_task.h",
+      "task_manager/providers/web_contents/web_contents_tag.cc",
+      "task_manager/providers/web_contents/web_contents_tag.h",
+      "task_manager/providers/web_contents/web_contents_tags_manager.cc",
+      "task_manager/providers/web_contents/web_contents_tags_manager.h",
+      "task_manager/providers/web_contents/web_contents_task_provider.cc",
+      "task_manager/providers/web_contents/web_contents_task_provider.h",
+      "task_manager/sampling/shared_sampler.h",
+      "task_manager/sampling/shared_sampler_posix.cc",
+      "task_manager/sampling/shared_sampler_win.cc",
+      "task_manager/sampling/task_group.cc",
+      "task_manager/sampling/task_group.h",
+      "task_manager/sampling/task_group_sampler.cc",
+      "task_manager/sampling/task_group_sampler.h",
+      "task_manager/sampling/task_manager_impl.cc",
+      "task_manager/sampling/task_manager_impl.h",
+      "task_manager/sampling/task_manager_io_thread_helper.cc",
+      "task_manager/sampling/task_manager_io_thread_helper.h",
+      "task_manager/task_manager_interface.cc",
+      "task_manager/task_manager_interface.h",
+      "task_manager/task_manager_observer.cc",
+      "task_manager/task_manager_observer.h",
+    ]
     if (is_chromeos) {
-      sources +=
-          rebase_path(gypi_values.chrome_browser_task_manager_chromeos_sources,
-                      ".",
-                      "//chrome")
+      sources += [
+        "task_manager/providers/arc/arc_process_task.cc",
+        "task_manager/providers/arc/arc_process_task.h",
+        "task_manager/providers/arc/arc_process_task_provider.cc",
+        "task_manager/providers/arc/arc_process_task_provider.h",
+      ]
     }
   }
   if (enable_spellcheck) {
-    sources += rebase_path(gypi_values.chrome_browser_spellchecker_sources,
-                           ".",
-                           "//chrome")
+    sources += [
+      "spellchecker/spellcheck_custom_dictionary.cc",
+      "spellchecker/spellcheck_custom_dictionary.h",
+      "spellchecker/spellcheck_dictionary.h",
+      "spellchecker/spellcheck_factory.cc",
+      "spellchecker/spellcheck_factory.h",
+      "spellchecker/spellcheck_hunspell_dictionary.cc",
+      "spellchecker/spellcheck_hunspell_dictionary.h",
+      "spellchecker/spellcheck_message_filter.cc",
+      "spellchecker/spellcheck_message_filter.h",
+      "spellchecker/spellcheck_message_filter_platform_mac.cc",
+      "spellchecker/spellcheck_service.cc",
+      "spellchecker/spellcheck_service.h",
+    ]
     deps += [
       "//components/spellcheck/browser",
       "//components/spellcheck/common:common",
     ]
 
     if (!is_android) {
       deps += [ "//third_party/hunspell" ]
     }
   }
   if (enable_nacl) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_nacl_sources, ".", "//chrome")
+    sources += [
+      "nacl_host/nacl_browser_delegate_impl.cc",
+      "nacl_host/nacl_browser_delegate_impl.h",
+      "nacl_host/nacl_infobar_delegate.cc",
+      "nacl_host/nacl_infobar_delegate.h",
+    ]
     deps += [ "//components/nacl/browser" ]
   }
 
   if (enable_plugins) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_plugins_sources, ".", "//chrome")
+    # See also the plugin_installation_sources list below.
+    sources += [
+      "browsing_data/browsing_data_flash_lso_helper.cc",
+      "browsing_data/browsing_data_flash_lso_helper.h",
+      "component_updater/pepper_flash_component_installer.cc",
+      "component_updater/pepper_flash_component_installer.h",
+      "metrics/plugin_metrics_provider.cc",
+      "metrics/plugin_metrics_provider.h",
+      "pepper_broker_infobar_delegate.cc",
+      "pepper_broker_infobar_delegate.h",
+      "pepper_flash_settings_manager.cc",
+      "pepper_flash_settings_manager.h",
+      "plugins/chrome_content_browser_client_plugins_part.cc",
+      "plugins/chrome_content_browser_client_plugins_part.h",
+      "plugins/chrome_plugin_service_filter.cc",
+      "plugins/chrome_plugin_service_filter.h",
+      "plugins/plugin_data_remover_helper.cc",
+      "plugins/plugin_data_remover_helper.h",
+      "plugins/plugin_filter_utils.cc",
+      "plugins/plugin_filter_utils.h",
+      "plugins/plugin_finder.cc",
+      "plugins/plugin_finder.h",
+      "plugins/plugin_info_message_filter.cc",
+      "plugins/plugin_info_message_filter.h",
+      "plugins/plugin_infobar_delegates.cc",
+      "plugins/plugin_infobar_delegates.h",
+      "plugins/plugin_metadata.cc",
+      "plugins/plugin_metadata.h",
+      "plugins/plugin_observer.cc",
+      "plugins/plugin_observer.h",
+      "plugins/plugin_prefs.cc",
+      "plugins/plugin_prefs.h",
+      "plugins/plugin_prefs_factory.cc",
+      "plugins/plugin_prefs_factory.h",
+      "plugins/plugin_status_pref_setter.cc",
+      "plugins/plugin_status_pref_setter.h",
+      "plugins/plugins_field_trial.cc",
+      "plugins/plugins_field_trial.h",
+      "renderer_host/pepper/chrome_browser_pepper_host_factory.cc",
+      "renderer_host/pepper/chrome_browser_pepper_host_factory.h",
+      "renderer_host/pepper/device_id_fetcher.cc",
+      "renderer_host/pepper/device_id_fetcher.h",
+      "renderer_host/pepper/monitor_finder_mac.h",
+      "renderer_host/pepper/monitor_finder_mac.mm",
+      "renderer_host/pepper/pepper_broker_message_filter.cc",
+      "renderer_host/pepper/pepper_broker_message_filter.h",
+      "renderer_host/pepper/pepper_flash_browser_host.cc",
+      "renderer_host/pepper/pepper_flash_browser_host.h",
+      "renderer_host/pepper/pepper_flash_clipboard_message_filter.cc",
+      "renderer_host/pepper/pepper_flash_clipboard_message_filter.h",
+      "renderer_host/pepper/pepper_flash_drm_host.cc",
+      "renderer_host/pepper/pepper_flash_drm_host.h",
+      "renderer_host/pepper/pepper_isolated_file_system_message_filter.cc",
+      "renderer_host/pepper/pepper_isolated_file_system_message_filter.h",
+      "renderer_host/pepper/pepper_output_protection_message_filter.cc",
+      "renderer_host/pepper/pepper_output_protection_message_filter.h",
+    ]
     deps += [
       "//components/pdf/browser",
       "//ppapi/proxy:ipc",
       "//third_party/adobe/flash:flapper_version_h",
     ]
   }
   if (safe_browsing_mode != 0) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_safe_browsing_basic_sources,
-                    ".",
-                    "//chrome")
+    # "Safe Browsing Basic" files used for safe browsing in full mode
+    # (safe_browsing=1) and mobile (=2)
+    sources += [
+      "renderer_host/data_reduction_proxy_resource_throttle_android.cc",
+      "renderer_host/data_reduction_proxy_resource_throttle_android.h",
+      "safe_browsing/mock_permission_report_sender.cc",
+      "safe_browsing/mock_permission_report_sender.h",
+      "safe_browsing/permission_reporter.cc",
+      "safe_browsing/permission_reporter.h",
+      "safe_browsing/ping_manager.cc",
+      "safe_browsing/ping_manager.h",
+      "safe_browsing/protocol_manager_helper.cc",
+      "safe_browsing/protocol_manager_helper.h",
+      "safe_browsing/safe_browsing_blocking_page.cc",
+      "safe_browsing/safe_browsing_blocking_page.h",
+      "safe_browsing/safe_browsing_service.cc",
+      "safe_browsing/safe_browsing_service.h",
+      "safe_browsing/services_delegate.h",
+      "safe_browsing/test_safe_browsing_service.cc",
+      "safe_browsing/test_safe_browsing_service.h",
+      "safe_browsing/threat_details.cc",
+      "safe_browsing/threat_details.h",
+      "safe_browsing/threat_details_cache.cc",
+      "safe_browsing/threat_details_cache.h",
+      "safe_browsing/threat_details_history.cc",
+      "safe_browsing/threat_details_history.h",
+      "safe_browsing/ui_manager.cc",
+      "safe_browsing/ui_manager.h",
+    ]
     deps += [
       "//chrome/browser/safe_browsing:chunk_proto",
       "//chrome/common/safe_browsing:proto",
       "//components/safe_browsing_db:metadata_proto",
     ]
     if (safe_browsing_mode == 1) {
-      sources +=
-          rebase_path(gypi_values.chrome_browser_safe_browsing_full_sources,
-                      ".",
-                      "//chrome")
+      # "Safe Browsing Full" files in addition to the "basic" ones to use for
+      # full safe browsing. This has some in common with "mobile."
+      sources += [
+        "download/download_completion_blocker.cc",
+        "download/download_completion_blocker.h",
+        "renderer_host/safe_browsing_resource_throttle.cc",
+        "renderer_host/safe_browsing_resource_throttle.h",
+        "safe_browsing/browser_feature_extractor.cc",
+        "safe_browsing/browser_feature_extractor.h",
+        "safe_browsing/browser_features.cc",
+        "safe_browsing/browser_features.h",
+        "safe_browsing/chunk_range.cc",
+        "safe_browsing/chunk_range.h",
+        "safe_browsing/client_side_detection_host.cc",
+        "safe_browsing/client_side_detection_host.h",
+        "safe_browsing/client_side_detection_service.cc",
+        "safe_browsing/client_side_detection_service.h",
+        "safe_browsing/client_side_model_loader.cc",
+        "safe_browsing/client_side_model_loader.h",
+        "safe_browsing/download_feedback.cc",
+        "safe_browsing/download_feedback.h",
+        "safe_browsing/download_feedback_service.cc",
+        "safe_browsing/download_feedback_service.h",
+        "safe_browsing/download_protection_service.cc",
+        "safe_browsing/download_protection_service.h",
+        "safe_browsing/incident_reporting/binary_integrity_analyzer.cc",
+        "safe_browsing/incident_reporting/binary_integrity_analyzer.h",
+        "safe_browsing/incident_reporting/binary_integrity_analyzer_mac.cc",
+        "safe_browsing/incident_reporting/binary_integrity_analyzer_win.cc",
+        "safe_browsing/incident_reporting/binary_integrity_incident.cc",
+        "safe_browsing/incident_reporting/binary_integrity_incident.h",
+        "safe_browsing/incident_reporting/blacklist_load_analyzer.cc",
+        "safe_browsing/incident_reporting/blacklist_load_analyzer.h",
+        "safe_browsing/incident_reporting/blacklist_load_analyzer_win.cc",
+        "safe_browsing/incident_reporting/blacklist_load_incident.cc",
+        "safe_browsing/incident_reporting/blacklist_load_incident.h",
+        "safe_browsing/incident_reporting/delayed_analysis_callback.h",
+        "safe_browsing/incident_reporting/delayed_callback_runner.cc",
+        "safe_browsing/incident_reporting/delayed_callback_runner.h",
+        "safe_browsing/incident_reporting/download_metadata_manager.cc",
+        "safe_browsing/incident_reporting/download_metadata_manager.h",
+        "safe_browsing/incident_reporting/environment_data_collection.cc",
+        "safe_browsing/incident_reporting/environment_data_collection.h",
+        "safe_browsing/incident_reporting/environment_data_collection_win.cc",
+        "safe_browsing/incident_reporting/environment_data_collection_win.h",
+        "safe_browsing/incident_reporting/extension_data_collection.cc",
+        "safe_browsing/incident_reporting/extension_data_collection.h",
+        "safe_browsing/incident_reporting/incident.cc",
+        "safe_browsing/incident_reporting/incident.h",
+        "safe_browsing/incident_reporting/incident_handler_util.cc",
+        "safe_browsing/incident_reporting/incident_handler_util.h",
+        "safe_browsing/incident_reporting/incident_receiver.h",
+        "safe_browsing/incident_reporting/incident_report_uploader.cc",
+        "safe_browsing/incident_reporting/incident_report_uploader.h",
+        "safe_browsing/incident_reporting/incident_report_uploader_impl.cc",
+        "safe_browsing/incident_reporting/incident_report_uploader_impl.h",
+        "safe_browsing/incident_reporting/incident_reporting_service.cc",
+        "safe_browsing/incident_reporting/incident_reporting_service.h",
+        "safe_browsing/incident_reporting/last_download_finder.cc",
+        "safe_browsing/incident_reporting/last_download_finder.h",
+        "safe_browsing/incident_reporting/module_integrity_verifier_win.cc",
+        "safe_browsing/incident_reporting/module_integrity_verifier_win.h",
+        "safe_browsing/incident_reporting/module_load_analyzer.cc",
+        "safe_browsing/incident_reporting/module_load_analyzer.h",
+        "safe_browsing/incident_reporting/module_load_analyzer_win.cc",
+        "safe_browsing/incident_reporting/platform_state_store.cc",
+        "safe_browsing/incident_reporting/platform_state_store.h",
+        "safe_browsing/incident_reporting/platform_state_store_win.cc",
+        "safe_browsing/incident_reporting/preference_validation_delegate.cc",
+        "safe_browsing/incident_reporting/preference_validation_delegate.h",
+        "safe_browsing/incident_reporting/resource_request_detector.cc",
+        "safe_browsing/incident_reporting/resource_request_detector.h",
+        "safe_browsing/incident_reporting/resource_request_incident.cc",
+        "safe_browsing/incident_reporting/resource_request_incident.h",
+        "safe_browsing/incident_reporting/state_store.cc",
+        "safe_browsing/incident_reporting/state_store.h",
+        "safe_browsing/incident_reporting/suspicious_module_incident.cc",
+        "safe_browsing/incident_reporting/suspicious_module_incident.h",
+        "safe_browsing/incident_reporting/tracked_preference_incident.cc",
+        "safe_browsing/incident_reporting/tracked_preference_incident.h",
+        "safe_browsing/incident_reporting/variations_seed_signature_analyzer.cc",
+        "safe_browsing/incident_reporting/variations_seed_signature_analyzer.h",
+        "safe_browsing/incident_reporting/variations_seed_signature_incident.cc",
+        "safe_browsing/incident_reporting/variations_seed_signature_incident.h",
+        "safe_browsing/local_database_manager.cc",
+        "safe_browsing/local_database_manager.h",
+        "safe_browsing/path_sanitizer.cc",
+        "safe_browsing/path_sanitizer.h",
+        "safe_browsing/protocol_manager.cc",
+        "safe_browsing/protocol_manager.h",
+        "safe_browsing/protocol_parser.cc",
+        "safe_browsing/protocol_parser.h",
+        "safe_browsing/safe_browsing_database.cc",
+        "safe_browsing/safe_browsing_database.h",
+        "safe_browsing/safe_browsing_store.cc",
+        "safe_browsing/safe_browsing_store.h",
+        "safe_browsing/safe_browsing_store_file.cc",
+        "safe_browsing/safe_browsing_store_file.h",
+        "safe_browsing/safe_browsing_util.cc",
+        "safe_browsing/safe_browsing_util.h",
+        "safe_browsing/sandboxed_dmg_analyzer_mac.cc",
+        "safe_browsing/sandboxed_dmg_analyzer_mac.h",
+        "safe_browsing/sandboxed_zip_analyzer.cc",
+        "safe_browsing/sandboxed_zip_analyzer.h",
+        "safe_browsing/services_delegate_impl.cc",
+        "safe_browsing/services_delegate_impl.h",
+        "safe_browsing/signature_evaluator_mac.h",
+        "safe_browsing/signature_evaluator_mac.mm",
+        "safe_browsing/two_phase_uploader.cc",
+        "safe_browsing/two_phase_uploader.h",
+      ]
       if (is_win) {
         deps += [ "//chrome/browser/safe_browsing/incident_reporting:state_store_data_proto" ]
       }
     } else if (safe_browsing_mode == 2) {
-      sources +=
-          rebase_path(gypi_values.chrome_browser_safe_browsing_mobile_sources,
-                      ".",
-                      "//chrome")
+      sources += [
+        "renderer_host/safe_browsing_resource_throttle.cc",
+        "renderer_host/safe_browsing_resource_throttle.h",
+        "safe_browsing/services_delegate_stub.cc",
+        "safe_browsing/services_delegate_stub.h",
+      ]
       deps += [ "//components/safe_browsing_db:safe_browsing_db_mobile" ]
     }
   }
 
   if (enable_hotwording) {
     defines += [ "ENABLE_HOTWORDING" ]
   }
 
   if (is_linux) {
     deps += [ "//device/media_transfer_protocol" ]
   }
 
   if (use_udev) {
     deps += [ "//device/udev_linux" ]
   }
 
   if (is_linux && !is_chromeos) {
     deps += [ "//third_party/speech-dispatcher" ]
   }
 
   if (is_chromeos) {
-    sources += rebase_path(gypi_values.chrome_browser_chromeos_sources,
-                           ".",
-                           "//chrome")
+    sources += [
+      "download/notification/download_item_notification.cc",
+      "download/notification/download_item_notification.h",
+      "download/notification/download_notification.cc",
+      "download/notification/download_notification.h",
+      "download/notification/download_notification_manager.cc",
+      "download/notification/download_notification_manager.h",
+      "media/protected_media_identifier_permission_context.cc",
+      "media/protected_media_identifier_permission_context.h",
+      "media/window_icon_util_chromeos.cc",
+      "metrics/chromeos_metrics_provider.cc",
+      "metrics/chromeos_metrics_provider.h",
+      "metrics/perf/cpu_identity.cc",
+      "metrics/perf/cpu_identity.h",
+      "metrics/perf/perf_output.cc",
+      "metrics/perf/perf_output.h",
+      "metrics/perf/random_selector.cc",
+      "metrics/perf/random_selector.h",
+      "metrics/perf/windowed_incognito_observer.cc",
+      "metrics/perf/windowed_incognito_observer.h",
+      "policy/default_geolocation_policy_handler.cc",
+      "policy/default_geolocation_policy_handler.h",
+
+      # This is technically also dependent on enable_plugins but we don"t
+      # support ChromeOS with enable_plugins==0.
+      "renderer_host/pepper/pepper_platform_verification_message_filter.cc",
+      "renderer_host/pepper/pepper_platform_verification_message_filter.h",
+    ]
     deps += [ "//chrome/browser/chromeos" ]
   } else {  # Non-ChromeOS.
-    sources += rebase_path(gypi_values.chrome_browser_non_chromeos_sources,
-                           ".",
-                           "//chrome")
+    sources += [
+      "policy/cloud/user_cloud_policy_manager_factory.cc",
+      "policy/cloud/user_cloud_policy_manager_factory.h",
+      "policy/cloud/user_policy_signin_service_base.cc",
+      "policy/cloud/user_policy_signin_service_base.h",
+      "policy/cloud/user_policy_signin_service_factory.cc",
+      "policy/cloud/user_policy_signin_service_factory.h",
+    ]
   }
 
   if (is_chromeos) {
     sources -= [
       "signin/chrome_signin_status_metrics_provider_delegate.cc",
       "signin/chrome_signin_status_metrics_provider_delegate.h",
     ]
   }
 
   if (is_chromeos) {
     sources += [
       "metrics/leak_detector/leak_detector_controller.cc",
       "metrics/leak_detector/leak_detector_controller.h",
       "metrics/leak_detector/leak_detector_remote_controller.cc",
       "metrics/leak_detector/leak_detector_remote_controller.h",
     ]
     public_deps += [
       "//components/metrics/leak_detector:interfaces",
       "//components/metrics/leak_detector:leak_detector",
     ]
   }
 
   if (use_cups) {
     configs += [ "//printing:cups" ]
   }
   if (use_gnome_keyring) {
-    sources += rebase_path(gypi_values.chrome_browser_gnome_keyring_sources,
-                           ".",
-                           "//chrome")
+    sources += [
+      "password_manager/native_backend_gnome_x.cc",
+      "password_manager/native_backend_gnome_x.h",
+    ]
     configs += [ "//components/os_crypt:gnome_keyring" ]
   }
   if (is_desktop_linux) {
-    sources += rebase_path(gypi_values.chrome_browser_libsecret_sources,
-                           ".",
-                           "//chrome")
+    sources += [
+      "password_manager/native_backend_libsecret.cc",
+      "password_manager/native_backend_libsecret.h",
+    ]
     defines += [ "USE_LIBSECRET" ]
     deps += [ "//third_party/libsecret" ]
   }
   if (use_aura) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_aura_sources, ".", "//chrome")
+    # Cross-platform Aura files.
+    sources += [
+      # This file is called _views but has Aura calls in it.
+      "download/drag_download_item_views.cc",
+      "lifetime/application_lifetime_aura.cc",
+      "platform_util_aura.cc",
+    ]
 
     # These files are only built in a GN build because they bring in
     # dependencies that don't build with GYP.
     sources += [
       "ui/views/frame/browser_frame_mus.cc",
       "ui/views/frame/browser_frame_mus.h",
       "ui/views/frame/browser_non_client_frame_view_mus.cc",
       "ui/views/frame/browser_non_client_frame_view_mus.h",
     ]
     deps += [
       "//content/public/common",
       "//services/ui/public/cpp",
       "//services/ui/public/cpp/input_devices",
       "//ui/aura",
       "//ui/compositor",
       "//ui/views/mus",
     ]
   }
   if (ui_compositor_image_transport) {
     deps += [ "//ui/gl" ]
   }
 
   if (use_ash) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_ash_sources, ".", "//chrome")
+    # Cross-platform Ash sources.
+    sources += [
+      "media/desktop_media_list_ash.cc",
+      "media/desktop_media_list_ash.h",
+      "renderer_context_menu/open_with_menu_factory_ash.cc",
+      "renderer_context_menu/open_with_menu_factory_ash.h",
+      "signin/signin_error_notifier_ash.cc",
+      "signin/signin_error_notifier_ash.h",
+      "signin/signin_error_notifier_factory_ash.cc",
+      "signin/signin_error_notifier_factory_ash.h",
+      "sync/sync_error_notifier_ash.cc",
+      "sync/sync_error_notifier_ash.h",
+      "sync/sync_error_notifier_factory_ash.cc",
+      "sync/sync_error_notifier_factory_ash.h",
+    ]
     deps += [ "//ash" ]
   }
 
   if (use_x11) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_x11_sources, ".", "//chrome")
+    sources += [
+      "chrome_browser_main_extra_parts_x11.cc",
+      "chrome_browser_main_extra_parts_x11.h",
+    ]
   } else {
     sources -= [ "password_manager/password_store_x.cc" ]
   }
   if (use_aura && !use_ozone && is_desktop_linux) {
     deps += [ "//chrome/browser/ui/libgtk2ui" ]
     allow_circular_includes_from += [ "//chrome/browser/ui/libgtk2ui" ]
   }
   if (is_posix && !is_mac) {
     sources += [
       "//chrome/app/chrome_crash_reporter_client.cc",
       "//chrome/app/chrome_crash_reporter_client.h",
     ]
     deps += [
       "//components/crash/content/app",
       "//components/crash/content/browser",
       "//components/version_info:generate_version_info",
     ]
   }
   if (use_nss_certs) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_nss_sources, ".", "//chrome")
+    sources += [
+      "certificate_manager_model.cc",
+      "certificate_manager_model.h",
+      "net/nss_context.cc",
+      "net/nss_context.h",
+      "net/nss_context_chromeos.cc",
+      "net/nss_context_linux.cc",
+    ]
     if (is_chromeos) {
       sources -= [ "net/nss_context_linux.cc" ]
     }
   }
   if (enable_notifications) {
-    sources += rebase_path(gypi_values.chrome_browser_notifications_sources,
-                           ".",
-                           "//chrome")
+    sources += [
+      "notifications/desktop_notification_profile_util.cc",
+      "notifications/desktop_notification_profile_util.h",
+      "notifications/login_state_notification_blocker_chromeos.cc",
+      "notifications/login_state_notification_blocker_chromeos.h",
+      "notifications/message_center_display_service.cc",
+      "notifications/message_center_display_service.h",
+      "notifications/native_notification_display_service.cc",
+      "notifications/native_notification_display_service.h",
+      "notifications/non_persistent_notification_handler.cc",
+      "notifications/non_persistent_notification_handler.h",
+      "notifications/notification.cc",
+      "notifications/notification.h",
+      "notifications/notification_common.cc",
+      "notifications/notification_common.h",
+      "notifications/notification_delegate.h",
+      "notifications/notification_display_service.h",
+      "notifications/notification_display_service_factory.cc",
+      "notifications/notification_display_service_factory.h",
+      "notifications/notification_handler.h",
+      "notifications/notification_object_proxy.cc",
+      "notifications/notification_object_proxy.h",
+      "notifications/notification_permission_context.cc",
+      "notifications/notification_permission_context.h",
+      "notifications/notification_platform_bridge.h",
+      "notifications/notification_platform_bridge_mac.h",
+      "notifications/notification_platform_bridge_mac.mm",
+      "notifications/notification_ui_manager.h",
+      "notifications/notifier_state_tracker.cc",
+      "notifications/notifier_state_tracker.h",
+      "notifications/notifier_state_tracker_factory.cc",
+      "notifications/notifier_state_tracker_factory.h",
+      "notifications/persistent_notification_delegate.cc",
+      "notifications/persistent_notification_delegate.h",
+      "notifications/persistent_notification_handler.cc",
+      "notifications/persistent_notification_handler.h",
+      "notifications/platform_notification_service_impl.cc",
+      "notifications/platform_notification_service_impl.h",
+      "push_messaging/push_messaging_notification_manager.cc",
+      "push_messaging/push_messaging_notification_manager.h",
+    ]
     if (android_java_ui) {
-      sources += rebase_path(
-              gypi_values.chrome_browser_notifications_android_java_ui_sources,
-              ".",
-              "//chrome")
+      sources += [
+        "notifications/notification_permission_infobar_delegate.cc",
+        "notifications/notification_permission_infobar_delegate.h",
+        "notifications/notification_platform_bridge_android.cc",
+        "notifications/notification_platform_bridge_android.h",
+      ]
     } else {
-      sources += rebase_path(
-              gypi_values.chrome_browser_notifications_non_android_sources,
-              ".",
-              "//chrome")
+      sources += [
+        "notifications/application_notifier_source.cc",
+        "notifications/application_notifier_source.h",
+        "notifications/arc_application_notifier_source_chromeos.cc",
+        "notifications/arc_application_notifier_source_chromeos.h",
+        "notifications/extension_welcome_notification.cc",
+        "notifications/extension_welcome_notification.h",
+        "notifications/extension_welcome_notification_factory.cc",
+        "notifications/extension_welcome_notification_factory.h",
+        "notifications/fullscreen_notification_blocker.cc",
+        "notifications/fullscreen_notification_blocker.h",
+        "notifications/google_now_notification_stats_collector.cc",
+        "notifications/google_now_notification_stats_collector.h",
+        "notifications/message_center_notification_manager.cc",
+        "notifications/message_center_notification_manager.h",
+        "notifications/message_center_settings_controller.cc",
+        "notifications/message_center_settings_controller.h",
+        "notifications/message_center_stats_collector.cc",
+        "notifications/message_center_stats_collector.h",
+        "notifications/notification_conversion_helper.cc",
+        "notifications/notification_conversion_helper.h",
+        "notifications/notification_system_observer.cc",
+        "notifications/notification_system_observer.h",
+        "notifications/notification_ui_manager_desktop.cc",
+        "notifications/notifier_source.h",
+        "notifications/profile_notification.cc",
+        "notifications/profile_notification.h",
+        "notifications/screen_lock_notification_blocker.cc",
+        "notifications/screen_lock_notification_blocker.h",
+        "notifications/system_component_notifier_source_chromeos.cc",
+        "notifications/system_component_notifier_source_chromeos.h",
+        "notifications/web_page_notifier_source.cc",
+        "notifications/web_page_notifier_source.h",
+      ]
     }
     if (is_mac) {
       deps += [ "//chrome/browser/ui/cocoa/notifications:common" ]
     }
   }
   if (enable_themes) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_themes_sources, ".", "//chrome")
+    sources += [
+      "sync/glue/theme_data_type_controller.cc",
+      "sync/glue/theme_data_type_controller.h",
+      "themes/browser_theme_pack.cc",
+      "themes/browser_theme_pack.h",
+      "themes/custom_theme_supplier.cc",
+      "themes/custom_theme_supplier.h",
+      "themes/theme_properties.cc",
+      "themes/theme_properties.h",
+      "themes/theme_service.cc",
+      "themes/theme_service.h",
+      "themes/theme_service_factory.cc",
+      "themes/theme_service_factory.h",
+      "themes/theme_service_mac.mm",
+      "themes/theme_syncable_service.cc",
+      "themes/theme_syncable_service.h",
+    ]
   }
 
   if (enable_basic_printing || enable_print_preview) {
     # Some form of printing support.
-    sources += rebase_path(gypi_values.chrome_browser_printing_basic_sources,
-                           ".",
-                           "//chrome")
+    sources += [
+      "printing/print_job.cc",
+      "printing/print_job.h",
+      "printing/print_job_manager.cc",
+      "printing/print_job_manager.h",
+      "printing/print_job_worker.cc",
+      "printing/print_job_worker.h",
+      "printing/print_job_worker_owner.cc",
+      "printing/print_job_worker_owner.h",
+      "printing/print_view_manager_base.cc",
+      "printing/print_view_manager_base.h",
+      "printing/print_view_manager_common.cc",
+      "printing/print_view_manager_common.h",
+      "printing/printer_query.cc",
+      "printing/printer_query.h",
+      "printing/printing_message_filter.cc",
+      "printing/printing_message_filter.h",
+    ]
     deps += [
       "//components/printing/browser",
       "//printing",
     ]
 
     if (is_win) {
-      sources += rebase_path(gypi_values.chrome_browser_printing_emf_sources,
-                             ".",
-                             "//chrome")
+      sources += [
+        "printing/pdf_to_emf_converter.cc",
+        "printing/pdf_to_emf_converter.h",
+      ]
     }
     if (enable_print_preview) {
       # Full printing on top of the above.
-      sources += rebase_path(gypi_values.chrome_browser_printing_full_sources,
-                             ".",
-                             "//chrome")
+      sources += [
+        "printing/background_printing_manager.cc",
+        "printing/background_printing_manager.h",
+        "printing/cloud_print/cloud_print_proxy_service.cc",
+        "printing/cloud_print/cloud_print_proxy_service.h",
+        "printing/cloud_print/cloud_print_proxy_service_factory.cc",
+        "printing/cloud_print/cloud_print_proxy_service_factory.h",
+        "printing/print_dialog_cloud.cc",
+        "printing/print_dialog_cloud.h",
+        "printing/print_dialog_cloud_posix.cc",
+        "printing/print_dialog_cloud_win.cc",
+        "printing/print_error_dialog.cc",
+        "printing/print_error_dialog.h",
+        "printing/print_preview_context_menu_observer.cc",
+        "printing/print_preview_context_menu_observer.h",
+        "printing/print_preview_data_service.cc",
+        "printing/print_preview_data_service.h",
+        "printing/print_preview_dialog_controller.cc",
+        "printing/print_preview_dialog_controller.h",
+        "printing/print_preview_message_handler.cc",
+        "printing/print_preview_message_handler.h",
+        "printing/print_view_manager.cc",
+        "printing/print_view_manager.h",
+        "printing/printer_manager_dialog.h",
+        "printing/printer_manager_dialog_linux.cc",
+        "printing/printer_manager_dialog_mac.mm",
+        "printing/printer_manager_dialog_win.cc",
+        "printing/pwg_raster_converter.cc",
+        "printing/pwg_raster_converter.h",
+        "service_process/service_process_control.cc",
+        "service_process/service_process_control.h",
+        "service_process/service_process_control_mac.mm",
+      ]
     } else {
       # Partial-only printing support.
-      sources +=
-          rebase_path(gypi_values.chrome_browser_printing_basic_only_sources,
-                      ".",
-                      "//chrome")
+      sources += [
+        "printing/print_view_manager_basic.cc",
+        "printing/print_view_manager_basic.h",
+      ]
     }
   }
   if (enable_captive_portal_detection) {
-    sources += rebase_path(gypi_values.chrome_browser_captive_portal_sources,
-                           ".",
-                           "//chrome")
+    sources += [
+      "captive_portal/captive_portal_login_detector.cc",
+      "captive_portal/captive_portal_login_detector.h",
+      "captive_portal/captive_portal_service.cc",
+      "captive_portal/captive_portal_service.h",
+      "captive_portal/captive_portal_service_factory.cc",
+      "captive_portal/captive_portal_service_factory.h",
+      "captive_portal/captive_portal_tab_helper.cc",
+      "captive_portal/captive_portal_tab_helper.h",
+      "captive_portal/captive_portal_tab_reloader.cc",
+      "captive_portal/captive_portal_tab_reloader.h",
+      "ssl/captive_portal_blocking_page.cc",
+      "ssl/captive_portal_blocking_page.h",
+      "ssl/captive_portal_metrics_recorder.cc",
+      "ssl/captive_portal_metrics_recorder.h",
+    ]
   }
   if (enable_session_service) {
-    sources += rebase_path(gypi_values.chrome_browser_session_service_sources,
-                           ".",
-                           "//chrome")
+    sources += [
+      "sessions/session_restore.cc",
+      "sessions/session_restore.h",
+      "sessions/session_restore_delegate.cc",
+      "sessions/session_restore_delegate.h",
+      "sessions/session_restore_stats_collector.cc",
+      "sessions/session_restore_stats_collector.h",
+      "sessions/session_service.cc",
+      "sessions/session_service.h",
+      "sessions/session_service_factory.cc",
+      "sessions/session_service_factory.h",
+      "sessions/session_service_utils.cc",
+      "sessions/session_service_utils.h",
+      "sessions/tab_loader.cc",
+      "sessions/tab_loader.h",
+      "sessions/tab_loader_delegate.cc",
+      "sessions/tab_loader_delegate.h",
+    ]
   }
 
   if (!is_android && !is_chromeos) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_desktop_sources, ".", "//chrome")
+    sources += [
+      "metrics/desktop_engagement/audible_contents_tracker.cc",
+      "metrics/desktop_engagement/audible_contents_tracker.h",
+      "metrics/desktop_engagement/chrome_visibility_observer.cc",
+      "metrics/desktop_engagement/chrome_visibility_observer.h",
+      "metrics/desktop_engagement/desktop_engagement_observer.cc",
+      "metrics/desktop_engagement/desktop_engagement_observer.h",
+      "metrics/desktop_engagement/desktop_engagement_service.cc",
+      "metrics/desktop_engagement/desktop_engagement_service.h",
+      "platform_util.cc",
+      "policy/cloud/user_policy_signin_service.cc",
+      "policy/cloud/user_policy_signin_service.h",
+      "profiles/avatar_menu_actions_desktop.cc",
+      "profiles/avatar_menu_actions_desktop.h",
+      "profiles/avatar_menu_desktop.cc",
+      "profiles/avatar_menu_observer.h",
+      "profiles/profile_list_desktop.cc",
+      "profiles/profile_list_desktop.h",
+      "profiles/profile_statistics.cc",
+      "profiles/profile_statistics.h",
+      "profiles/profile_statistics_aggregator.cc",
+      "profiles/profile_statistics_aggregator.h",
+      "profiles/profile_statistics_common.cc",
+      "profiles/profile_statistics_common.h",
+      "profiles/profile_statistics_factory.cc",
+      "profiles/profile_statistics_factory.h",
+      "signin/cross_device_promo.cc",
+      "signin/cross_device_promo.h",
+      "signin/cross_device_promo_factory.cc",
+      "signin/cross_device_promo_factory.h",
+      "signin/signin_global_error.cc",
+      "signin/signin_global_error.h",
+      "signin/signin_global_error_factory.cc",
+      "signin/signin_global_error_factory.h",
+      "sync/sync_global_error.cc",
+      "sync/sync_global_error.h",
+      "sync/sync_global_error_factory.cc",
+      "sync/sync_global_error_factory.h",
+      "upgrade_detector_impl.cc",
+      "upgrade_detector_impl.h",
+    ]
   }
 
   if (is_android) {
-    # Mobile.
-    sources +=
-        rebase_path(gypi_values.chrome_browser_mobile_sources, ".", "//chrome")
+    sources += [
+      "chrome_browser_field_trials_mobile.cc",
+      "chrome_browser_field_trials_mobile.h",
+      "policy/cloud/user_policy_signin_service_mobile.cc",
+      "policy/cloud/user_policy_signin_service_mobile.h",
+    ]
   } else {
-    # Non-mobile.
+    # Non-Android.
+    sources += [
+      "accessibility/invert_bubble_prefs.cc",
+      "accessibility/invert_bubble_prefs.h",
+      "background/background_contents.cc",
+      "background/background_contents.h",
+      "banners/app_banner_infobar_delegate_desktop.cc",
+      "banners/app_banner_infobar_delegate_desktop.h",
+      "banners/app_banner_manager_desktop.cc",
+      "banners/app_banner_manager_desktop.h",
+      "bookmarks/bookmark_html_writer.cc",
+      "bookmarks/bookmark_html_writer.h",
+      "certificate_viewer.cc",
+      "certificate_viewer.h",
+      "chooser_controller/chooser_controller.cc",
+      "chooser_controller/chooser_controller.h",
+      "chrome_browser_field_trials_desktop.cc",
+      "chrome_browser_field_trials_desktop.h",
+      "chrome_browser_main_posix.cc",
+      "chrome_browser_main_posix.h",
+      "chrome_process_singleton.cc",
+      "chrome_process_singleton.h",
+      "component_updater/widevine_cdm_component_installer.cc",
+      "component_updater/widevine_cdm_component_installer.h",
+      "custom_handlers/register_protocol_handler_permission_request.cc",
+      "custom_handlers/register_protocol_handler_permission_request.h",
+      "custom_home_pages_table_model.cc",
+      "custom_home_pages_table_model.h",
+      "diagnostics/diagnostics_controller.cc",
+      "diagnostics/diagnostics_controller.h",
+      "diagnostics/diagnostics_metrics.cc",
+      "diagnostics/diagnostics_metrics.h",
+      "diagnostics/diagnostics_model.cc",
+      "diagnostics/diagnostics_model.h",
+      "diagnostics/diagnostics_test.cc",
+      "diagnostics/diagnostics_test.h",
+      "diagnostics/diagnostics_writer.cc",
+      "diagnostics/diagnostics_writer.h",
+      "diagnostics/recon_diagnostics.cc",
+      "diagnostics/recon_diagnostics.h",
+      "diagnostics/sqlite_diagnostics.cc",
+      "diagnostics/sqlite_diagnostics.h",
+      "download/download_commands.cc",
+      "download/download_commands.h",
+      "download/download_crx_util.cc",
+      "download/download_crx_util.h",
+      "download/download_danger_prompt.cc",
+      "download/download_danger_prompt.h",
+      "download/download_dir_policy_handler.cc",
+      "download/download_dir_policy_handler.h",
+      "download/download_permission_request.cc",
+      "download/download_permission_request.h",
+      "download/download_shelf.cc",
+      "download/download_shelf.h",
+      "download/download_shelf_context_menu.cc",
+      "download/download_shelf_context_menu.h",
+      "feedback/feedback_profile_observer.cc",
+      "feedback/feedback_profile_observer.h",
+      "feedback/show_feedback_page.cc",
+      "feedback/system_logs/about_system_logs_fetcher.cc",
+      "feedback/system_logs/about_system_logs_fetcher.h",
+      "feedback/system_logs/log_sources/chrome_internal_log_source.cc",
+      "feedback/system_logs/log_sources/chrome_internal_log_source.h",
+      "feedback/system_logs/log_sources/memory_details_log_source.cc",
+      "feedback/system_logs/log_sources/memory_details_log_source.h",
+      "feedback/system_logs/scrubbed_system_logs_fetcher.cc",
+      "feedback/system_logs/scrubbed_system_logs_fetcher.h",
+      "feedback/system_logs/system_logs_fetcher_base.cc",
+      "feedback/system_logs/system_logs_fetcher_base.h",
+      "first_run/first_run.cc",
+      "first_run/first_run.h",
+      "first_run/first_run_dialog.h",
+      "first_run/first_run_internal.h",
+      "first_run/first_run_internal_linux.cc",
+      "first_run/first_run_internal_mac.mm",
+      "first_run/first_run_internal_posix.cc",
+      "first_run/first_run_internal_win.cc",
+      "first_run/upgrade_util.h",
+      "first_run/upgrade_util_mac.cc",
+      "first_run/upgrade_util_win.cc",
+      "first_run/upgrade_util_win.h",
+      "font_family_cache.cc",
+      "font_family_cache.h",
+      "gpu/gl_string_manager.cc",
+      "gpu/gl_string_manager.h",
+      "importer/external_process_importer_client.cc",
+      "importer/external_process_importer_client.h",
+      "importer/external_process_importer_host.cc",
+      "importer/external_process_importer_host.h",
+      "importer/firefox_profile_lock.cc",
+      "importer/firefox_profile_lock.h",
+      "importer/firefox_profile_lock_posix.cc",
+      "importer/firefox_profile_lock_win.cc",
+      "importer/importer_list.cc",
+      "importer/importer_list.h",
+      "importer/importer_lock_dialog.h",
+      "importer/importer_progress_observer.h",
+      "importer/importer_uma.cc",
+      "importer/importer_uma.h",
+      "importer/in_process_importer_bridge.cc",
+      "importer/in_process_importer_bridge.h",
+      "importer/profile_writer.cc",
+      "importer/profile_writer.h",
+      "lifetime/browser_close_manager.cc",
+      "lifetime/browser_close_manager.h",
+      "lifetime/keep_alive_registry.cc",
+      "lifetime/keep_alive_registry.h",
+      "lifetime/keep_alive_state_observer.h",
+      "lifetime/keep_alive_types.cc",
+      "lifetime/keep_alive_types.h",
+      "lifetime/scoped_keep_alive.cc",
+      "lifetime/scoped_keep_alive.h",
+      "media/tab_desktop_media_list.cc",
+      "media/tab_desktop_media_list.h",
+      "media_galleries/fileapi/av_scanning_file_validator.cc",
+      "media_galleries/fileapi/av_scanning_file_validator.h",
+      "media_galleries/fileapi/device_media_async_file_util.cc",
+      "media_galleries/fileapi/device_media_async_file_util.h",
+      "media_galleries/fileapi/iapps_finder.h",
+      "media_galleries/fileapi/iapps_finder_impl.cc",
+      "media_galleries/fileapi/iapps_finder_impl.h",
+      "media_galleries/fileapi/iapps_finder_impl_mac.mm",
+      "media_galleries/fileapi/iapps_finder_impl_win.cc",
+      "media_galleries/fileapi/media_file_system_backend.cc",
+      "media_galleries/fileapi/media_file_system_backend.h",
+      "media_galleries/fileapi/media_file_validator_factory.cc",
+      "media_galleries/fileapi/media_file_validator_factory.h",
+      "media_galleries/fileapi/media_path_filter.cc",
+      "media_galleries/fileapi/media_path_filter.h",
+      "media_galleries/fileapi/mtp_device_async_delegate.cc",
+      "media_galleries/fileapi/mtp_device_async_delegate.h",
+      "media_galleries/fileapi/mtp_device_map_service.cc",
+      "media_galleries/fileapi/mtp_device_map_service.h",
+      "media_galleries/fileapi/mtp_file_stream_reader.cc",
+      "media_galleries/fileapi/mtp_file_stream_reader.h",
+      "media_galleries/fileapi/native_media_file_util.cc",
+      "media_galleries/fileapi/native_media_file_util.h",
+      "media_galleries/fileapi/picasa_finder.cc",
+      "media_galleries/fileapi/picasa_finder.h",
+      "media_galleries/fileapi/picasa_finder_mac.mm",
+      "media_galleries/fileapi/readahead_file_stream_reader.cc",
+      "media_galleries/fileapi/readahead_file_stream_reader.h",
+      "media_galleries/fileapi/safe_audio_video_checker.cc",
+      "media_galleries/fileapi/safe_audio_video_checker.h",
+      "media_galleries/fileapi/safe_media_metadata_parser.cc",
+      "media_galleries/fileapi/safe_media_metadata_parser.h",
+      "media_galleries/fileapi/supported_audio_video_checker.cc",
+      "media_galleries/fileapi/supported_audio_video_checker.h",
+      "media_galleries/fileapi/supported_image_type_validator.cc",
+      "media_galleries/fileapi/supported_image_type_validator.h",
+      "media_galleries/gallery_watch_manager.cc",
+      "media_galleries/gallery_watch_manager.h",
+      "media_galleries/gallery_watch_manager_observer.h",
+      "media_galleries/imported_media_gallery_registry.cc",
+      "media_galleries/imported_media_gallery_registry.h",
+      "media_galleries/linux/mtp_device_delegate_impl_linux.cc",
+      "media_galleries/linux/mtp_device_delegate_impl_linux.h",
+      "media_galleries/linux/mtp_device_object_enumerator.cc",
+      "media_galleries/linux/mtp_device_object_enumerator.h",
+      "media_galleries/linux/mtp_device_task_helper.cc",
+      "media_galleries/linux/mtp_device_task_helper.h",
+      "media_galleries/linux/mtp_device_task_helper_map_service.cc",
+      "media_galleries/linux/mtp_device_task_helper_map_service.h",
+      "media_galleries/linux/mtp_read_file_worker.cc",
+      "media_galleries/linux/mtp_read_file_worker.h",
+      "media_galleries/linux/snapshot_file_details.cc",
+      "media_galleries/linux/snapshot_file_details.h",
+      "media_galleries/mac/mtp_device_delegate_impl_mac.h",
+      "media_galleries/mac/mtp_device_delegate_impl_mac.mm",
+      "media_galleries/media_file_system_registry.cc",
+      "media_galleries/media_file_system_registry.h",
+      "media_galleries/media_galleries_dialog_controller.cc",
+      "media_galleries/media_galleries_dialog_controller.h",
+      "media_galleries/media_galleries_histograms.cc",
+      "media_galleries/media_galleries_histograms.h",
+      "media_galleries/media_galleries_permission_controller.cc",
+      "media_galleries/media_galleries_permission_controller.h",
+      "media_galleries/media_galleries_preferences.cc",
+      "media_galleries/media_galleries_preferences.h",
+      "media_galleries/media_galleries_preferences_factory.cc",
+      "media_galleries/media_galleries_preferences_factory.h",
+      "media_galleries/media_gallery_context_menu.cc",
+      "media_galleries/media_gallery_context_menu.h",
+      "media_galleries/win/mtp_device_delegate_impl_win.cc",
+      "media_galleries/win/mtp_device_delegate_impl_win.h",
+      "media_galleries/win/mtp_device_object_entry.cc",
+      "media_galleries/win/mtp_device_object_entry.h",
+      "media_galleries/win/mtp_device_object_enumerator.cc",
+      "media_galleries/win/mtp_device_object_enumerator.h",
+      "media_galleries/win/mtp_device_operations_util.cc",
+      "media_galleries/win/mtp_device_operations_util.h",
+      "media_galleries/win/portable_device_map_service.cc",
+      "media_galleries/win/portable_device_map_service.h",
+      "media_galleries/win/snapshot_file_details.cc",
+      "media_galleries/win/snapshot_file_details.h",
+      "memory/oom_memory_details.cc",
+      "memory/oom_memory_details.h",
+      "memory/tab_manager.cc",
+      "memory/tab_manager.h",
+      "memory/tab_manager_delegate_chromeos.cc",
+      "memory/tab_manager_delegate_chromeos.h",
+      "memory/tab_manager_observer.cc",
+      "memory/tab_manager_observer.h",
+      "memory/tab_manager_web_contents_data.cc",
+      "memory/tab_manager_web_contents_data.h",
+      "memory/tab_stats.cc",
+      "memory/tab_stats.h",
+      "metrics/first_web_contents_profiler.cc",
+      "metrics/first_web_contents_profiler.h",
+      "net/firefox_proxy_settings.cc",
+      "net/firefox_proxy_settings.h",
+      "net/utility_process_mojo_proxy_resolver_factory.cc",
+      "net/utility_process_mojo_proxy_resolver_factory.h",
+      "obsolete_system/obsolete_system.h",
+      "obsolete_system/obsolete_system_linux.cc",
+      "obsolete_system/obsolete_system_mac.cc",
+      "obsolete_system/obsolete_system_win.cc",
+      "pdf/pdf_extension_util.cc",
+      "pdf/pdf_extension_util.h",
+      "power/process_power_collector.cc",
+      "power/process_power_collector.h",
+      "process_singleton_modal_dialog_lock.cc",
+      "process_singleton_modal_dialog_lock.h",
+      "process_singleton_posix.cc",
+      "process_singleton_startup_lock.cc",
+      "process_singleton_startup_lock.h",
+      "profile_resetter/brandcode_config_fetcher.cc",
+      "profile_resetter/brandcode_config_fetcher.h",
+      "profile_resetter/brandcoded_default_settings.cc",
+      "profile_resetter/brandcoded_default_settings.h",
+      "profile_resetter/profile_resetter.cc",
+      "profile_resetter/profile_resetter.h",
+      "profile_resetter/reset_report_uploader.cc",
+      "profile_resetter/reset_report_uploader.h",
+      "profile_resetter/reset_report_uploader_factory.cc",
+      "profile_resetter/reset_report_uploader_factory.h",
+      "profile_resetter/resettable_settings_snapshot.cc",
+      "profile_resetter/resettable_settings_snapshot.h",
+      "profile_resetter/triggered_profile_resetter.cc",
+      "profile_resetter/triggered_profile_resetter.h",
+      "profile_resetter/triggered_profile_resetter_factory.cc",
+      "profile_resetter/triggered_profile_resetter_factory.h",
+      "profile_resetter/triggered_profile_resetter_win.cc",
+      "profiles/avatar_menu.cc",
+      "profiles/avatar_menu.h",
+      "profiles/profile_shortcut_manager.cc",
+      "profiles/profile_shortcut_manager.h",
+      "profiles/profile_window.cc",
+      "profiles/profile_window.h",
+      "renderer_context_menu/open_with_menu_factory.cc",
+      "renderer_context_menu/open_with_menu_factory.h",
+      "renderer_context_menu/render_view_context_menu.cc",
+      "renderer_context_menu/render_view_context_menu.h",
+      "renderer_context_menu/spelling_bubble_model.cc",
+      "renderer_context_menu/spelling_bubble_model.h",
+      "renderer_context_menu/spelling_menu_observer.cc",
+      "renderer_context_menu/spelling_menu_observer.h",
+      "repost_form_warning_controller.cc",
+      "repost_form_warning_controller.h",
+      "search/local_ntp_source.cc",
+      "search/local_ntp_source.h",
+      "search/search_terms_tracker.cc",
+      "search/search_terms_tracker.h",
+      "signin/signin_promo.cc",
+      "signin/signin_promo.h",
+      "signin/signin_ui_util.cc",
+      "signin/signin_ui_util.h",
+      "speech/extension_api/tts_extension_api_constants.cc",  # Should be moved to extensions section?
+      "speech/extension_api/tts_extension_api_constants.h",
+      "ssl/ssl_add_certificate.cc",
+      "ssl/ssl_add_certificate.h",
+      "ssl/ssl_client_auth_observer.cc",
+      "ssl/ssl_client_auth_observer.h",
+      "status_icons/desktop_notification_balloon.cc",
+      "status_icons/desktop_notification_balloon.h",
+      "sync/glue/extension_data_type_controller.cc",
+      "sync/glue/extension_data_type_controller.h",
+      "sync/glue/extension_setting_data_type_controller.cc",
+      "sync/glue/extension_setting_data_type_controller.h",
+      "sync/sync_ui_util.cc",
+      "sync/sync_ui_util.h",
+      "upgrade_detector.cc",
+      "upgrade_detector.h",
+      "usb/usb_chooser_controller.cc",
+      "usb/usb_chooser_controller.h",
+      "usb/web_usb_chooser_service.cc",
+      "usb/web_usb_chooser_service.h",
+      "usb/web_usb_detector.cc",
+      "usb/web_usb_detector.h",
+    ]
     deps += [
       "//apps",
       "//chrome/browser/policy:path_parser",
       "//chrome/browser/profile_resetter:profile_reset_report_proto",
       "//components/feedback",
       "//components/web_modal",
       "//net:net_browser_services",
     ]
-    sources += rebase_path(gypi_values.chrome_browser_non_mobile_sources,
-                           ".",
-                           "//chrome")
   }
 
   if (!is_chrome_branded) {
     sources += [
       "search/local_files_ntp_source.cc",
       "search/local_files_ntp_source.h",
     ]
   }
 
   if (is_android) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_android_sources, ".", "//chrome")
+    sources += [
+      "gpu/gpu_driver_info_manager_android.cc",
+      "gpu/gpu_driver_info_manager_android.h",
+      "media/protected_media_identifier_permission_context.cc",
+      "media/protected_media_identifier_permission_context.h",
+    ]
   }
 
   if (android_java_ui) {
-    sources += rebase_path(gypi_values.chrome_browser_android_java_ui_sources,
-                           ".",
-                           "//chrome")
-    sources += rebase_path(gypi_values.chrome_browser_offline_pages_sources,
-                           ".",
-                           "//chrome")
+    sources += [
+      "after_startup_task_utils_android.cc",
+      "after_startup_task_utils_android.h",
+      "android/accessibility/font_size_prefs_android.cc",
+      "android/accessibility/font_size_prefs_android.h",
+      "android/accessibility_util.cc",
+      "android/accessibility_util.h",
+      "android/activity_type_ids.cc",
+      "android/activity_type_ids.h",
+      "android/android_theme_resources.h",
+      "android/appmenu/app_menu_drag_helper.cc",
+      "android/appmenu/app_menu_drag_helper.h",
+      "android/background_sync_launcher_android.cc",
+      "android/background_sync_launcher_android.h",
+      "android/banners/app_banner_infobar_delegate_android.cc",
+      "android/banners/app_banner_infobar_delegate_android.h",
+      "android/banners/app_banner_manager_android.cc",
+      "android/banners/app_banner_manager_android.h",
+      "android/blimp/blimp_client_context_factory.cc",
+      "android/blimp/blimp_client_context_factory.h",
+      "android/blimp/blimp_client_context_factory_android.cc",
+      "android/blimp/blimp_client_context_factory_android.h",
+      "android/blimp/blimp_contents_profile_attachment.cc",
+      "android/blimp/blimp_contents_profile_attachment.h",
+      "android/blimp/chrome_blimp_client_context_delegate.cc",
+      "android/blimp/chrome_blimp_client_context_delegate.h",
+      "android/blimp/chrome_blimp_client_context_delegate_android.cc",
+      "android/blimp/chrome_blimp_client_context_delegate_android.h",
+      "android/bookmarks/bookmark_bridge.cc",
+      "android/bookmarks/bookmark_bridge.h",
+      "android/bookmarks/partner_bookmarks_reader.cc",
+      "android/bookmarks/partner_bookmarks_reader.h",
+      "android/bookmarks/partner_bookmarks_shim.cc",
+      "android/bookmarks/partner_bookmarks_shim.h",
+      "android/bottombar/overlay_panel_content.cc",
+      "android/bottombar/overlay_panel_content.h",
+      "android/browsing_data/browsing_data_counter_bridge.cc",
+      "android/browsing_data/browsing_data_counter_bridge.h",
+      "android/browsing_data/url_filter_bridge.cc",
+      "android/browsing_data/url_filter_bridge.h",
+      "android/chrome_application.cc",
+      "android/chrome_application.h",
+      "android/chrome_feature_list.cc",
+      "android/chrome_feature_list.h",
+      "android/chrome_jni_registrar.cc",
+      "android/chrome_jni_registrar.h",
+      "android/chrome_startup_flags.cc",
+      "android/chrome_startup_flags.h",
+      "android/compositor/compositor_view.cc",
+      "android/compositor/compositor_view.h",
+      "android/compositor/decoration_title.cc",
+      "android/compositor/decoration_title.h",
+      "android/compositor/layer/content_layer.cc",
+      "android/compositor/layer/content_layer.h",
+      "android/compositor/layer/contextual_search_layer.cc",
+      "android/compositor/layer/contextual_search_layer.h",
+      "android/compositor/layer/crushed_sprite_layer.cc",
+      "android/compositor/layer/crushed_sprite_layer.h",
+      "android/compositor/layer/layer.h",
+      "android/compositor/layer/overlay_panel_layer.cc",
+      "android/compositor/layer/overlay_panel_layer.h",
+      "android/compositor/layer/reader_mode_layer.cc",
+      "android/compositor/layer/reader_mode_layer.h",
+      "android/compositor/layer/tab_handle_layer.cc",
+      "android/compositor/layer/tab_handle_layer.h",
+      "android/compositor/layer/tab_layer.cc",
+      "android/compositor/layer/tab_layer.h",
+      "android/compositor/layer/thumbnail_layer.cc",
+      "android/compositor/layer/thumbnail_layer.h",
+      "android/compositor/layer/toolbar_layer.cc",
+      "android/compositor/layer/toolbar_layer.h",
+      "android/compositor/layer_title_cache.cc",
+      "android/compositor/layer_title_cache.h",
+      "android/compositor/scene_layer/contextual_search_scene_layer.cc",
+      "android/compositor/scene_layer/contextual_search_scene_layer.h",
+      "android/compositor/scene_layer/reader_mode_scene_layer.cc",
+      "android/compositor/scene_layer/reader_mode_scene_layer.h",
+      "android/compositor/scene_layer/scene_layer.cc",
+      "android/compositor/scene_layer/scene_layer.h",
+      "android/compositor/scene_layer/static_tab_scene_layer.cc",
+      "android/compositor/scene_layer/static_tab_scene_layer.h",
+      "android/compositor/scene_layer/tab_list_scene_layer.cc",
+      "android/compositor/scene_layer/tab_list_scene_layer.h",
+      "android/compositor/scene_layer/tab_strip_scene_layer.cc",
+      "android/compositor/scene_layer/tab_strip_scene_layer.h",
+      "android/compositor/scene_layer/toolbar_scene_layer.cc",
+      "android/compositor/scene_layer/toolbar_scene_layer.h",
+      "android/compositor/tab_content_manager.cc",
+      "android/compositor/tab_content_manager.h",
+      "android/contextualsearch/contextual_search_context.cc",
+      "android/contextualsearch/contextual_search_context.h",
+      "android/contextualsearch/contextual_search_delegate.cc",
+      "android/contextualsearch/contextual_search_delegate.h",
+      "android/contextualsearch/contextual_search_field_trial.cc",
+      "android/contextualsearch/contextual_search_field_trial.h",
+      "android/contextualsearch/contextual_search_manager.cc",
+      "android/contextualsearch/contextual_search_manager.h",
+      "android/contextualsearch/contextual_search_tab_helper.cc",
+      "android/contextualsearch/contextual_search_tab_helper.h",
+      "android/contextualsearch/resolved_search_term.cc",
+      "android/contextualsearch/resolved_search_term.h",
+      "android/cookies/cookies_fetcher.cc",
+      "android/cookies/cookies_fetcher.h",
+      "android/data_usage/data_use_matcher.cc",
+      "android/data_usage/data_use_matcher.h",
+      "android/data_usage/data_use_tab_helper.cc",
+      "android/data_usage/data_use_tab_helper.h",
+      "android/data_usage/data_use_tab_model.cc",
+      "android/data_usage/data_use_tab_model.h",
+      "android/data_usage/data_use_tab_ui_manager_android.cc",
+      "android/data_usage/data_use_tab_ui_manager_android.h",
+      "android/data_usage/data_use_ui_tab_model.cc",
+      "android/data_usage/data_use_ui_tab_model.h",
+      "android/data_usage/data_use_ui_tab_model_factory.cc",
+      "android/data_usage/data_use_ui_tab_model_factory.h",
+      "android/data_usage/external_data_use_observer.cc",
+      "android/data_usage/external_data_use_observer.h",
+      "android/data_usage/external_data_use_observer_bridge.cc",
+      "android/data_usage/external_data_use_observer_bridge.h",
+      "android/data_usage/external_data_use_reporter.cc",
+      "android/data_usage/external_data_use_reporter.h",
+      "android/data_usage/tab_data_use_entry.cc",
+      "android/data_usage/tab_data_use_entry.h",
+      "android/dev_tools_server.cc",
+      "android/dev_tools_server.h",
+      "android/devtools_manager_delegate_android.cc",
+      "android/devtools_manager_delegate_android.h",
+      "android/document/document_web_contents_delegate.cc",
+      "android/dom_distiller/distiller_ui_handle_android.cc",
+      "android/dom_distiller/distiller_ui_handle_android.h",
+      "android/download/android_download_manager_overwrite_infobar_delegate.cc",
+      "android/download/android_download_manager_overwrite_infobar_delegate.h",
+      "android/download/chrome_download_delegate.cc",
+      "android/download/chrome_download_delegate.h",
+      "android/download/chrome_download_manager_overwrite_infobar_delegate.cc",
+      "android/download/chrome_download_manager_overwrite_infobar_delegate.h",
+      "android/download/download_controller.cc",
+      "android/download/download_controller.h",
+      "android/download/download_controller_base.cc",
+      "android/download/download_controller_base.h",
+      "android/download/download_manager_service.cc",
+      "android/download/download_manager_service.h",
+      "android/download/download_overwrite_infobar_delegate.cc",
+      "android/download/download_overwrite_infobar_delegate.h",
+      "android/download/mock_download_controller.cc",
+      "android/download/mock_download_controller.h",
+      "android/favicon_helper.cc",
+      "android/favicon_helper.h",
+      "android/feature_utilities.cc",
+      "android/feature_utilities.h",
+      "android/feedback/connectivity_checker.cc",
+      "android/feedback/connectivity_checker.h",
+      "android/feedback/screenshot_task.cc",
+      "android/feedback/screenshot_task.h",
+      "android/find_in_page/find_in_page_bridge.cc",
+      "android/find_in_page/find_in_page_bridge.h",
+      "android/foreign_session_helper.cc",
+      "android/foreign_session_helper.h",
+      "android/history_report/data_observer.cc",
+      "android/history_report/data_observer.h",
+      "android/history_report/data_provider.cc",
+      "android/history_report/data_provider.h",
+      "android/history_report/delta_file_backend_leveldb.cc",
+      "android/history_report/delta_file_backend_leveldb.h",
+      "android/history_report/delta_file_commons.cc",
+      "android/history_report/delta_file_commons.h",
+      "android/history_report/delta_file_service.cc",
+      "android/history_report/delta_file_service.h",
+      "android/history_report/get_all_urls_from_history_task.cc",
+      "android/history_report/get_all_urls_from_history_task.h",
+      "android/history_report/historic_visits_migration_task.cc",
+      "android/history_report/historic_visits_migration_task.h",
+      "android/history_report/history_report_jni_bridge.cc",
+      "android/history_report/history_report_jni_bridge.h",
+      "android/history_report/usage_report_util.cc",
+      "android/history_report/usage_report_util.h",
+      "android/history_report/usage_reports_buffer_backend.cc",
+      "android/history_report/usage_reports_buffer_backend.h",
+      "android/history_report/usage_reports_buffer_service.cc",
+      "android/history_report/usage_reports_buffer_service.h",
+      "android/hung_renderer_infobar_delegate.cc",
+      "android/hung_renderer_infobar_delegate.h",
+      "android/instantapps/instant_apps_infobar_delegate.cc",
+      "android/instantapps/instant_apps_infobar_delegate.h",
+      "android/intent_helper.cc",
+      "android/intent_helper.h",
+      "android/intercept_download_resource_throttle.cc",
+      "android/intercept_download_resource_throttle.h",
+      "android/java_exception_reporter.cc",
+      "android/java_exception_reporter.h",
+      "android/large_icon_bridge.cc",
+      "android/large_icon_bridge.h",
+      "android/location_settings.h",
+      "android/location_settings_impl.cc",
+      "android/location_settings_impl.h",
+      "android/logo_bridge.cc",
+      "android/logo_bridge.h",
+      "android/logo_service.cc",
+      "android/logo_service.h",
+      "android/media/media_throttle_infobar_delegate.cc",
+      "android/media/media_throttle_infobar_delegate.h",
+      "android/metrics/launch_metrics.cc",
+      "android/metrics/launch_metrics.h",
+      "android/metrics/uma_session_stats.cc",
+      "android/metrics/uma_session_stats.h",
+      "android/metrics/uma_utils.cc",
+      "android/metrics/uma_utils.h",
+      "android/metrics/variations_session.cc",
+      "android/metrics/variations_session.h",
+      "android/mojo/chrome_interface_registrar_android.cc",
+      "android/mojo/chrome_interface_registrar_android.h",
+      "android/net/external_estimate_provider_android.cc",
+      "android/net/external_estimate_provider_android.h",
+      "android/ntp/most_visited_sites_bridge.cc",
+      "android/ntp/most_visited_sites_bridge.h",
+      "android/ntp/new_tab_page_prefs.cc",
+      "android/ntp/new_tab_page_prefs.h",
+      "android/ntp/new_tab_page_url_handler.cc",
+      "android/ntp/new_tab_page_url_handler.h",
+      "android/ntp/ntp_snippets_bridge.cc",
+      "android/ntp/ntp_snippets_bridge.h",
+      "android/ntp/ntp_snippets_launcher.cc",
+      "android/ntp/ntp_snippets_launcher.h",
+      "android/ntp/popular_sites.cc",
+      "android/ntp/popular_sites.h",
+      "android/offline_pages/background_scheduler_bridge.cc",
+      "android/offline_pages/background_scheduler_bridge.h",
+      "android/offline_pages/downloads/offline_page_download_bridge.cc",
+      "android/offline_pages/downloads/offline_page_download_bridge.h",
+      "android/offline_pages/downloads/offline_page_notification_bridge.cc",
+      "android/offline_pages/downloads/offline_page_notification_bridge.h",
+      "android/offline_pages/offline_page_bridge.cc",
+      "android/offline_pages/offline_page_bridge.h",
+      "android/offline_pages/offline_page_mhtml_archiver.cc",
+      "android/offline_pages/offline_page_mhtml_archiver.h",
+      "android/offline_pages/offline_page_model_factory.cc",
+      "android/offline_pages/offline_page_model_factory.h",
+      "android/offline_pages/offline_page_request_interceptor.cc",
+      "android/offline_pages/offline_page_request_interceptor.h",
+      "android/offline_pages/offline_page_request_job.cc",
+      "android/offline_pages/offline_page_request_job.h",
+      "android/offline_pages/offline_page_tab_helper.cc",
+      "android/offline_pages/offline_page_tab_helper.h",
+      "android/offline_pages/offline_page_utils.cc",
+      "android/offline_pages/offline_page_utils.h",
+      "android/offline_pages/offliner_factory.h",
+      "android/offline_pages/prerender_adapter.cc",
+      "android/offline_pages/prerender_adapter.h",
+      "android/offline_pages/prerendering_loader.cc",
+      "android/offline_pages/prerendering_loader.h",
+      "android/offline_pages/prerendering_offliner.cc",
+      "android/offline_pages/prerendering_offliner.h",
+      "android/offline_pages/prerendering_offliner_factory.cc",
+      "android/offline_pages/prerendering_offliner_factory.h",
+      "android/offline_pages/recent_tab_helper.cc",
+      "android/offline_pages/recent_tab_helper.h",
+      "android/offline_pages/request_coordinator_factory.cc",
+      "android/offline_pages/request_coordinator_factory.h",
+      "android/omnibox/answers_image_bridge.cc",
+      "android/omnibox/answers_image_bridge.h",
+      "android/omnibox/autocomplete_controller_android.cc",
+      "android/omnibox/autocomplete_controller_android.h",
+      "android/omnibox/omnibox_prerender.cc",
+      "android/omnibox/omnibox_prerender.h",
+      "android/password_ui_view_android.cc",
+      "android/password_ui_view_android.h",
+      "android/policy/policy_auditor.cc",
+      "android/policy/policy_auditor.h",
+      "android/precache/precache_launcher.cc",
+      "android/precache/precache_launcher.h",
+      "android/preferences/autofill/autofill_profile_bridge.cc",
+      "android/preferences/autofill/autofill_profile_bridge.h",
+      "android/preferences/important_sites_util.cc",
+      "android/preferences/important_sites_util.h",
+      "android/preferences/pref_service_bridge.cc",
+      "android/preferences/pref_service_bridge.h",
+      "android/preferences/website_preference_bridge.cc",
+      "android/preferences/website_preference_bridge.h",
+      "android/profiles/profile_downloader_android.cc",
+      "android/profiles/profile_downloader_android.h",
+      "android/provider/blocking_ui_thread_async_request.cc",
+      "android/provider/blocking_ui_thread_async_request.h",
+      "android/provider/bookmark_model_observer_task.cc",
+      "android/provider/bookmark_model_observer_task.h",
+      "android/provider/chrome_browser_provider.cc",
+      "android/provider/chrome_browser_provider.h",
+      "android/provider/run_on_ui_thread_blocking.h",
+      "android/rappor/rappor_service_bridge.cc",
+      "android/rappor/rappor_service_bridge.h",
+      "android/recently_closed_tabs_bridge.cc",
+      "android/recently_closed_tabs_bridge.h",
+      "android/resource_id.h",
+      "android/resource_mapper.cc",
+      "android/resource_mapper.h",
+      "android/rlz/revenue_stats.cc",
+      "android/rlz/revenue_stats.h",
+      "android/safe_browsing/safe_browsing_api_handler_bridge.cc",
+      "android/safe_browsing/safe_browsing_api_handler_bridge.h",
+      "android/seccomp_support_detector.cc",
+      "android/seccomp_support_detector.h",
+      "android/service_tab_launcher.cc",
+      "android/service_tab_launcher.h",
+      "android/sessions/session_tab_helper_android.cc",
+      "android/sessions/session_tab_helper_android.h",
+      "android/shortcut_helper.cc",
+      "android/shortcut_helper.h",
+      "android/shortcut_info.cc",
+      "android/shortcut_info.h",
+      "android/signin/account_management_screen_helper.cc",
+      "android/signin/account_management_screen_helper.h",
+      "android/signin/account_tracker_service_android.cc",
+      "android/signin/account_tracker_service_android.h",
+      "android/signin/signin_investigator_android.cc",
+      "android/signin/signin_investigator_android.h",
+      "android/signin/signin_manager_android.cc",
+      "android/signin/signin_manager_android.h",
+      "android/signin/signin_promo_util_android.cc",
+      "android/signin/signin_promo_util_android.h",
+      "android/tab_android.cc",
+      "android/tab_android.h",
+      "android/tab_state.cc",
+      "android/tab_state.h",
+      "android/tab_web_contents_delegate_android.cc",
+      "android/tab_web_contents_delegate_android.h",
+      "android/thumbnail/thumbnail.cc",
+      "android/thumbnail/thumbnail.h",
+      "android/thumbnail/thumbnail_cache.cc",
+      "android/thumbnail/thumbnail_cache.h",
+      "android/url_utilities.cc",
+      "android/url_utilities.h",
+      "android/usb/web_usb_chooser_service_android.cc",
+      "android/usb/web_usb_chooser_service_android.h",
+      "android/voice_search_tab_helper.cc",
+      "android/voice_search_tab_helper.h",
+      "android/warmup_manager.cc",
+      "android/warmup_manager.h",
+      "android/web_contents_factory.cc",
+      "android/web_contents_factory.h",
+      "android/webapk/chrome_webapk_host.cc",
+      "android/webapk/chrome_webapk_host.h",
+      "android/webapk/manifest_upgrade_detector_fetcher.cc",
+      "android/webapk/manifest_upgrade_detector_fetcher.h",
+      "android/webapk/webapk_icon_hasher.cc",
+      "android/webapk/webapk_icon_hasher.h",
+      "android/webapk/webapk_installer.cc",
+      "android/webapk/webapk_installer.h",
+      "android/webapk/webapk_update_manager.cc",
+      "android/webapk/webapk_update_manager.h",
+      "android/webapk/webapk_web_manifest_checker.cc",
+      "android/webapk/webapk_web_manifest_checker.h",
+      "android/webapps/add_to_homescreen_data_fetcher.cc",
+      "android/webapps/add_to_homescreen_data_fetcher.h",
+      "android/webapps/add_to_homescreen_dialog_helper.cc",
+      "android/webapps/add_to_homescreen_dialog_helper.h",
+      "android/webapps/single_tab_mode_tab_helper.cc",
+      "android/webapps/single_tab_mode_tab_helper.h",
+      "android/webapps/webapp_registry.cc",
+      "android/webapps/webapp_registry.h",
+      "autofill/android/personal_data_manager_android.cc",
+      "autofill/android/personal_data_manager_android.h",
+      "dom_distiller/dom_distiller_service_factory_android.cc",
+      "dom_distiller/dom_distiller_service_factory_android.h",
+      "dom_distiller/tab_utils_android.cc",
+      "dom_distiller/tab_utils_android.h",
+      "download/download_request_infobar_delegate_android.cc",
+      "download/download_request_infobar_delegate_android.h",
+      "geolocation/geolocation_infobar_delegate_android.cc",
+      "geolocation/geolocation_infobar_delegate_android.h",
+      "invalidation/invalidation_service_factory_android.cc",
+      "invalidation/invalidation_service_factory_android.h",
+      "lifetime/application_lifetime_android.cc",
+      "lifetime/application_lifetime_android.h",
+      "media/android/cdm/media_drm_credential_manager.cc",
+      "media/android/cdm/media_drm_credential_manager.h",
+      "media/android/remote/record_cast_action.cc",
+      "media/android/remote/record_cast_action.h",
+      "media/android/remote/remote_media_player_bridge.cc",
+      "media/android/remote/remote_media_player_bridge.h",
+      "media/android/remote/remote_media_player_manager.cc",
+      "media/android/remote/remote_media_player_manager.h",
+      "media/android/router/media_router_android.cc",
+      "media/android/router/media_router_android.h",
+      "media/android/router/media_router_dialog_controller_android.cc",
+      "media/android/router/media_router_dialog_controller_android.h",
+      "media/media_stream_infobar_delegate_android.cc",
+      "media/media_stream_infobar_delegate_android.h",
+      "media/midi_permission_infobar_delegate_android.cc",
+      "media/midi_permission_infobar_delegate_android.h",
+      "media/protected_media_identifier_infobar_delegate_android.cc",
+      "media/protected_media_identifier_infobar_delegate_android.h",
+      "metrics/android_metrics_provider.cc",
+      "metrics/android_metrics_provider.h",
+      "metrics/page_load_metrics_provider.cc",
+      "metrics/page_load_metrics_provider.h",
+      "net/spdyproxy/data_reduction_promo_infobar_delegate_android.cc",
+      "net/spdyproxy/data_reduction_promo_infobar_delegate_android.h",
+      "net/spdyproxy/data_reduction_proxy_settings_android.cc",
+      "net/spdyproxy/data_reduction_proxy_settings_android.h",
+      "page_load_metrics/observers/android_page_load_metrics_observer.cc",
+      "page_load_metrics/observers/android_page_load_metrics_observer.h",
+      "password_manager/account_chooser_dialog_android.cc",
+      "password_manager/account_chooser_dialog_android.h",
+      "password_manager/auto_signin_first_run_dialog_android.cc",
+      "password_manager/auto_signin_first_run_dialog_android.h",
+      "password_manager/credential_android.cc",
+      "password_manager/credential_android.h",
+      "password_manager/generated_password_saved_infobar_delegate_android.cc",
+      "password_manager/generated_password_saved_infobar_delegate_android.h",
+      "password_manager/password_manager_infobar_delegate_android.cc",
+      "password_manager/password_manager_infobar_delegate_android.h",
+      "password_manager/save_password_infobar_delegate_android.cc",
+      "password_manager/save_password_infobar_delegate_android.h",
+      "password_manager/update_password_infobar_delegate_android.cc",
+      "password_manager/update_password_infobar_delegate_android.h",
+      "permissions/permission_queue_controller.cc",
+      "permissions/permission_queue_controller.h",
+      "platform_util_android.cc",
+      "precache/precache_manager_factory.cc",
+      "precache/precache_manager_factory.h",
+      "precache/precache_util.cc",
+      "precache/precache_util.h",
+      "prerender/external_prerender_handler_android.cc",
+      "prerender/external_prerender_handler_android.h",
+      "profiles/profile_android.cc",
+      "profiles/profile_android.h",
+      "search/contextual_search_policy_handler_android.cc",
+      "search/contextual_search_policy_handler_android.h",
+      "signin/oauth2_token_service_delegate_android.cc",
+      "signin/oauth2_token_service_delegate_android.h",
+      "ssl/ssl_add_certificate_android.cc",
+    ]
     deps += [
       ":client_discourse_context_proto",
       ":delta_file_proto",
       ":jni_headers",
       "//blimp/client/public",
       "//chrome/browser/android/webapk:proto",
       "//components/data_usage/android",
       "//components/precache/content",
       "//components/precache/core",
       "//components/resources:components_resources",
@@ skipping 45 matching lines @@
       "QuartzCore.framework",
       "SecurityInterface.framework",
     ]
   }
 
   if (enable_rlz) {
     deps += [ ":rlz" ]
   }
 
   if (is_win) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_win_sources, ".", "//chrome")
+    sources += [
+      "downgrade/user_data_downgrade.cc",
+      "downgrade/user_data_downgrade.h",
+      "first_run/try_chrome_dialog_view.cc",
+      "first_run/try_chrome_dialog_view.h",
+      "first_run/upgrade_util.cc",
+      "google/did_run_updater_win.cc",
+      "google/did_run_updater_win.h",
+      "hang_monitor/hang_crash_dump_win.cc",
+      "hang_monitor/hang_crash_dump_win.h",
+      "media/window_icon_util_win.cc",
+      "metrics/antivirus_metrics_provider_win.cc",
+      "metrics/antivirus_metrics_provider_win.h",
+      "password_manager/password_manager_util_win.cc",
+      "password_manager/password_manager_util_win.h",
+      "themes/theme_service_win.cc",
+      "themes/theme_service_win.h",
+    ]
     public_deps += [
       "//ui/views",
       "//ui/views/controls/webview",
     ]
     deps += [
       ":chrome_process_finder",
       "//chrome:file_pre_reader",
       "//chrome/chrome_watcher:client",
       "//chrome/common:metrics_constants_util_win",
       "//chrome/common:version_header",
@@ skipping 15 matching lines @@
       deps -= [ "//google_update" ]
       sources -= [
         "google/did_run_updater_win.cc",
         "google/did_run_updater_win.h",
         "google/google_update_win.cc",
         "google/google_update_win.h",
       ]
     }
   } else {
     # Non-Windows.
-    sources +=
-        rebase_path(gypi_values.chrome_browser_non_win_sources, ".", "//chrome")
+    sources += [
+      "profile_resetter/triggered_profile_resetter_stub.cc",
+      "profiles/profile_shortcut_manager_stub.cc",
+    ]
     if (toolkit_views) {
       deps += [
         "//ui/views",
         "//ui/views/controls/webview",
       ]
     }
   }
 
   if (is_linux) {
     if (use_aura) {
       deps += [ "//build/linux:fontconfig" ]
       if (use_dbus) {
         deps += [ "//dbus" ]
       }
     }
     if (use_x11) {
       configs += [ "//build/config/linux:x11" ]
       deps += [ "//ui/gfx/x" ]
     }
   }
 
   if (is_linux || is_win) {
-    sources += rebase_path(gypi_values.chrome_browser_non_mac_desktop_sources,
-                           ".",
-                           "//chrome")
+    sources += [
+      "renderer_context_menu/spelling_options_submenu_observer.cc",
+      "renderer_context_menu/spelling_options_submenu_observer.h",
+    ]
   }
 
   if (is_desktop_linux) {
-    sources += rebase_path(gypi_values.chrome_browser_linux_desktop_sources,
-                           ".",
-                           "//chrome")
+    # Desktop linux, doesn"t count ChromeOS.
+    sources += [
+      "first_run/upgrade_util.cc",
+      "first_run/upgrade_util_linux.cc",
+      "first_run/upgrade_util_linux.h",
+      "fullscreen_aurax11.cc",
+      "icon_loader_auralinux.cc",
+      "media/window_icon_util_x11.cc",
+      "password_manager/native_backend_kwallet_x.cc",
+      "password_manager/native_backend_kwallet_x.h",
+      "platform_util_linux.cc",
+      "shell_integration_linux.cc",
+      "shell_integration_linux.h",
+      "speech/tts_linux.cc",
+      "themes/theme_service_aurax11.cc",
+      "themes/theme_service_aurax11.h",
+      "web_applications/web_app_linux.cc",
+    ]
   }
   if (enable_plugin_installation) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_plugin_installation_sources,
-                    ".",
-                    "//chrome")
+    sources += [
+      "plugins/plugin_installer.cc",
+      "plugins/plugin_installer.h",
+      "plugins/plugin_installer_observer.cc",
+      "plugins/plugin_installer_observer.h",
+      "plugins/plugins_resource_service.cc",
+      "plugins/plugins_resource_service.h",
+    ]
   }
   if (enable_app_list) {
     deps += [ "//ui/app_list" ]
   }
   if (enable_supervised_users) {
-    sources += rebase_path(gypi_values.chrome_browser_supervised_user_sources,
-                           ".",
-                           "//chrome")
+    sources += [
+      "content_settings/content_settings_supervised_provider.cc",
+      "content_settings/content_settings_supervised_provider.h",
+      "supervised_user/child_accounts/child_account_service.cc",
+      "supervised_user/child_accounts/child_account_service.h",
+      "supervised_user/child_accounts/child_account_service_factory.cc",
+      "supervised_user/child_accounts/child_account_service_factory.h",
+      "supervised_user/child_accounts/family_info_fetcher.cc",
+      "supervised_user/child_accounts/family_info_fetcher.h",
+      "supervised_user/child_accounts/permission_request_creator_apiary.cc",
+      "supervised_user/child_accounts/permission_request_creator_apiary.h",
+      "supervised_user/experimental/safe_search_url_reporter.cc",
+      "supervised_user/experimental/safe_search_url_reporter.h",
+      "supervised_user/experimental/supervised_user_async_url_checker.cc",
+      "supervised_user/experimental/supervised_user_async_url_checker.h",
+      "supervised_user/experimental/supervised_user_blacklist.cc",
+      "supervised_user/experimental/supervised_user_blacklist.h",
+      "supervised_user/experimental/supervised_user_filtering_switches.cc",
+      "supervised_user/experimental/supervised_user_filtering_switches.h",
+      "supervised_user/permission_request_creator.h",
+      "supervised_user/supervised_user_bookmarks_handler.cc",
+      "supervised_user/supervised_user_bookmarks_handler.h",
+      "supervised_user/supervised_user_constants.cc",
+      "supervised_user/supervised_user_constants.h",
+      "supervised_user/supervised_user_content_provider_android.cc",
+      "supervised_user/supervised_user_content_provider_android.h",
+      "supervised_user/supervised_user_features.cc",
+      "supervised_user/supervised_user_features.h",
+      "supervised_user/supervised_user_interstitial.cc",
+      "supervised_user/supervised_user_interstitial.h",
+      "supervised_user/supervised_user_navigation_observer.cc",
+      "supervised_user/supervised_user_navigation_observer.h",
+      "supervised_user/supervised_user_pref_store.cc",
+      "supervised_user/supervised_user_pref_store.h",
+      "supervised_user/supervised_user_resource_throttle.cc",
+      "supervised_user/supervised_user_resource_throttle.h",
+      "supervised_user/supervised_user_service.cc",
+      "supervised_user/supervised_user_service.h",
+      "supervised_user/supervised_user_service_factory.cc",
+      "supervised_user/supervised_user_service_factory.h",
+      "supervised_user/supervised_user_service_observer.h",
+      "supervised_user/supervised_user_settings_service.cc",
+      "supervised_user/supervised_user_settings_service.h",
+      "supervised_user/supervised_user_settings_service_factory.cc",
+      "supervised_user/supervised_user_settings_service_factory.h",
+      "supervised_user/supervised_user_site_list.cc",
+      "supervised_user/supervised_user_site_list.h",
+      "supervised_user/supervised_user_sync_data_type_controller.cc",
+      "supervised_user/supervised_user_sync_data_type_controller.h",
+      "supervised_user/supervised_user_url_filter.cc",
+      "supervised_user/supervised_user_url_filter.h",
+      "supervised_user/supervised_user_whitelist_service.cc",
+      "supervised_user/supervised_user_whitelist_service.h",
+      "supervised_user/supervised_users.h",
+    ]
   }
   if (enable_supervised_users && !is_android) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_supervised_user_legacy_sources,
-                    ".",
-                    "//chrome")
+    # TODO(bauerb): This code should be removed (on desktop) once child account
+    # support has launched (https://crbug.com/505443).
+    sources += [
+      "supervised_user/legacy/custodian_profile_downloader_service.cc",
+      "supervised_user/legacy/custodian_profile_downloader_service.h",
+      "supervised_user/legacy/custodian_profile_downloader_service_factory.cc",
+      "supervised_user/legacy/custodian_profile_downloader_service_factory.h",
+      "supervised_user/legacy/permission_request_creator_sync.cc",
+      "supervised_user/legacy/permission_request_creator_sync.h",
+      "supervised_user/legacy/supervised_user_pref_mapping_service.cc",
+      "supervised_user/legacy/supervised_user_pref_mapping_service.h",
+      "supervised_user/legacy/supervised_user_pref_mapping_service_factory.cc",
+      "supervised_user/legacy/supervised_user_pref_mapping_service_factory.h",
+      "supervised_user/legacy/supervised_user_refresh_token_fetcher.cc",
+      "supervised_user/legacy/supervised_user_refresh_token_fetcher.h",
+      "supervised_user/legacy/supervised_user_registration_utility.cc",
+      "supervised_user/legacy/supervised_user_registration_utility.h",
+      "supervised_user/legacy/supervised_user_registration_utility_stub.cc",
+      "supervised_user/legacy/supervised_user_registration_utility_stub.h",
+      "supervised_user/legacy/supervised_user_shared_settings_service.cc",
+      "supervised_user/legacy/supervised_user_shared_settings_service.h",
+      "supervised_user/legacy/supervised_user_shared_settings_service_factory.cc",
+      "supervised_user/legacy/supervised_user_shared_settings_service_factory.h",
+      "supervised_user/legacy/supervised_user_shared_settings_update.cc",
+      "supervised_user/legacy/supervised_user_shared_settings_update.h",
+      "supervised_user/legacy/supervised_user_sync_service.cc",
+      "supervised_user/legacy/supervised_user_sync_service.h",
+      "supervised_user/legacy/supervised_user_sync_service_factory.cc",
+      "supervised_user/legacy/supervised_user_sync_service_factory.h",
+      "supervised_user/legacy/supervised_user_sync_service_observer.h",
+    ]
   }
   if (enable_supervised_users && enable_themes) {
-    sources += rebase_path(
-            gypi_values.chrome_browser_supervised_user_and_themes_sources,
-            ".",
-            "//chrome")
+    sources += [
+      "supervised_user/supervised_user_theme.cc",
+      "supervised_user/supervised_user_theme.h",
+    ]
   }
   if (enable_webrtc) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_webrtc_sources, ".", "//chrome")
+    sources += [
+      # TODO(brettw) should webrtc_log_list.cc go here?
+      "media/audio_debug_recordings_handler.cc",
+      "media/audio_debug_recordings_handler.h",
+      "media/webrtc_event_log_handler.cc",
+      "media/webrtc_event_log_handler.h",
+      "media/webrtc_log_uploader.cc",
+      "media/webrtc_log_uploader.h",
+      "media/webrtc_log_util.cc",
+      "media/webrtc_log_util.h",
+      "media/webrtc_logging_handler_host.cc",
+      "media/webrtc_logging_handler_host.h",
+      "media/webrtc_rtp_dump_handler.cc",
+      "media/webrtc_rtp_dump_handler.h",
+      "media/webrtc_rtp_dump_writer.cc",
+      "media/webrtc_rtp_dump_writer.h",
+    ]
   }
   if (enable_service_discovery) {
-    sources += rebase_path(gypi_values.chrome_browser_service_discovery_sources,
-                           ".",
-                           "//chrome")
+    sources += [
+      "local_discovery/endpoint_resolver.cc",
+      "local_discovery/endpoint_resolver.h",
+      "local_discovery/service_discovery_client.cc",
+      "local_discovery/service_discovery_client.h",
+      "local_discovery/service_discovery_client_mac.h",
+      "local_discovery/service_discovery_client_mac.mm",
+      "local_discovery/service_discovery_client_mac_factory.h",
+      "local_discovery/service_discovery_client_mac_factory.mm",
+      "local_discovery/service_discovery_device_lister.cc",
+      "local_discovery/service_discovery_device_lister.h",
+      "local_discovery/service_discovery_shared_client.cc",
+      "local_discovery/service_discovery_shared_client.h",
+      "printing/cloud_print/cloud_print_printer_list.cc",
+      "printing/cloud_print/cloud_print_printer_list.h",
+      "printing/cloud_print/device_description.cc",
+      "printing/cloud_print/device_description.h",
+      "printing/cloud_print/gcd_api_flow.cc",
+      "printing/cloud_print/gcd_api_flow.h",
+      "printing/cloud_print/gcd_api_flow_impl.cc",
+      "printing/cloud_print/gcd_api_flow_impl.h",
+      "printing/cloud_print/gcd_constants.cc",
+      "printing/cloud_print/gcd_constants.h",
+      "printing/cloud_print/privet_confirm_api_flow.cc",
+      "printing/cloud_print/privet_confirm_api_flow.h",
+      "printing/cloud_print/privet_constants.cc",
+      "printing/cloud_print/privet_constants.h",
+      "printing/cloud_print/privet_device_lister.cc",
+      "printing/cloud_print/privet_device_lister.h",
+      "printing/cloud_print/privet_device_lister_impl.cc",
+      "printing/cloud_print/privet_device_lister_impl.h",
+      "printing/cloud_print/privet_http.cc",
+      "printing/cloud_print/privet_http.h",
+      "printing/cloud_print/privet_http_asynchronous_factory.cc",
+      "printing/cloud_print/privet_http_asynchronous_factory.h",
+      "printing/cloud_print/privet_http_asynchronous_factory_impl.cc",
+      "printing/cloud_print/privet_http_asynchronous_factory_impl.h",
+      "printing/cloud_print/privet_http_impl.cc",
+      "printing/cloud_print/privet_http_impl.h",
+      "printing/cloud_print/privet_local_printer_lister.cc",
+      "printing/cloud_print/privet_local_printer_lister.h",
+      "printing/cloud_print/privet_notifications.cc",
+      "printing/cloud_print/privet_notifications.h",
+      "printing/cloud_print/privet_notifications_factory.cc",
+      "printing/cloud_print/privet_notifications_factory.h",
+      "printing/cloud_print/privet_url_fetcher.cc",
+      "printing/cloud_print/privet_url_fetcher.h",
+    ]
   }
   if (enable_mdns) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_mdns_sources, ".", "//chrome")
+    sources += [
+      "local_discovery/service_discovery_client_impl.cc",
+      "local_discovery/service_discovery_client_impl.h",
+      "local_discovery/service_discovery_client_mdns.cc",
+      "local_discovery/service_discovery_client_mdns.h",
+      "printing/cloud_print/privet_traffic_detector.cc",
+      "printing/cloud_print/privet_traffic_detector.h",
+    ]
   }
   if (is_android) {
     sources -= [
       "autofill/validation_rules_storage_factory.cc",
       "autofill/validation_rules_storage_factory.h",
     ]
   }
   if (enable_media_router) {
     deps += [ "//chrome/browser/media/router" ]
   }
@@ skipping 18 matching lines @@
     sources += [
       "chrome_browser_main_extra_parts_exo.cc",
       "chrome_browser_main_extra_parts_exo.h",
     ]
   }
 }
 
 if (android_java_ui) {
   # GYP version: chrome/chrome_browser.gypi:chrome_browser_jni_headers
   generate_jni("jni_headers") {
-    sources =
-        rebase_path(gypi_values.chrome_browser_jni_sources, ".", "//chrome")
+    sources = [
+      "../android/java/src/org/chromium/chrome/browser/AfterStartupTaskUtils.java",
+      "../android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java",
+      "../android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java",
+      "../android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java",
+      "../android/java/src/org/chromium/chrome/browser/ChromeApplication.java",
+      "../android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java",
+      "../android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java",
+      "../android/java/src/org/chromium/chrome/browser/DevToolsServer.java",
+      "../android/java/src/org/chromium/chrome/browser/IntentHelper.java",
+      "../android/java/src/org/chromium/chrome/browser/JavaExceptionReporter.java",
+      "../android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java",
+      "../android/java/src/org/chromium/chrome/browser/PasswordUIView.java",
+      "../android/java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java",
+      "../android/java/src/org/chromium/chrome/browser/ServiceTabLauncher.java",
+      "../android/java/src/org/chromium/chrome/browser/ShortcutHelper.java",
+      "../android/java/src/org/chromium/chrome/browser/TabState.java",
+      "../android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java",
+      "../android/java/src/org/chromium/chrome/browser/UsbChooserDialog.java",
+      "../android/java/src/org/chromium/chrome/browser/WarmupManager.java",
+      "../android/java/src/org/chromium/chrome/browser/WebContentsFactory.java",
+      "../android/java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java",
+      "../android/java/src/org/chromium/chrome/browser/appmenu/AppMenuDragHelper.java",
+      "../android/java/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessoryBridge.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/CardUnmaskBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/autofill/CreditCardScannerBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/autofill/PasswordGenerationPopupBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java",
+      "../android/java/src/org/chromium/chrome/browser/banners/AppBannerManager.java",
+      "../android/java/src/org/chromium/chrome/browser/blimp/BlimpClientContextFactory.java",
+      "../android/java/src/org/chromium/chrome/browser/blimp/ChromeBlimpClientContextDelegate.java",
+      "../android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/browsing_data/UrlFilterBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountFeedbackReporter.java",
+      "../android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java",
+      "../android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java",
+      "../android/java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java",
+      "../android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java",
+      "../android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java",
+      "../android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java",
+      "../android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ReaderModeSceneLayer.java",
+      "../android/java/src/org/chromium/chrome/browser/compositor/scene_layer/SceneLayer.java",
+      "../android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java",
+      "../android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java",
+      "../android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java",
+      "../android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ToolbarSceneLayer.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/contextualsearch/ContextualSearchManager.java",
+      "../android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java",
+      "../android/java/src/org/chromium/chrome/browser/cookies/CookiesFetcher.java",
+      "../android/java/src/org/chromium/chrome/browser/database/SQLiteCursor.java",
+      "../android/java/src/org/chromium/chrome/browser/datausage/DataUseTabUIManager.java",
+      "../android/java/src/org/chromium/chrome/browser/datausage/ExternalDataUseObserver.java",
+      "../android/java/src/org/chromium/chrome/browser/document/DocumentWebContentsDelegate.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/dom_distiller/DomDistillerUIUtils.java",
+      "../android/java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java",
+      "../android/java/src/org/chromium/chrome/browser/download/DownloadController.java",
+      "../android/java/src/org/chromium/chrome/browser/download/DownloadManagerService.java",
+      "../android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java",
+      "../android/java/src/org/chromium/chrome/browser/favicon/LargeIconBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java",
+      "../android/java/src/org/chromium/chrome/browser/feedback/ScreenshotTask.java",
+      "../android/java/src/org/chromium/chrome/browser/findinpage/FindInPageBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarAndroid.java",
+      "../android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarDelegateAndroid.java",
+      "../android/java/src/org/chromium/chrome/browser/infobar/AutofillCreditCardFillingInfoBar.java",
+      "../android/java/src/org/chromium/chrome/browser/infobar/AutofillSaveCardInfoBar.java",
+      "../android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar.java",
+      "../android/java/src/org/chromium/chrome/browser/infobar/DataReductionPromoInfoBarDelegate.java",
+      "../android/java/src/org/chromium/chrome/browser/infobar/DownloadOverwriteInfoBar.java",
+      "../android/java/src/org/chromium/chrome/browser/infobar/GeneratedPasswordSavedInfoBarDelegate.java",
+      "../android/java/src/org/chromium/chrome/browser/infobar/GroupedPermissionInfoBar.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/InstantAppsInfoBar.java",
+      "../android/java/src/org/chromium/chrome/browser/infobar/InstantAppsInfoBarDelegate.java",
+      "../android/java/src/org/chromium/chrome/browser/infobar/PermissionInfoBar.java",
+      "../android/java/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfoBarDelegate.java",
+      "../android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java",
+      "../android/java/src/org/chromium/chrome/browser/infobar/SimpleConfirmInfoBarBuilder.java",
+      "../android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java",
+      "../android/java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java",
+      "../android/java/src/org/chromium/chrome/browser/invalidation/InvalidationServiceFactory.java",
+      "../android/java/src/org/chromium/chrome/browser/media/cdm/MediaDrmCredentialManager.java",
+      "../android/java/src/org/chromium/chrome/browser/media/remote/RecordCastAction.java",
+      "../android/java/src/org/chromium/chrome/browser/media/remote/RemoteMediaPlayerBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java",
+      "../android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterDialogController.java",
+      "../android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java",
+      "../android/java/src/org/chromium/chrome/browser/metrics/PageLoadMetrics.java",
+      "../android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java",
+      "../android/java/src/org/chromium/chrome/browser/metrics/UmaUtils.java",
+      "../android/java/src/org/chromium/chrome/browser/metrics/VariationsSession.java",
+      "../android/java/src/org/chromium/chrome/browser/mojo/ChromeInterfaceRegistrar.java",
+      "../android/java/src/org/chromium/chrome/browser/net/qualityprovider/ExternalEstimateProviderAndroid.java",
+      "../android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java",
+      "../android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/ntp/ForeignSessionHelper.java",
+      "../android/java/src/org/chromium/chrome/browser/ntp/LogoBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/ntp/NewTabPagePrefs.java",
+      "../android/java/src/org/chromium/chrome/browser/ntp/RecentlyClosedBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java",
+      "../android/java/src/org/chromium/chrome/browser/offlinepages/BackgroundSchedulerBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/offlinepages/SavePageRequest.java",
+      "../android/java/src/org/chromium/chrome/browser/offlinepages/downloads/OfflinePageDownloadBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/offlinepages/downloads/OfflinePageNotificationBridge.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/OmniboxUrlEmphasizer.java",
+      "../android/java/src/org/chromium/chrome/browser/omnibox/OmniboxViewUtil.java",
+      "../android/java/src/org/chromium/chrome/browser/pageinfo/CertificateViewer.java",
+      "../android/java/src/org/chromium/chrome/browser/pageinfo/ConnectionInfoPopup.java",
+      "../android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java",
+      "../android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksReader.java",
+      "../android/java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java",
+      "../android/java/src/org/chromium/chrome/browser/password_manager/AutoSigninFirstRunDialog.java",
+      "../android/java/src/org/chromium/chrome/browser/password_manager/Credential.java",
+      "../android/java/src/org/chromium/chrome/browser/policy/PolicyAuditor.java",
+      "../android/java/src/org/chromium/chrome/browser/precache/PrecacheLauncher.java",
+      "../android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java",
+      "../android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillProfileBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/preferences/privacy/BrowsingDataCounterBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.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/provider/ChromeBrowserProvider.java",
+      "../android/java/src/org/chromium/chrome/browser/push_messaging/PushMessagingServiceObserver.java",
+      "../android/java/src/org/chromium/chrome/browser/rappor/RapporServiceBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/rlz/RevenueStats.java",
+      "../android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingApiBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java",
+      "../android/java/src/org/chromium/chrome/browser/sessions/SessionTabHelper.java",
+      "../android/java/src/org/chromium/chrome/browser/signin/AccountManagementScreenHelper.java",
+      "../android/java/src/org/chromium/chrome/browser/signin/AccountTrackerService.java",
+      "../android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java",
+      "../android/java/src/org/chromium/chrome/browser/signin/SigninInvestigator.java",
+      "../android/java/src/org/chromium/chrome/browser/signin/SigninManager.java",
+      "../android/java/src/org/chromium/chrome/browser/signin/SigninPromoUtil.java",
+      "../android/java/src/org/chromium/chrome/browser/snackbar/smartlockautosignin/AutoSigninSnackbarController.java",
+      "../android/java/src/org/chromium/chrome/browser/ssl/SecurityStateModel.java",
+      "../android/java/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProvider.java",
+      "../android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java",
+      "../android/java/src/org/chromium/chrome/browser/sync/SyncSessionsMetrics.java",
+      "../android/java/src/org/chromium/chrome/browser/tab/Tab.java",
+      "../android/java/src/org/chromium/chrome/browser/tab/TabWebContentsDelegateAndroid.java",
+      "../android/java/src/org/chromium/chrome/browser/tabmodel/SingleTabModel.java",
+      "../android/java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java",
+      "../android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java",
+      "../android/java/src/org/chromium/chrome/browser/util/AccessibilityUtil.java",
+      "../android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java",
+      "../android/java/src/org/chromium/chrome/browser/util/PlatformUtil.java",
+      "../android/java/src/org/chromium/chrome/browser/util/UrlUtilities.java",
+      "../android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialogHelper.java",
+      "../android/java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java",
+      "../android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorFetcher.java",
+      "../android/java/src/org/chromium/chrome/browser/webapps/WebApkInstaller.java",
+      "../android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java",
+      "../android/java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java",
+    ]
     jni_package = "chrome"
   }
 
   #GYP: '//chrome/chrome_browser.gypi:client_discourse_context_proto'
   proto_library("client_discourse_context_proto") {
     sources = [
       "android/proto/client_discourse_context.proto",
     ]
   }
 
@@ skipping 346 matching lines @@
     "//components/password_manager/content/public/interfaces",
     "//components/password_manager/core/browser:test_support",
     "//components/translate/content/common",
     "//skia",
     "//testing/gtest",
   ]
 }
 
 if (enable_rlz_support) {
   static_library("rlz") {
-    sources =
-        rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome")
+    sources = [
+      "rlz/chrome_rlz_tracker_delegate.cc",
+      "rlz/chrome_rlz_tracker_delegate.h",
+    ]
     deps = [
       "//components/google/core/browser",
       "//components/omnibox/browser",
       "//components/rlz",
       "//components/search_engines",
       "//rlz:rlz_lib",
     ]
   }
 }
 
 if (enable_pepper_cdms) {
   # These constants are separated so that test binaries can use them without
   # linking all of the test support.
   static_library("pepper_cdm_test_constants") {
     testonly = true
     visibility = [ "//chrome/*" ]
     sources = [
       "media/pepper_cdm_test_constants.cc",
       "media/pepper_cdm_test_constants.h",
     ]
   }
 }