diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/chrome | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/chrome')
30 files changed, 1464 insertions, 1210 deletions
diff --git a/chromium/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp b/chromium/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp index d20485797b0..6c50d8b1c6d 100644 --- a/chromium/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp +++ b/chromium/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp @@ -13,12 +13,13 @@ 'dependencies': [ '../../../../base/base.gyp:base', '../../../../base/base.gyp:base_i18n', + '../../../../build/linux/system.gyp:gconf', '../../../../build/linux/system.gyp:gtk', '../../../../skia/skia.gyp:skia', '../../../../ui/base/strings/ui_strings.gyp:ui_strings', '../../../../ui/ui.gyp:ui', '../../../../ui/ui.gyp:ui_resources', - '../../../../ui/linux_ui/linux_ui.gyp:linux_ui', + '../../../../ui/views/views.gyp:views', '../../../chrome_resources.gyp:chrome_extra_resources', '../../../chrome_resources.gyp:chrome_resources', '../../../chrome_resources.gyp:chrome_strings', @@ -37,6 +38,8 @@ 'app_indicator_icon.h', 'chrome_gtk_frame.cc', 'chrome_gtk_frame.h', + 'gconf_titlebar_listener.cc', + 'gconf_titlebar_listener.h', 'gtk2_ui.cc', 'gtk2_ui.h', 'gtk2_util.cc', diff --git a/chromium/chrome/chrome.gyp b/chromium/chrome/chrome.gyp index b9988b8e68b..f6fad78840b 100644 --- a/chromium/chrome/chrome.gyp +++ b/chromium/chrome/chrome.gyp @@ -136,17 +136,7 @@ ] } ], - }], - ['OS=="linux" and chromeos==1 and branding=="Chrome"', { - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'files': [ - 'browser/extensions/default_extensions/chromeos/extensions/' - ] - } - ], - }], + }] ], }, { @@ -187,6 +177,8 @@ 'browser/devtools/browser_list_tabcontents_provider.h', 'browser/devtools/devtools_adb_bridge.cc', 'browser/devtools/devtools_adb_bridge.h', + 'browser/devtools/devtools_embedder_message_dispatcher.cc', + 'browser/devtools/devtools_embedder_message_dispatcher.h', 'browser/devtools/devtools_file_helper.cc', 'browser/devtools/devtools_file_helper.h', 'browser/devtools/devtools_file_system_indexer.cc', @@ -196,10 +188,10 @@ 'browser/devtools/devtools_toggle_action.h', 'browser/devtools/devtools_window.cc', 'browser/devtools/devtools_window.h', + 'browser/devtools/port_forwarding_controller.cc', + 'browser/devtools/port_forwarding_controller.h', 'browser/devtools/remote_debugging_server.cc', 'browser/devtools/remote_debugging_server.h', - 'browser/devtools/tethering_adb_filter.cc', - 'browser/devtools/tethering_adb_filter.h', ], 'conditions': [ ['toolkit_uses_gtk == 1', { @@ -212,7 +204,9 @@ '../third_party/libusb/libusb.gyp:libusb', ], 'sources!': [ + 'browser/devtools/adb/android_rsa.cc', 'browser/devtools/browser_list_tabcontents_provider.cc', + 'browser/devtools/devtools_file_system_indexer.cc', 'browser/devtools/devtools_window.cc', 'browser/devtools/remote_debugging_server.cc', ], @@ -790,8 +784,6 @@ { 'action_name': 'strip_reliability_tests', 'inputs': [ - '<(PRODUCT_DIR)/automated_ui_tests', - '<(PRODUCT_DIR)/reliability_tests', '<(PRODUCT_DIR)/_pyautolib.so', ], 'outputs': [ @@ -803,10 +795,6 @@ 'message': 'Stripping reliability tests', }, ], - 'dependencies': [ - 'automated_ui_tests', - 'reliability_tests', - ], }], ], }, @@ -878,7 +866,6 @@ ], }, 'sources': [ - 'app/app_host_exe.ver', 'app/chrome_exe.ver', 'app/chrome_dll.ver', 'app/nacl64_exe.ver', diff --git a/chromium/chrome/chrome_android.gypi b/chromium/chrome/chrome_android.gypi index 8237fac6e5e..f7b2b4a513c 100644 --- a/chromium/chrome/chrome_android.gypi +++ b/chromium/chrome/chrome_android.gypi @@ -19,6 +19,9 @@ 'chrome_android_auxiliary', 'chromium_testshell_jni_headers', 'chrome.gyp:browser_ui', + '../content/content.gyp:content_app_browser', + # TODO(miguelg): This should be indirect, see http://crbug.com/280695 . + '../skia/skia.gyp:skia', ], 'sources': [ # This file must always be included in the shared_library step to ensure @@ -105,6 +108,7 @@ 'chrome.gyp:renderer', 'chrome.gyp:utility', '../content/content.gyp:content', + '../content/content.gyp:content_app_browser', ], 'include_dirs': [ '..', diff --git a/chromium/chrome/chrome_android_paks.gypi b/chromium/chrome/chrome_android_paks.gypi index 6a95ee566dd..7937f2fd5b7 100644 --- a/chromium/chrome/chrome_android_paks.gypi +++ b/chromium/chrome/chrome_android_paks.gypi @@ -5,7 +5,6 @@ 'variables': { 'chrome_android_pak_output_folder': '<@(PRODUCT_DIR)/../assets/<(package_name)', 'chrome_android_pak_input_resources': [ - '<(PRODUCT_DIR)/chrome.pak', '<(PRODUCT_DIR)/resources.pak', '<(PRODUCT_DIR)/chrome_100_percent.pak', '<(PRODUCT_DIR)/locales/am.pak', @@ -54,7 +53,6 @@ '<(PRODUCT_DIR)/locales/zh-TW.pak', ], 'chrome_android_pak_output_resources': [ - '<(chrome_android_pak_output_folder)/chrome.pak', '<(chrome_android_pak_output_folder)/resources.pak', '<(chrome_android_pak_output_folder)/chrome_100_percent.pak', '<(chrome_android_pak_output_folder)/am.pak', diff --git a/chromium/chrome/chrome_browser.gypi b/chromium/chrome/chrome_browser.gypi index b31118d7de3..a704aa1b6e4 100644 --- a/chromium/chrome/chrome_browser.gypi +++ b/chromium/chrome/chrome_browser.gypi @@ -26,11 +26,15 @@ 'probe_message_proto', 'safe_browsing_proto', 'safe_browsing_report_proto', - 'variations_seed_proto', '../components/components.gyp:browser_context_keyed_service', '../components/components.gyp:encryptor', '../components/components.gyp:sessions', + '../components/components.gyp:startup_metric_utils', '../components/components.gyp:user_prefs', + # This depends directly on the variations target, rather than just + # transitively via the common target because the proto sources need to + # be generated before code in this target can start building. + '../components/components.gyp:variations', '../components/components.gyp:visitedlink_browser', '../components/components.gyp:visitedlink_common', '../components/components.gyp:web_modal', @@ -40,7 +44,6 @@ '../crypto/crypto.gyp:crypto', '../google_apis/google_apis.gyp:google_apis', '../jingle/jingle.gyp:notifier', - '../media/media.gyp:media', '../skia/skia.gyp:skia', '../sql/sql.gyp:sql', '../sync/sync.gyp:sync', @@ -51,8 +54,8 @@ '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libxml/libxml.gyp:libxml', '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', + '../third_party/zlib/google/zip.gyp:zip', '../third_party/zlib/zlib.gyp:minizip', - '../third_party/zlib/zlib.gyp:zip', '../third_party/zlib/zlib.gyp:zlib', '../ui/base/strings/ui_strings.gyp:ui_strings', '../ui/message_center/message_center.gyp:message_center', @@ -85,6 +88,8 @@ 'browser/accessibility/accessibility_events.h', 'browser/accessibility/invert_bubble_prefs.cc', 'browser/accessibility/invert_bubble_prefs.h', + 'browser/android/bookmarks_bridge.cc', + 'browser/android/bookmarks_bridge.h', 'browser/android/chrome_jni_registrar.cc', 'browser/android/chrome_jni_registrar.h', 'browser/android/chrome_startup_flags.cc', @@ -122,10 +127,20 @@ 'browser/android/resource_mapper.cc', 'browser/android/resource_mapper.h', 'browser/android/resource_id.h', + 'browser/android/shortcut_helper.cc', + 'browser/android/shortcut_helper.h', + 'browser/android/signin/google_auto_login_helper.cc', + 'browser/android/signin/google_auto_login_helper.h', 'browser/android/signin/signin_manager_android.cc', 'browser/android/signin/signin_manager_android.h', 'browser/android/tab_android.cc', 'browser/android/tab_android.h', + 'browser/android/uma_utils.cc', + 'browser/android/uma_utils.h', + 'browser/android/url_utilities.cc', + 'browser/android/url_utilities.h', + 'browser/android/webapps/single_tab_mode_tab_helper.cc', + 'browser/android/webapps/single_tab_mode_tab_helper.h', 'browser/app_controller_mac.h', 'browser/app_controller_mac.mm', 'browser/app_icon_win.cc', @@ -176,8 +191,6 @@ 'browser/autocomplete/zero_suggest_provider.h', 'browser/autofill/android/personal_data_manager_android.cc', 'browser/autofill/android/personal_data_manager_android.h', - 'browser/autofill/autocheckout_whitelist_manager_factory.cc', - 'browser/autofill/autocheckout_whitelist_manager_factory.h', 'browser/autofill/autofill_cc_infobar_delegate.cc', 'browser/autofill/autofill_cc_infobar_delegate.h', 'browser/autofill/personal_data_manager_factory.cc', @@ -402,6 +415,8 @@ 'browser/component_updater/component_updater_service.cc', 'browser/component_updater/component_updater_service.h', 'browser/component_updater/crx_update_item.h', + 'browser/component_updater/default_component_installer.cc', + 'browser/component_updater/default_component_installer.h', 'browser/component_updater/flash_component_installer.h', 'browser/component_updater/pepper_flash_component_installer.cc', 'browser/component_updater/pnacl/pnacl_component_installer.cc', @@ -470,6 +485,8 @@ 'browser/defaults.h', 'browser/diagnostics/diagnostics_controller.cc', 'browser/diagnostics/diagnostics_controller.h', + 'browser/diagnostics/diagnostics_metrics.cc', + 'browser/diagnostics/diagnostics_metrics.h', 'browser/diagnostics/diagnostics_model.cc', 'browser/diagnostics/diagnostics_model.h', 'browser/diagnostics/diagnostics_test.cc', @@ -480,6 +497,8 @@ 'browser/diagnostics/recon_diagnostics.h', 'browser/diagnostics/sqlite_diagnostics.cc', 'browser/diagnostics/sqlite_diagnostics.h', + 'browser/download/all_download_item_notifier.cc', + 'browser/download/all_download_item_notifier.h', 'browser/download/chrome_download_manager_delegate.cc', 'browser/download/chrome_download_manager_delegate.h', 'browser/download/download_completion_blocker.cc', @@ -491,6 +510,8 @@ 'browser/download/download_danger_prompt.h', 'browser/download/download_extensions.cc', 'browser/download/download_extensions.h', + 'browser/download/download_field_trial.cc', + 'browser/download/download_field_trial.h', 'browser/download/download_file_picker.cc', 'browser/download/download_file_picker.h', 'browser/download/download_history.cc', @@ -530,10 +551,8 @@ 'browser/download/download_target_determiner_delegate.h', 'browser/download/download_ui_controller.cc', 'browser/download/download_ui_controller.h', - 'browser/download/download_util.cc', - 'browser/download/download_util.h', - 'browser/download/all_download_item_notifier.cc', - 'browser/download/all_download_item_notifier.h', + 'browser/download/drag_download_item.h', + 'browser/download/drag_download_item_views.cc', 'browser/download/save_package_file_picker.cc', 'browser/download/save_package_file_picker.h', 'browser/drive/drive_api_service.cc', @@ -800,14 +819,14 @@ 'browser/history/top_sites_database.h', 'browser/history/top_sites_impl.cc', 'browser/history/top_sites_impl.h', - 'browser/history/top_sites_likely_impl.cc', - 'browser/history/top_sites_likely_impl.h', 'browser/history/typed_url_syncable_service.cc', 'browser/history/typed_url_syncable_service.h', 'browser/history/url_database.cc', 'browser/history/url_database.h', 'browser/history/url_index_private_data.cc', 'browser/history/url_index_private_data.h', + 'browser/history/url_utils.cc', + 'browser/history/url_utils.h', 'browser/history/visit_database.cc', 'browser/history/visit_database.h', 'browser/history/visit_filter.cc', @@ -873,12 +892,16 @@ 'browser/infobars/insecure_content_infobar_delegate.h', 'browser/infobars/simple_alert_infobar_delegate.cc', 'browser/infobars/simple_alert_infobar_delegate.h', + 'browser/install_module_verifier_win.cc', + 'browser/install_module_verifier_win.h', 'browser/internal_auth.cc', 'browser/internal_auth.h', 'browser/intranet_redirect_detector.cc', 'browser/intranet_redirect_detector.h', 'browser/invalidation/fake_invalidation_service.cc', 'browser/invalidation/fake_invalidation_service.h', + 'browser/invalidation/invalidation_controller_android.cc', + 'browser/invalidation/invalidation_controller_android.h', 'browser/invalidation/invalidation_service.h', 'browser/invalidation/invalidation_service_android.cc', 'browser/invalidation/invalidation_service_android.h', @@ -911,15 +934,33 @@ 'browser/lifetime/application_lifetime_mac.mm', 'browser/lifetime/application_lifetime_stub.cc', 'browser/lifetime/application_lifetime_win.cc', + 'browser/lifetime/browser_close_manager.cc', + 'browser/lifetime/browser_close_manager.h', + 'browser/local_discovery/cloud_print_account_manager.cc', + 'browser/local_discovery/cloud_print_account_manager.h', + 'browser/local_discovery/cloud_print_base_api_flow.cc', + 'browser/local_discovery/cloud_print_base_api_flow.h', + 'browser/local_discovery/cloud_print_printer_list.cc', + 'browser/local_discovery/cloud_print_printer_list.h', 'browser/local_discovery/privet_confirm_api_flow.cc', 'browser/local_discovery/privet_confirm_api_flow.h', - 'browser/local_discovery/privet_constants.h', 'browser/local_discovery/privet_constants.cc', - 'browser/local_discovery/privet_url_fetcher.cc', - 'browser/local_discovery/privet_url_fetcher.h', + 'browser/local_discovery/privet_constants.h', + 'browser/local_discovery/privet_device_lister.cc', + 'browser/local_discovery/privet_device_lister.h', + 'browser/local_discovery/privet_device_lister_impl.cc', + 'browser/local_discovery/privet_device_lister_impl.h', 'browser/local_discovery/privet_http.h', - 'browser/local_discovery/privet_http_impl.h', 'browser/local_discovery/privet_http_impl.cc', + 'browser/local_discovery/privet_http_impl.h', + 'browser/local_discovery/privet_url_fetcher.cc', + 'browser/local_discovery/privet_url_fetcher.h', + 'browser/local_discovery/service_discovery_client_mac.h', + 'browser/local_discovery/service_discovery_client_mac.mm', + 'browser/local_discovery/service_discovery_client_mac_factory.h', + 'browser/local_discovery/service_discovery_client_mac_factory.mm', + 'browser/local_discovery/service_discovery_shared_client.cc', + 'browser/local_discovery/service_discovery_shared_client.h', 'browser/mac/dock.h', 'browser/mac/dock.mm', 'browser/mac/install_from_dmg.h', @@ -950,10 +991,18 @@ 'browser/managed_mode/managed_mode_site_list.h', 'browser/managed_mode/managed_mode_url_filter.cc', 'browser/managed_mode/managed_mode_url_filter.h', + 'browser/managed_mode/managed_user_constants.cc', + 'browser/managed_mode/managed_user_constants.h', 'browser/managed_mode/managed_user_refresh_token_fetcher.cc', 'browser/managed_mode/managed_user_refresh_token_fetcher.h', 'browser/managed_mode/managed_user_registration_utility.cc', 'browser/managed_mode/managed_user_registration_utility.h', + 'browser/managed_mode/managed_user_registration_utility_stub.cc', + 'browser/managed_mode/managed_user_registration_utility_stub.h', + 'browser/managed_mode/managed_user_settings_service.cc', + 'browser/managed_mode/managed_user_settings_service.h', + 'browser/managed_mode/managed_user_settings_service_factory.cc', + 'browser/managed_mode/managed_user_settings_service_factory.h', 'browser/managed_mode/managed_user_service.cc', 'browser/managed_mode/managed_user_service.h', 'browser/managed_mode/managed_user_service_factory.cc', @@ -966,15 +1015,21 @@ 'browser/managed_mode/managed_user_theme.cc', 'browser/managed_mode/managed_user_theme.h', 'browser/managed_mode/managed_users.h', + 'browser/managed_mode/supervised_user_pref_store.cc', + 'browser/managed_mode/supervised_user_pref_store.h', 'browser/media/audio_stream_indicator.cc', 'browser/media/audio_stream_indicator.h', 'browser/media/chrome_midi_permission_context.cc', 'browser/media/chrome_midi_permission_context.h', 'browser/media/chrome_midi_permission_context_factory.cc', 'browser/media/chrome_midi_permission_context_factory.h', + 'browser/media/desktop_streams_registry.cc', + 'browser/media/desktop_streams_registry.h', 'browser/media/desktop_media_picker.h', 'browser/media/desktop_media_picker_model.cc', 'browser/media/desktop_media_picker_model.h', + 'browser/media/encrypted_media_message_filter_android.cc', + 'browser/media/encrypted_media_message_filter_android.h', 'browser/media/media_capture_devices_dispatcher.cc', 'browser/media/media_capture_devices_dispatcher.h', 'browser/media/media_stream_capture_indicator.cc', @@ -1012,8 +1067,8 @@ 'browser/media_galleries/fileapi/mtp_device_map_service.h', 'browser/media_galleries/fileapi/native_media_file_util.cc', 'browser/media_galleries/fileapi/native_media_file_util.h', - 'browser/media_galleries/fileapi/picasa/picasa_finder.cc', - 'browser/media_galleries/fileapi/picasa/picasa_finder.h', + 'browser/media_galleries/fileapi/picasa_finder.cc', + 'browser/media_galleries/fileapi/picasa_finder.h', 'browser/media_galleries/fileapi/safe_audio_video_checker.cc', 'browser/media_galleries/fileapi/safe_audio_video_checker.h', 'browser/media_galleries/fileapi/safe_itunes_pref_parser_win.cc', @@ -1075,8 +1130,6 @@ 'browser/metrics/compression_utils.h', 'browser/metrics/field_trial_synchronizer.cc', 'browser/metrics/field_trial_synchronizer.h', - 'browser/metrics/gzipped_protobufs_field_trial.cc', - 'browser/metrics/gzipped_protobufs_field_trial.h', 'browser/metrics/metric_event_duration_details.h', 'browser/metrics/metrics_log.cc', 'browser/metrics/metrics_log.h', @@ -1105,8 +1158,6 @@ 'browser/metrics/variations/variations_request_scheduler.h', 'browser/metrics/variations/variations_request_scheduler_mobile.cc', 'browser/metrics/variations/variations_request_scheduler_mobile.h', - 'browser/metrics/variations/variations_seed_processor.cc', - 'browser/metrics/variations/variations_seed_processor.h', 'browser/metrics/variations/variations_service.cc', 'browser/metrics/variations/variations_service.h', 'browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc', @@ -1125,6 +1176,8 @@ 'browser/net/chrome_http_user_agent_settings.h', 'browser/net/chrome_net_log.cc', 'browser/net/chrome_net_log.h', + 'browser/net/chrome_network_data_saving_metrics.cc', + 'browser/net/chrome_network_data_saving_metrics.h', 'browser/net/chrome_network_delegate.cc', 'browser/net/chrome_network_delegate.h', 'browser/net/chrome_url_request_context.cc', @@ -1196,6 +1249,8 @@ 'browser/net/transport_security_persister.h', 'browser/net/url_info.cc', 'browser/net/url_info.h', + 'browser/network_time/navigation_time_helper.cc', + 'browser/network_time/navigation_time_helper.h', 'browser/notifications/balloon.cc', 'browser/notifications/balloon.h', 'browser/notifications/balloon_collection.cc', @@ -1220,8 +1275,16 @@ 'browser/notifications/message_center_notification_manager_win.cc', 'browser/notifications/message_center_settings_controller.cc', 'browser/notifications/message_center_settings_controller.h', + 'browser/notifications/message_center_stats_collector.cc', + 'browser/notifications/message_center_stats_collector.h', 'browser/notifications/notification.cc', 'browser/notifications/notification.h', + 'browser/notifications/screen_lock_notification_blocker.cc', + 'browser/notifications/screen_lock_notification_blocker.h', + 'browser/notifications/fullscreen_notification_blocker.cc', + 'browser/notifications/fullscreen_notification_blocker.h', + 'browser/notifications/login_state_notification_blocker_chromeos.cc', + 'browser/notifications/login_state_notification_blocker_chromeos.h', 'browser/notifications/notification_delegate.cc', 'browser/notifications/notification_delegate.h', 'browser/notifications/notification_object_proxy.cc', @@ -1230,10 +1293,10 @@ 'browser/notifications/notification_options_menu_model.h', 'browser/notifications/notification_prefs_manager.cc', 'browser/notifications/notification_prefs_manager.h', + 'browser/notifications/notification_system_observer.cc', + 'browser/notifications/notification_system_observer.h', 'browser/notifications/notification_ui_manager.cc', 'browser/notifications/notification_ui_manager.h', - 'browser/notifications/notification_ui_manager_impl.cc', - 'browser/notifications/notification_ui_manager_impl.h', 'browser/notifications/notification_ui_manager_mac.mm', 'browser/notifications/notification_ui_manager_mac.h', 'browser/notifications/sync_notifier/chrome_notifier_delegate.cc', @@ -1250,8 +1313,6 @@ 'browser/omnibox/omnibox_field_trial.h', 'browser/omnibox/omnibox_log.cc', 'browser/omnibox/omnibox_log.h', - 'browser/page_cycler/page_cycler.cc', - 'browser/page_cycler/page_cycler.h', 'browser/parsers/metadata_parser.cc', 'browser/parsers/metadata_parser.h', 'browser/parsers/metadata_parser_factory.h', @@ -1281,6 +1342,8 @@ 'browser/password_manager/password_manager_delegate.h', 'browser/password_manager/password_manager_delegate_impl.cc', 'browser/password_manager/password_manager_delegate_impl.h', + 'browser/password_manager/password_manager_metrics_util.cc', + 'browser/password_manager/password_manager_metrics_util.h', 'browser/password_manager/password_store.cc', 'browser/password_manager/password_store.h', 'browser/password_manager/password_store_consumer.cc', @@ -1358,10 +1421,6 @@ 'browser/policy/browser_policy_connector.h', 'browser/policy/cloud/cloud_external_data_manager.cc', 'browser/policy/cloud/cloud_external_data_manager.h', - 'browser/policy/cloud/cloud_external_data_manager_base.cc', - 'browser/policy/cloud/cloud_external_data_manager_base.h', - 'browser/policy/cloud/cloud_external_data_store.cc', - 'browser/policy/cloud/cloud_external_data_store.h', 'browser/policy/cloud/cloud_policy_client.cc', 'browser/policy/cloud/cloud_policy_client.h', 'browser/policy/cloud/cloud_policy_client_registration_helper.cc', @@ -1392,6 +1451,8 @@ 'browser/policy/cloud/device_management_service.h', 'browser/policy/cloud/enterprise_metrics.cc', 'browser/policy/cloud/enterprise_metrics.h', + 'browser/policy/cloud/external_policy_data_fetcher.cc', + 'browser/policy/cloud/external_policy_data_fetcher.h', 'browser/policy/cloud/external_policy_data_updater.cc', 'browser/policy/cloud/external_policy_data_updater.h', 'browser/policy/cloud/message_util.cc', @@ -1437,8 +1498,6 @@ 'browser/policy/external_data_fetcher.cc', 'browser/policy/external_data_fetcher.h', 'browser/policy/external_data_manager.h', - 'browser/policy/managed_mode_policy_provider.cc', - 'browser/policy/managed_mode_policy_provider.h', 'browser/policy/policy_bundle.cc', 'browser/policy/policy_bundle.h', 'browser/policy/policy_domain_descriptor.cc', @@ -1632,9 +1691,13 @@ 'browser/profile_resetter/profile_resetter.cc', 'browser/profile_resetter/resettable_settings_snapshot.h', 'browser/profile_resetter/resettable_settings_snapshot.cc', - 'browser/profiles/avatar_menu_model.cc', - 'browser/profiles/avatar_menu_model.h', - 'browser/profiles/avatar_menu_model_observer.h', + 'browser/profiles/avatar_menu.cc', + 'browser/profiles/avatar_menu.h', + 'browser/profiles/avatar_menu_actions.h', + 'browser/profiles/avatar_menu_actions_desktop.h', + 'browser/profiles/avatar_menu_actions_desktop.cc', + 'browser/profiles/avatar_menu_desktop.cc', + 'browser/profiles/avatar_menu_observer.h', 'browser/profiles/bookmark_model_loaded_observer.cc', 'browser/profiles/bookmark_model_loaded_observer.h', 'browser/profiles/chrome_browser_main_extra_parts_profiles.cc', @@ -1674,6 +1737,9 @@ 'browser/profiles/profile_info_util.h', 'browser/profiles/profile_io_data.cc', 'browser/profiles/profile_io_data.h', + 'browser/profiles/profile_list.h', + 'browser/profiles/profile_list_desktop.cc', + 'browser/profiles/profile_list_desktop.h', 'browser/profiles/profile_loader.cc', 'browser/profiles/profile_loader.h', 'browser/profiles/profile_manager.cc', @@ -1723,6 +1789,8 @@ 'browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h', 'browser/renderer_host/pepper/pepper_flash_drm_host.cc', 'browser/renderer_host/pepper/pepper_flash_drm_host.h', + 'browser/renderer_host/pepper/pepper_platform_verification_message_filter.cc', + 'browser/renderer_host/pepper/pepper_platform_verification_message_filter.h', 'browser/renderer_host/pepper/pepper_talk_host.cc', 'browser/renderer_host/pepper/pepper_talk_host.h', 'browser/renderer_host/safe_browsing_resource_throttle.cc', @@ -1882,6 +1950,7 @@ 'browser/shell_integration.cc', 'browser/shell_integration.h', 'browser/shell_integration_android.cc', + 'browser/shell_integration_chromeos.cc', 'browser/shell_integration_linux.cc', 'browser/shell_integration_linux.h', 'browser/shell_integration_mac.mm', @@ -1892,8 +1961,6 @@ 'browser/signin/about_signin_internals_factory.h', 'browser/signin/chrome_signin_manager_delegate.cc', 'browser/signin/chrome_signin_manager_delegate.h', - 'browser/signin/oauth2_token_service.cc', - 'browser/signin/oauth2_token_service.h', 'browser/signin/profile_oauth2_token_service.cc', 'browser/signin/profile_oauth2_token_service.h', 'browser/signin/profile_oauth2_token_service_factory.cc', @@ -2000,6 +2067,8 @@ 'browser/status_icons/desktop_notification_balloon.h', 'browser/status_icons/status_icon.cc', 'browser/status_icons/status_icon.h', + 'browser/status_icons/status_icon_menu_model.cc', + 'browser/status_icons/status_icon_menu_model.h', 'browser/status_icons/status_icon_observer.h', 'browser/status_icons/status_tray.cc', 'browser/status_icons/status_tray.h', @@ -2171,47 +2240,60 @@ 'browser/sync/profile_sync_service_observer.h', 'browser/sync/retry_verifier.cc', 'browser/sync/retry_verifier.h', - 'browser/sync/sync_startup_tracker.cc', - 'browser/sync/sync_startup_tracker.h', + 'browser/sync/sessions2/tab_node_pool2.cc', + 'browser/sync/sessions2/tab_node_pool2.h', 'browser/sync/sync_global_error.cc', 'browser/sync/sync_global_error.h', 'browser/sync/sync_prefs.cc', 'browser/sync/sync_prefs.h', + 'browser/sync/sync_startup_tracker.cc', + 'browser/sync/sync_startup_tracker.h', 'browser/sync/sync_ui_util.cc', 'browser/sync/sync_ui_util.h', 'browser/sync/user_selectable_sync_type.h', 'browser/sync_file_system/conflict_resolution_policy.h', 'browser/sync_file_system/conflict_resolution_resolver.cc', 'browser/sync_file_system/conflict_resolution_resolver.h', - 'browser/sync_file_system/drive_backend/api_util.cc', - 'browser/sync_file_system/drive_backend/api_util.h', - 'browser/sync_file_system/drive_backend/api_util_interface.h', - 'browser/sync_file_system/drive_backend/drive_file_sync_service.cc', - 'browser/sync_file_system/drive_backend/drive_file_sync_service.h', - 'browser/sync_file_system/drive_backend/drive_file_sync_util.cc', - 'browser/sync_file_system/drive_backend/drive_file_sync_util.h', - 'browser/sync_file_system/drive_backend/drive_metadata_store.cc', - 'browser/sync_file_system/drive_backend/drive_metadata_store.h', - 'browser/sync_file_system/drive_backend/local_sync_delegate.cc', - 'browser/sync_file_system/drive_backend/local_sync_delegate.h', - 'browser/sync_file_system/drive_backend/local_sync_operation_resolver.cc', - 'browser/sync_file_system/drive_backend/local_sync_operation_resolver.h', + 'browser/sync_file_system/drive_backend/drive_backend_constants.cc', + 'browser/sync_file_system/drive_backend/drive_backend_constants.h', + 'browser/sync_file_system/drive_backend/local_to_remote_syncer.cc', + 'browser/sync_file_system/drive_backend/local_to_remote_syncer.h', 'browser/sync_file_system/drive_backend/metadata_database.cc', 'browser/sync_file_system/drive_backend/metadata_database.h', 'browser/sync_file_system/drive_backend/metadata_db_migration_util.cc', 'browser/sync_file_system/drive_backend/metadata_db_migration_util.h', - 'browser/sync_file_system/drive_backend/remote_change_handler.cc', - 'browser/sync_file_system/drive_backend/remote_change_handler.h', - 'browser/sync_file_system/drive_backend/remote_sync_delegate.cc', - 'browser/sync_file_system/drive_backend/remote_sync_delegate.h', - 'browser/sync_file_system/drive_backend/remote_sync_operation_resolver.cc', - 'browser/sync_file_system/drive_backend/remote_sync_operation_resolver.h', + 'browser/sync_file_system/drive_backend/remote_to_local_syncer.cc', + 'browser/sync_file_system/drive_backend/remote_to_local_syncer.h', + 'browser/sync_file_system/drive_backend/sync_engine.cc', + 'browser/sync_file_system/drive_backend/sync_engine.h', + 'browser/sync_file_system/drive_backend/sync_engine_initializer.cc', + 'browser/sync_file_system/drive_backend/sync_engine_initializer.h', 'browser/sync_file_system/drive_backend/tracker_set.cc', 'browser/sync_file_system/drive_backend/tracker_set.h', + 'browser/sync_file_system/drive_backend_v1/api_util.cc', + 'browser/sync_file_system/drive_backend_v1/api_util.h', + 'browser/sync_file_system/drive_backend_v1/api_util_interface.h', + 'browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc', + 'browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h', + 'browser/sync_file_system/drive_backend_v1/drive_file_sync_util.cc', + 'browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h', + 'browser/sync_file_system/drive_backend_v1/drive_metadata_store.cc', + 'browser/sync_file_system/drive_backend_v1/drive_metadata_store.h', + 'browser/sync_file_system/drive_backend_v1/local_sync_delegate.cc', + 'browser/sync_file_system/drive_backend_v1/local_sync_delegate.h', + 'browser/sync_file_system/drive_backend_v1/local_sync_operation_resolver.cc', + 'browser/sync_file_system/drive_backend_v1/local_sync_operation_resolver.h', + 'browser/sync_file_system/drive_backend_v1/origin_operation_queue.cc', + 'browser/sync_file_system/drive_backend_v1/origin_operation_queue.h', + 'browser/sync_file_system/drive_backend_v1/remote_change_handler.cc', + 'browser/sync_file_system/drive_backend_v1/remote_change_handler.h', + 'browser/sync_file_system/drive_backend_v1/remote_sync_delegate.cc', + 'browser/sync_file_system/drive_backend_v1/remote_sync_delegate.h', + 'browser/sync_file_system/drive_backend_v1/remote_sync_operation_resolver.cc', + 'browser/sync_file_system/drive_backend_v1/remote_sync_operation_resolver.h', 'browser/sync_file_system/file_change.cc', 'browser/sync_file_system/file_change.h', 'browser/sync_file_system/file_status_observer.h', - 'browser/sync_file_system/local_change_processor.h', 'browser/sync_file_system/local/local_file_change_tracker.cc', 'browser/sync_file_system/local/local_file_change_tracker.h', 'browser/sync_file_system/local/local_file_sync_context.cc', @@ -2227,6 +2309,7 @@ 'browser/sync_file_system/local/syncable_file_operation_runner.h', 'browser/sync_file_system/local/syncable_file_system_operation.cc', 'browser/sync_file_system/local/syncable_file_system_operation.h', + 'browser/sync_file_system/local_change_processor.h', 'browser/sync_file_system/logger.cc', 'browser/sync_file_system/logger.h', 'browser/sync_file_system/remote_change_processor.h', @@ -2248,6 +2331,7 @@ 'browser/sync_file_system/sync_service_state.h', 'browser/sync_file_system/sync_status_code.cc', 'browser/sync_file_system/sync_status_code.h', + 'browser/sync_file_system/sync_task.h', 'browser/sync_file_system/sync_task_manager.cc', 'browser/sync_file_system/sync_task_manager.h', 'browser/sync_file_system/syncable_file_system_util.cc', @@ -2364,6 +2448,11 @@ 'browser/translate/translate_url_fetcher.h', 'browser/translate/translate_url_util.cc', 'browser/translate/translate_url_util.h', + 'browser/undo/bookmark_renumber_observer.h', + 'browser/undo/bookmark_undo_service.cc', + 'browser/undo/bookmark_undo_service.h', + 'browser/undo/bookmark_undo_service_factory.cc', + 'browser/undo/bookmark_undo_service_factory.h', 'browser/undo/undo_manager.cc', 'browser/undo/undo_manager.h', 'browser/undo/undo_manager_utils.cc', @@ -2399,15 +2488,18 @@ 'browser/value_store/leveldb_value_store.h', 'browser/value_store/testing_value_store.cc', 'browser/value_store/testing_value_store.h', + 'browser/value_store/value_store.cc', + 'browser/value_store/value_store.h', 'browser/value_store/value_store_change.cc', 'browser/value_store/value_store_change.h', 'browser/value_store/value_store_frontend.cc', 'browser/value_store/value_store_frontend.h', - 'browser/value_store/value_store.cc', - 'browser/value_store/value_store.h', + 'browser/value_store/value_store_util.cc', + 'browser/value_store/value_store_util.h', 'browser/web_applications/web_app.cc', 'browser/web_applications/web_app.h', 'browser/web_applications/web_app_android.cc', + 'browser/web_applications/web_app_chromeos.cc', 'browser/web_applications/web_app_linux.cc', 'browser/web_applications/web_app_mac.h', 'browser/web_applications/web_app_mac.mm', @@ -2447,14 +2539,14 @@ 'browser/webdata/web_data_service_win.cc', 'browser/webdata/web_intents_table.cc', 'browser/webdata/web_intents_table.h', - # These files are needed by page_cycler.cc + + # These files are needed by performance_monitor.cc and this dependency + # should be removed (crbug.com/279660) 'test/base/test_switches.cc', 'test/base/test_switches.h', 'test/base/chrome_process_util.cc', 'test/base/chrome_process_util.h', 'test/base/chrome_process_util_mac.cc', - 'test/perf/perf_test.cc', - 'test/perf/perf_test.h', # These files are generated by GRIT. '<(grit_out_dir)/grit/component_extension_resources_map.cc', @@ -2476,13 +2568,15 @@ '../cc/cc.gyp:cc', '../components/components.gyp:autofill_content_browser', '../components/components.gyp:navigation_interception', + '../media/media.gyp:media', '../net/net.gyp:net_with_v8', '../printing/printing.gyp:printing', + # TODO(tonyg): Remove this dependency (crbug.com/280157). + '../testing/perf/perf_test.gyp:*', '../third_party/adobe/flash/flash_player.gyp:flapper_version_h', '../third_party/expat/expat.gyp:expat', '../third_party/hunspell/hunspell.gyp:hunspell', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', - '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', '../third_party/libusb/libusb.gyp:libusb', '../third_party/libyuv/libyuv.gyp:libyuv', '../third_party/npapi/npapi.gyp:npapi', @@ -2531,14 +2625,16 @@ }], ['OS=="win" or OS=="mac"', { 'sources': [ + 'browser/media_galleries/fileapi/file_path_watcher_util.cc', + 'browser/media_galleries/fileapi/file_path_watcher_util.h', 'browser/media_galleries/fileapi/itunes_data_provider.cc', 'browser/media_galleries/fileapi/itunes_data_provider.h', 'browser/media_galleries/fileapi/itunes_file_util.cc', 'browser/media_galleries/fileapi/itunes_file_util.h', - 'browser/media_galleries/fileapi/picasa/picasa_data_provider.cc', - 'browser/media_galleries/fileapi/picasa/picasa_data_provider.h', - 'browser/media_galleries/fileapi/picasa/picasa_file_util.cc', - 'browser/media_galleries/fileapi/picasa/picasa_file_util.h', + 'browser/media_galleries/fileapi/picasa_data_provider.cc', + 'browser/media_galleries/fileapi/picasa_data_provider.h', + 'browser/media_galleries/fileapi/picasa_file_util.cc', + 'browser/media_galleries/fileapi/picasa_file_util.h', 'browser/media_galleries/fileapi/safe_itunes_library_parser.cc', 'browser/media_galleries/fileapi/safe_itunes_library_parser.h', 'browser/media_galleries/fileapi/safe_itunes_pref_parser_win.cc', @@ -2556,8 +2652,6 @@ 'browser/accessibility/accessibility_extension_api.h', 'browser/infobars/infobar_extension_api.cc', 'browser/infobars/infobar_extension_api.h', - 'browser/rlz/rlz_extension_api.cc', - 'browser/rlz/rlz_extension_api.h', 'browser/speech/extension_api/tts_extension_api.cc', 'browser/speech/extension_api/tts_extension_api.h', 'browser/speech/extension_api/tts_engine_extension_api.cc', @@ -2759,6 +2853,8 @@ 'browser/policy/proto/chrome_device_policy.pb.h', 'browser/renderer_host/offline_resource_throttle.cc', 'browser/renderer_host/offline_resource_throttle.h', + 'browser/renderer_host/pepper/pepper_platform_verification_message_filter.cc', + 'browser/renderer_host/pepper/pepper_platform_verification_message_filter.h', ], }, { # chromeos==1 'dependencies': [ @@ -2790,8 +2886,15 @@ 'browser/policy/cloud/user_policy_signin_service_base.h', 'browser/policy/cloud/user_policy_signin_service_factory.cc', 'browser/policy/cloud/user_policy_signin_service_factory.h', + 'browser/profiles/avatar_menu_desktop.cc', + 'browser/profiles/avatar_menu_actions_desktop.cc', + 'browser/profiles/avatar_menu_actions_desktop.h', + 'browser/profiles/profile_list_desktop.cc', + 'browser/profiles/profile_list_desktop.h', 'browser/screensaver_window_finder_x11.cc', 'browser/screensaver_window_finder_x11.h', + 'browser/shell_integration_linux.cc', + 'browser/shell_integration_linux.h', 'browser/signin/signin_manager.cc', 'browser/speech/tts_linux.cc', 'browser/storage_monitor/mtab_watcher_linux.cc', @@ -2802,10 +2905,9 @@ 'browser/sxs_linux.h', 'browser/themes/theme_service_aurax11.cc', 'browser/themes/theme_service_aurax11.h', - 'browser/ui/webui/help/version_updater_basic.cc', - 'browser/ui/webui/help/version_updater_basic.h', 'browser/upgrade_detector_impl.cc', 'browser/upgrade_detector_impl.h', + 'browser/web_applications/web_app_linux.cc', ], }], ['use_cups==1', { @@ -3002,6 +3104,7 @@ ['OS=="android"', { 'dependencies': [ '../components/components.gyp:web_contents_delegate_android', + '../sync/sync.gyp:sync_jni_headers', 'chrome_browser_jni_headers', ], 'dependencies!': [ @@ -3016,6 +3119,12 @@ 'browser/ssl/ssl_add_certificate_android.cc', 'browser/web_resource/notification_promo_mobile_ntp.cc', 'browser/web_resource/notification_promo_mobile_ntp.h', + 'browser/media/protected_media_identifier_infobar_delegate.cc', + 'browser/media/protected_media_identifier_infobar_delegate.h', + 'browser/media/protected_media_identifier_permission_context.cc', + 'browser/media/protected_media_identifier_permission_context.h', + 'browser/media/protected_media_identifier_permission_context_factory.cc', + 'browser/media/protected_media_identifier_permission_context_factory.h', ], 'sources!': [ # Bookmark export/import are handled via the BookmarkColumns @@ -3029,22 +3138,18 @@ 'browser/download/download_crx_util.cc', 'browser/net/gaia/gaia_oauth_fetcher.cc', - 'browser/page_cycler/page_cycler.cc', - 'browser/page_cycler/page_cycler.h', 'browser/policy/async_policy_loader.cc', 'browser/policy/async_policy_loader.h', 'browser/policy/async_policy_provider.cc', 'browser/policy/async_policy_provider.h', - 'browser/policy/cloud/cloud_external_data_manager_base.cc', - 'browser/policy/cloud/cloud_external_data_manager_base.h', - 'browser/policy/cloud/cloud_external_data_store.cc', - 'browser/policy/cloud/cloud_external_data_store.h', 'browser/policy/cloud/component_cloud_policy_service.cc', 'browser/policy/cloud/component_cloud_policy_service.h', 'browser/policy/cloud/component_cloud_policy_store.cc', 'browser/policy/cloud/component_cloud_policy_store.h', 'browser/policy/cloud/component_cloud_policy_updater.cc', 'browser/policy/cloud/component_cloud_policy_updater.h', + 'browser/policy/cloud/external_policy_data_fetcher.cc', + 'browser/policy/cloud/external_policy_data_fetcher.h', 'browser/policy/cloud/external_policy_data_updater.cc', 'browser/policy/cloud/external_policy_data_updater.h', 'browser/policy/cloud/resource_cache.cc', @@ -3053,8 +3158,6 @@ 'browser/policy/cloud/user_policy_signin_service.h', 'browser/policy/config_dir_policy_loader.cc', 'browser/policy/config_dir_policy_loader.h', - 'browser/policy/managed_mode_policy_provider.cc', - 'browser/policy/managed_mode_policy_provider.h', 'browser/profiles/profile_loader.cc', 'browser/profiles/profile_loader.h', 'browser/sessions/persistent_tab_restore_service.cc', @@ -3083,10 +3186,63 @@ 'browser/user_style_sheet_watcher_factory.h', # Not used by Android + 'browser/accessibility/accessibility_events.cc', + 'browser/accessibility/accessibility_extension_api_constants.cc', + 'browser/accessibility/invert_bubble_prefs.cc', + 'browser/auto_launch_trial.cc', + 'browser/certificate_viewer.cc', 'browser/chrome_browser_main_posix.cc', 'browser/chrome_browser_main_posix.h', 'browser/chrome_process_singleton.cc', + 'browser/component_updater/pnacl/pnacl_profile_observer.cc', + 'browser/component_updater/widevine_cdm_component_installer.cc', + 'browser/custom_home_pages_table_model.cc', + 'browser/download/download_completion_blocker.cc', + 'browser/download/download_danger_prompt.cc', + 'browser/download/download_shelf.cc', + 'browser/drive/drive_switches.cc', + 'browser/external_protocol/external_protocol_observer.cc', + 'browser/feedback/proto/annotations.proto', + 'browser/feedback/proto/chrome.proto', + 'browser/feedback/proto/common.proto', + 'browser/feedback/proto/dom.proto', + 'browser/feedback/proto/math.proto', + 'browser/google_apis/gdata_contacts_requests.cc', + 'browser/google_apis/gdata_errorcode.cc', + 'browser/gpu/chrome_gpu_util.cc', + 'browser/idle_android.cc', + 'browser/idle.cc', + 'browser/lifetime/application_lifetime_stub.cc', + 'browser/lifetime/browser_close_manager.cc', + 'browser/net/predictor_tab_helper.cc', + 'browser/parsers/metadata_parser_jpeg.cc', + 'browser/parsers/metadata_parser_jpeg_factory.cc', + 'browser/parsers/metadata_parser_manager.cc', + 'browser/policy/policy_load_status.cc', + 'browser/policy/proto/cloud/chrome_extension_policy.proto', 'browser/process_singleton.cc', + 'browser/process_singleton_modal_dialog_lock.cc', + 'browser/process_singleton_startup_lock.cc', + 'browser/profiles/profile_shortcut_manager.cc', + 'browser/repost_form_warning_controller.cc', + 'browser/search/search_terms_tracker.cc', + 'browser/sessions/session_command.cc', + 'browser/speech/extension_api/tts_extension_api_constants.cc', + 'browser/ssl/ssl_add_cert_handler.cc', + 'browser/ssl/ssl_client_auth_observer.cc', + 'browser/status_icons/desktop_notification_balloon.cc', + 'browser/storage_monitor/media_storage_util.cc', + 'browser/storage_monitor/removable_device_constants.cc', + 'browser/sync/profile_sync_service_base.cc', + 'browser/sync/profile_sync_service_harness.cc', + 'browser/sync/retry_verifier.cc', + 'browser/tab_contents/navigation_metrics_recorder.cc', + 'browser/undo/bookmark_undo_service.cc', + 'browser/undo/bookmark_undo_service_factory.cc', + 'browser/undo/undo_manager.cc', + 'browser/undo/undo_manager_utils.cc', + 'browser/web_applications/web_app_android.cc', + 'test/base/test_switches.cc', # Android uses a different invalidation service 'browser/invalidation/ticl_invalidation_service.cc', @@ -3248,7 +3404,7 @@ ['enable_managed_users!=1', { 'sources/': [ ['exclude', '^browser/managed_mode/'], - ] + ], }], ['enable_webrtc==0', { 'sources!': [ @@ -3262,10 +3418,16 @@ }], ['enable_mdns==1', { 'sources' : [ - 'browser/local_discovery/privet_device_lister.h', - 'browser/local_discovery/privet_device_lister.cc', - 'browser/local_discovery/privet_device_lister_impl.h', - 'browser/local_discovery/privet_device_lister_impl.cc', + 'browser/local_discovery/privet_http_asynchronous_factory.cc', + 'browser/local_discovery/privet_http_asynchronous_factory.h', + 'browser/local_discovery/privet_notifications.cc', + 'browser/local_discovery/privet_notifications.h', + 'browser/local_discovery/privet_notifications_factory.cc', + 'browser/local_discovery/privet_notifications_factory.h', + 'browser/local_discovery/privet_traffic_detector.cc', + 'browser/local_discovery/privet_traffic_detector.h', + 'browser/local_discovery/service_discovery_client_mdns.cc', + 'browser/local_discovery/service_discovery_client_mdns.h', 'browser/local_discovery/service_discovery_host_client.cc', 'browser/local_discovery/service_discovery_host_client.h', ] @@ -3349,20 +3511,6 @@ 'includes': [ '../build/protoc.gypi' ] }, { - # Protobuf compiler / generator for Chrome Variations seed. - 'target_name': 'variations_seed_proto', - 'type': 'static_library', - 'sources': [ - 'browser/metrics/proto/trials_seed.proto', - 'browser/metrics/proto/study.proto', - ], - 'variables': { - 'proto_in_dir': 'browser/metrics/proto', - 'proto_out_dir': 'chrome/browser/metrics/proto', - }, - 'includes': [ '../build/protoc.gypi' ] - }, - { # Protobuf compiler / generator for Sync FileSystem protocol buffer. 'target_name': 'sync_file_system_proto', 'type': 'static_library', @@ -3416,6 +3564,7 @@ 'android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogResult.java', 'android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupGlue.java', 'android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java', + 'android/java/src/org/chromium/chrome/browser/BookmarksBridge.java', 'android/java/src/org/chromium/chrome/browser/CertificateViewer.java', 'android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java', 'android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java', @@ -3432,6 +3581,7 @@ 'android/java/src/org/chromium/chrome/browser/omnibox/OmniboxPrerender.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/ShortcutHelper.java', 'android/java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java', 'android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java', 'android/java/src/org/chromium/chrome/browser/signin/AndroidProfileOAuth2TokenServiceHelper.java', @@ -3439,8 +3589,14 @@ 'android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java', 'android/java/src/org/chromium/chrome/browser/TabBase.java', 'android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java', + 'android/java/src/org/chromium/chrome/browser/UmaUtils.java', + 'android/java/src/org/chromium/chrome/browser/UrlUtilities.java', 'android/java/src/org/chromium/chrome/browser/ValidationMessageBubble.java', 'android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java', + 'android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java', + 'android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java', + 'android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java', + 'android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java', ], 'variables': { 'jni_gen_package': 'chrome', diff --git a/chromium/chrome/chrome_browser_chromeos.gypi b/chromium/chrome/chrome_browser_chromeos.gypi index 982b46c3ed7..5875616c482 100644 --- a/chromium/chrome/chrome_browser_chromeos.gypi +++ b/chromium/chrome/chrome_browser_chromeos.gypi @@ -43,7 +43,6 @@ 'installer_util', 'safe_browsing_proto', 'safe_browsing_report_proto', - 'variations_seed_proto', '../breakpad/breakpad.gyp:breakpad_client', '../build/linux/system.gyp:dbus', '../chromeos/chromeos.gyp:chromeos', @@ -51,6 +50,10 @@ # browser_chromeos #includes power_supply_properties.pb.h directly. '../chromeos/chromeos.gyp:power_manager_proto', '../chromeos/ime/input_method.gyp:gencode', + # This depends directly on the variations target, rather than just + # transitively via the common target because the proto sources need to + # be generated before code in this target can start building. + '../components/components.gyp:variations', '../content/content.gyp:content_browser', '../content/content.gyp:content_common', '../crypto/crypto.gyp:crypto', @@ -72,7 +75,6 @@ '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../third_party/libevent/libevent.gyp:libevent', '../third_party/libjingle/libjingle.gyp:libjingle', - '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', '../third_party/libusb/libusb.gyp:libusb', '../third_party/libxml/libxml.gyp:libxml', '../third_party/npapi/npapi.gyp:npapi', @@ -123,11 +125,11 @@ 'browser/chromeos/accessibility/magnification_manager.h', 'browser/chromeos/app_mode/app_session_lifetime.cc', 'browser/chromeos/app_mode/app_session_lifetime.h', + 'browser/chromeos/app_mode/app_launch_utils.cc', + 'browser/chromeos/app_mode/app_launch_utils.h', 'browser/chromeos/app_mode/kiosk_app_data.cc', 'browser/chromeos/app_mode/kiosk_app_data.h', 'browser/chromeos/app_mode/kiosk_app_data_delegate.h', - 'browser/chromeos/app_mode/kiosk_app_launcher.cc', - 'browser/chromeos/app_mode/kiosk_app_launcher.h', 'browser/chromeos/app_mode/kiosk_app_launch_error.cc', 'browser/chromeos/app_mode/kiosk_app_launch_error.h', 'browser/chromeos/app_mode/kiosk_app_manager.cc', @@ -135,12 +137,16 @@ 'browser/chromeos/app_mode/kiosk_app_manager_observer.h', 'browser/chromeos/app_mode/kiosk_app_update_service.cc', 'browser/chromeos/app_mode/kiosk_app_update_service.h', + 'browser/chromeos/app_mode/kiosk_profile_loader.cc', + 'browser/chromeos/app_mode/kiosk_profile_loader.h', 'browser/chromeos/app_mode/startup_app_launcher.cc', 'browser/chromeos/app_mode/startup_app_launcher.h', 'browser/chromeos/attestation/attestation_ca_client.cc', 'browser/chromeos/attestation/attestation_ca_client.h', 'browser/chromeos/attestation/attestation_policy_observer.cc', 'browser/chromeos/attestation/attestation_policy_observer.h', + 'browser/chromeos/attestation/platform_verification_flow.cc', + 'browser/chromeos/attestation/platform_verification_flow.h', 'browser/chromeos/audio/audio_devices_pref_handler_impl.cc', 'browser/chromeos/audio/audio_devices_pref_handler_impl.h', 'browser/chromeos/background/ash_user_wallpaper_delegate.cc', @@ -168,26 +174,6 @@ 'browser/chromeos/contacts/gdata_contacts_service.h', 'browser/chromeos/contacts/google_contact_store.cc', 'browser/chromeos/contacts/google_contact_store.h', - 'browser/chromeos/cros/cert_library.cc', - 'browser/chromeos/cros/cert_library.h', - 'browser/chromeos/cros/enum_mapper.h', - 'browser/chromeos/cros/native_network_constants.cc', - 'browser/chromeos/cros/native_network_constants.h', - 'browser/chromeos/cros/native_network_parser.cc', - 'browser/chromeos/cros/native_network_parser.h', - 'browser/chromeos/cros/network_constants.h', - 'browser/chromeos/cros/network_library.cc', - 'browser/chromeos/cros/network_library.h', - 'browser/chromeos/cros/network_library_impl_base.cc', - 'browser/chromeos/cros/network_library_impl_base.h', - 'browser/chromeos/cros/network_library_impl_cros.cc', - 'browser/chromeos/cros/network_library_impl_cros.h', - 'browser/chromeos/cros/network_library_impl_stub.cc', - 'browser/chromeos/cros/network_library_impl_stub.h', - 'browser/chromeos/cros/network_parser.cc', - 'browser/chromeos/cros/network_parser.h', - 'browser/chromeos/cros/network_property_ui_data.cc', - 'browser/chromeos/cros/network_property_ui_data.h', 'browser/chromeos/customization_document.cc', 'browser/chromeos/customization_document.h', 'browser/chromeos/display/display_configuration_observer.cc', @@ -232,8 +218,6 @@ 'browser/chromeos/drive/drive_url_request_job.h', 'browser/chromeos/drive/file_cache.cc', 'browser/chromeos/drive/file_cache.h', - 'browser/chromeos/drive/file_cache_metadata.cc', - 'browser/chromeos/drive/file_cache_metadata.h', 'browser/chromeos/drive/file_change.cc', 'browser/chromeos/drive/file_change.h', 'browser/chromeos/drive/file_errors.cc', @@ -275,8 +259,6 @@ 'browser/chromeos/drive/file_system_util.h', 'browser/chromeos/drive/file_task_executor.cc', 'browser/chromeos/drive/file_task_executor.h', - 'browser/chromeos/drive/file_write_helper.cc', - 'browser/chromeos/drive/file_write_helper.h', 'browser/chromeos/drive/file_write_watcher.cc', 'browser/chromeos/drive/file_write_watcher.h', 'browser/chromeos/drive/fileapi_worker.cc', @@ -307,6 +289,8 @@ 'browser/chromeos/drive/webkit_file_stream_reader_impl.h', 'browser/chromeos/drive/webkit_file_stream_writer_impl.cc', 'browser/chromeos/drive/webkit_file_stream_writer_impl.h', + 'browser/chromeos/drive/write_on_cache_file.cc', + 'browser/chromeos/drive/write_on_cache_file.h', 'browser/chromeos/enrollment_dialog_view.cc', 'browser/chromeos/enrollment_dialog_view.h', 'browser/chromeos/enterprise_extension_observer.cc', @@ -319,24 +303,6 @@ 'browser/chromeos/extensions/external_cache.h', 'browser/chromeos/extensions/external_pref_cache_loader.cc', 'browser/chromeos/extensions/external_pref_cache_loader.h', - 'browser/chromeos/extensions/file_manager/desktop_notifications.cc', - 'browser/chromeos/extensions/file_manager/desktop_notifications.h', - 'browser/chromeos/extensions/file_manager/event_router.cc', - 'browser/chromeos/extensions/file_manager/event_router.h', - 'browser/chromeos/extensions/file_manager/file_browser_handlers.cc', - 'browser/chromeos/extensions/file_manager/file_browser_handlers.h', - 'browser/chromeos/extensions/file_manager/file_manager_util.cc', - 'browser/chromeos/extensions/file_manager/file_manager_util.h', - 'browser/chromeos/extensions/file_manager/file_tasks.cc', - 'browser/chromeos/extensions/file_manager/file_tasks.h', - 'browser/chromeos/extensions/file_manager/file_watcher.cc', - 'browser/chromeos/extensions/file_manager/file_watcher.h', - 'browser/chromeos/extensions/file_manager/fileapi_util.cc', - 'browser/chromeos/extensions/file_manager/fileapi_util.h', - 'browser/chromeos/extensions/file_manager/mounted_disk_monitor.cc', - 'browser/chromeos/extensions/file_manager/mounted_disk_monitor.h', - 'browser/chromeos/extensions/file_manager/zip_file_creator.cc', - 'browser/chromeos/extensions/file_manager/zip_file_creator.h', 'browser/chromeos/extensions/info_private_api.cc', 'browser/chromeos/extensions/info_private_api.h', 'browser/chromeos/extensions/input_method_event_router.cc', @@ -351,11 +317,50 @@ 'browser/chromeos/external_metrics.h', 'browser/chromeos/external_protocol_dialog.cc', 'browser/chromeos/external_protocol_dialog.h', + 'browser/chromeos/file_manager/action_choice_dialog.cc', + 'browser/chromeos/file_manager/action_choice_dialog.h', + 'browser/chromeos/file_manager/app_id.h', + 'browser/chromeos/file_manager/desktop_notifications.cc', + 'browser/chromeos/file_manager/desktop_notifications.h', + 'browser/chromeos/file_manager/file_browser_handlers.cc', + 'browser/chromeos/file_manager/file_browser_handlers.h', + 'browser/chromeos/file_manager/file_manager_installer.cc', + 'browser/chromeos/file_manager/file_manager_installer.h', + 'browser/chromeos/file_manager/file_tasks.cc', + 'browser/chromeos/file_manager/file_tasks.h', + 'browser/chromeos/file_manager/file_watcher.cc', + 'browser/chromeos/file_manager/file_watcher.h', + 'browser/chromeos/file_manager/fileapi_util.cc', + 'browser/chromeos/file_manager/fileapi_util.h', + 'browser/chromeos/file_manager/mime_util.cc', + 'browser/chromeos/file_manager/mime_util.h', + 'browser/chromeos/file_manager/mounted_disk_monitor.cc', + 'browser/chromeos/file_manager/mounted_disk_monitor.h', + 'browser/chromeos/file_manager/open_util.cc', + 'browser/chromeos/file_manager/open_util.h', + 'browser/chromeos/file_manager/open_with_browser.cc', + 'browser/chromeos/file_manager/open_with_browser.h', + 'browser/chromeos/file_manager/select_file_dialog_util.cc', + 'browser/chromeos/file_manager/select_file_dialog_util.h', + 'browser/chromeos/file_manager/url_util.cc', + 'browser/chromeos/file_manager/url_util.h', + 'browser/chromeos/file_manager/volume_manager.cc', + 'browser/chromeos/file_manager/volume_manager.h', + 'browser/chromeos/file_manager/volume_manager_factory.cc', + 'browser/chromeos/file_manager/volume_manager_factory.h', + 'browser/chromeos/file_manager/volume_manager_observer.h', + 'browser/chromeos/file_manager/zip_file_creator.cc', + 'browser/chromeos/file_manager/zip_file_creator.h', 'browser/chromeos/fileapi/file_access_permissions.cc', 'browser/chromeos/fileapi/file_access_permissions.h', 'browser/chromeos/fileapi/file_system_backend.cc', 'browser/chromeos/fileapi/file_system_backend.h', 'browser/chromeos/fileapi/file_system_backend_delegate.h', + 'browser/chromeos/first_run/first_run_controller.cc', + 'browser/chromeos/first_run/first_run_controller.h', + 'browser/chromeos/first_run/first_run_view.cc', + 'browser/chromeos/first_run/first_run_view.h', + 'browser/chromeos/genius_app/app_id.h', 'browser/chromeos/imageburner/burn_controller.cc', 'browser/chromeos/imageburner/burn_controller.h', 'browser/chromeos/imageburner/burn_device_handler.cc', @@ -376,8 +381,6 @@ 'browser/chromeos/input_method/hidable_area.h', 'browser/chromeos/input_method/ibus_controller.cc', 'browser/chromeos/input_method/ibus_controller.h', - 'browser/chromeos/input_method/ibus_controller_base.cc', - 'browser/chromeos/input_method/ibus_controller_base.h', 'browser/chromeos/input_method/ibus_controller_impl.cc', 'browser/chromeos/input_method/ibus_controller_impl.h', 'browser/chromeos/input_method/infolist_window_view.cc', @@ -392,8 +395,6 @@ 'browser/chromeos/input_method/input_method_engine.h', 'browser/chromeos/input_method/input_method_manager_impl.cc', 'browser/chromeos/input_method/input_method_manager_impl.h', - 'browser/chromeos/input_method/input_method_manager_impl_ll.cc', - 'browser/chromeos/input_method/input_method_manager_impl_ll.h', 'browser/chromeos/input_method/input_method_persistence.cc', 'browser/chromeos/input_method/input_method_persistence.h', 'browser/chromeos/input_method/input_method_util.cc', @@ -414,12 +415,20 @@ 'browser/chromeos/language_preferences.h', 'browser/chromeos/locale_change_guard.cc', 'browser/chromeos/locale_change_guard.h', + 'browser/chromeos/login/app_launch_controller.cc', + 'browser/chromeos/login/app_launch_controller.h', + 'browser/chromeos/login/app_launch_signin_screen.cc', + 'browser/chromeos/login/app_launch_signin_screen.h', 'browser/chromeos/login/auth_attempt_state.cc', 'browser/chromeos/login/auth_attempt_state.h', 'browser/chromeos/login/auth_attempt_state_resolver.cc', 'browser/chromeos/login/auth_attempt_state_resolver.h', 'browser/chromeos/login/auth_prewarmer.cc', 'browser/chromeos/login/auth_prewarmer.h', + 'browser/chromeos/login/auth_sync_observer.cc', + 'browser/chromeos/login/auth_sync_observer.h', + 'browser/chromeos/login/auth_sync_observer_factory.cc', + 'browser/chromeos/login/auth_sync_observer_factory.h', 'browser/chromeos/login/authentication_notification_details.h', 'browser/chromeos/login/authenticator.cc', 'browser/chromeos/login/authenticator.h', @@ -484,10 +493,15 @@ 'browser/chromeos/login/merge_session_throttle.h', 'browser/chromeos/login/mount_manager.cc', 'browser/chromeos/login/mount_manager.h', + 'browser/chromeos/login/multi_profile_first_run_notification.cc', + 'browser/chromeos/login/multi_profile_first_run_notification.h', + 'browser/chromeos/login/multi_profile_user_controller.cc', + 'browser/chromeos/login/multi_profile_user_controller.h', + 'browser/chromeos/login/multi_profile_user_controller_delegate.h', 'browser/chromeos/login/oauth2_login_manager.cc', 'browser/chromeos/login/oauth2_login_manager.h', - 'browser/chromeos/login/oauth_login_manager.cc', - 'browser/chromeos/login/oauth_login_manager.h', + 'browser/chromeos/login/oauth2_login_manager_factory.cc', + 'browser/chromeos/login/oauth2_login_manager_factory.h', 'browser/chromeos/login/oauth2_login_verifier.cc', 'browser/chromeos/login/oauth2_login_verifier.h', 'browser/chromeos/login/oauth2_token_fetcher.cc', @@ -572,6 +586,8 @@ 'browser/chromeos/login/user_image_manager.cc', 'browser/chromeos/login/user_image_manager_impl.cc', 'browser/chromeos/login/user_image_manager_impl.h', + 'browser/chromeos/login/user_image_sync_observer.cc', + 'browser/chromeos/login/user_image_sync_observer.h', 'browser/chromeos/login/user_flow.cc', 'browser/chromeos/login/user_flow.h', 'browser/chromeos/login/user_manager.cc', @@ -590,8 +606,6 @@ 'browser/chromeos/login/webui_screen_locker.h', 'browser/chromeos/login/wizard_controller.cc', 'browser/chromeos/login/wizard_controller.h', - 'browser/chromeos/media/media_player.cc', - 'browser/chromeos/media/media_player.h', 'browser/chromeos/memory/oom_priority_manager.cc', 'browser/chromeos/memory/oom_priority_manager.h', 'browser/chromeos/mobile/mobile_activator.cc', @@ -612,10 +626,12 @@ 'browser/chromeos/notifications/balloon_view_host_chromeos.h', 'browser/chromeos/offline/offline_load_page.cc', 'browser/chromeos/offline/offline_load_page.h', + 'browser/chromeos/options/cert_library.cc', + 'browser/chromeos/options/cert_library.h', 'browser/chromeos/options/network_config_view.cc', 'browser/chromeos/options/network_config_view.h', - 'browser/chromeos/options/network_connect.cc', - 'browser/chromeos/options/network_connect.h', + 'browser/chromeos/options/network_property_ui_data.cc', + 'browser/chromeos/options/network_property_ui_data.h', 'browser/chromeos/options/passphrase_textfield.cc', 'browser/chromeos/options/passphrase_textfield.h', 'browser/chromeos/options/vpn_config_view.cc', @@ -628,6 +644,10 @@ 'browser/chromeos/policy/app_pack_updater.h', 'browser/chromeos/policy/auto_enrollment_client.cc', 'browser/chromeos/policy/auto_enrollment_client.h', + 'browser/chromeos/policy/cloud_external_data_manager_base.cc', + 'browser/chromeos/policy/cloud_external_data_manager_base.h', + 'browser/chromeos/policy/cloud_external_data_store.cc', + 'browser/chromeos/policy/cloud_external_data_store.h', 'browser/chromeos/policy/configuration_policy_handler_chromeos.cc', 'browser/chromeos/policy/configuration_policy_handler_chromeos.h', 'browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc', @@ -660,10 +680,6 @@ 'browser/chromeos/policy/login_screen_power_management_policy.h', 'browser/chromeos/policy/network_configuration_updater.cc', 'browser/chromeos/policy/network_configuration_updater.h', - 'browser/chromeos/policy/network_configuration_updater_impl.cc', - 'browser/chromeos/policy/network_configuration_updater_impl.h', - 'browser/chromeos/policy/network_configuration_updater_impl_cros.cc', - 'browser/chromeos/policy/network_configuration_updater_impl_cros.h', 'browser/chromeos/policy/policy_cert_verifier.cc', 'browser/chromeos/policy/policy_cert_verifier.h', 'browser/chromeos/policy/policy_oauth2_token_fetcher.cc', @@ -674,6 +690,8 @@ 'browser/chromeos/policy/recommendation_restorer.h', 'browser/chromeos/policy/recommendation_restorer_factory.cc', 'browser/chromeos/policy/recommendation_restorer_factory.h', + 'browser/chromeos/policy/user_cloud_external_data_manager.cc', + 'browser/chromeos/policy/user_cloud_external_data_manager.h', 'browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc', 'browser/chromeos/policy/user_cloud_policy_manager_chromeos.h', 'browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc', @@ -684,6 +702,8 @@ 'browser/chromeos/policy/user_cloud_policy_token_forwarder.h', 'browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc', 'browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h', + 'browser/chromeos/policy/user_network_configuration_updater.cc', + 'browser/chromeos/policy/user_network_configuration_updater.h', 'browser/chromeos/policy/user_policy_disk_cache.cc', 'browser/chromeos/policy/user_policy_disk_cache.h', 'browser/chromeos/policy/user_policy_token_loader.cc', @@ -716,8 +736,13 @@ 'browser/chromeos/preferences.h', 'browser/chromeos/prerender_condition_network.cc', 'browser/chromeos/prerender_condition_network.h', + 'browser/chromeos/profiles/avatar_menu_actions_chromeos.cc', + 'browser/chromeos/profiles/avatar_menu_actions_chromeos.h', + 'browser/chromeos/profiles/avatar_menu_chromeos.cc', 'browser/chromeos/profiles/profile_helper.cc', 'browser/chromeos/profiles/profile_helper.h', + 'browser/chromeos/profiles/profile_list_chromeos.cc', + 'browser/chromeos/profiles/profile_list_chromeos.h', 'browser/chromeos/profiles/profile_util.cc', 'browser/chromeos/profiles/profile_util.h', 'browser/chromeos/proxy_config_service_impl.cc', @@ -756,8 +781,6 @@ 'browser/chromeos/settings/system_settings_provider.h', 'browser/chromeos/sim_dialog_delegate.cc', 'browser/chromeos/sim_dialog_delegate.h', - 'browser/chromeos/sms_observer.cc', - 'browser/chromeos/sms_observer.h', 'browser/chromeos/status/data_promo_notification.cc', 'browser/chromeos/status/data_promo_notification.h', 'browser/chromeos/status/network_menu.cc', @@ -805,8 +828,6 @@ 'browser/chromeos/system_logs/system_logs_fetcher_base.h', 'browser/chromeos/system_logs/touch_log_source.cc', 'browser/chromeos/system_logs/touch_log_source.h', - 'browser/chromeos/ui/app_launch_view.cc', - 'browser/chromeos/ui/app_launch_view.h', 'browser/chromeos/ui/echo_dialog_listener.h', 'browser/chromeos/ui/echo_dialog_view.cc', 'browser/chromeos/ui/echo_dialog_view.h', @@ -836,12 +857,15 @@ # Only extension API implementations should go here. 'browser/chromeos/extensions/echo_private_api.cc', 'browser/chromeos/extensions/echo_private_api.h', + 'browser/chromeos/extensions/file_manager/event_router.cc', + 'browser/chromeos/extensions/file_manager/event_router.h', 'browser/chromeos/extensions/file_manager/file_browser_handler_api.cc', 'browser/chromeos/extensions/file_manager/file_browser_handler_api.h', 'browser/chromeos/extensions/file_manager/file_browser_private_api.cc', 'browser/chromeos/extensions/file_manager/file_browser_private_api.h', 'browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc', 'browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h', + 'browser/chromeos/extensions/file_manager/file_browser_private_api_functions.h', 'browser/chromeos/extensions/file_manager/private_api_base.cc', 'browser/chromeos/extensions/file_manager/private_api_base.h', 'browser/chromeos/extensions/file_manager/private_api_dialog.cc', @@ -866,6 +890,10 @@ 'browser/chromeos/extensions/media_player_api.h', 'browser/chromeos/extensions/wallpaper_manager_util.cc', 'browser/chromeos/extensions/wallpaper_manager_util.h', + 'browser/chromeos/extensions/wallpaper_api.h', + 'browser/chromeos/extensions/wallpaper_api.cc', + 'browser/chromeos/extensions/wallpaper_function_base.h', + 'browser/chromeos/extensions/wallpaper_function_base.cc', 'browser/chromeos/extensions/wallpaper_private_api.cc', 'browser/chromeos/extensions/wallpaper_private_api.h', ], @@ -879,24 +907,6 @@ ['use_cras==1', { 'defines': [ 'USE_CRAS', - ], - }], - ['file_manager_extension==0', { - 'sources/': [ - ['exclude', 'browser/chromeos/extensions/file_manager/file_browser_handler_api.cc'], - ['exclude', 'browser/chromeos/extensions/file_manager/file_browser_handler_api.h'], - ['exclude', 'browser/chromeos/extensions/file_manager/file_browser_private_api.cc'], - ['exclude', 'browser/chromeos/extensions/file_manager/file_browser_private_api.h'], - ['exclude', 'browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc'], - ['exclude', 'browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h'], - ['exclude', 'browser/chromeos/extensions/file_manager/file_manager_util.cc'], - ['exclude', 'browser/chromeos/extensions/file_manager/file_manager_util.h'], - ['exclude', 'browser/chromeos/extensions/file_manager/file_tasks.cc'], - ['exclude', 'browser/chromeos/extensions/file_manager/file_tasks.h'], - ['exclude', 'browser/chromeos/extensions/file_manager/zip_file_creator.cc'], - ['exclude', 'browser/chromeos/extensions/file_manager/zip_file_creator.h'], - ['exclude', 'browser/chromeos/extensions/media_player_api.cc'], - ['exclude', 'browser/chromeos/extensions/media_player_api.h'], ], }], ['use_ash==1', { @@ -968,6 +978,7 @@ 'type': 'static_library', 'sources': [ 'browser/chromeos/attestation/attestation_key_payload.proto', + 'browser/chromeos/attestation/attestation_signed_data.proto', ], 'variables': { 'proto_in_dir': 'browser/chromeos/attestation', diff --git a/chromium/chrome/chrome_browser_extensions.gypi b/chromium/chrome/chrome_browser_extensions.gypi index e61183b56fb..404c1e196e1 100644 --- a/chromium/chrome/chrome_browser_extensions.gypi +++ b/chromium/chrome/chrome_browser_extensions.gypi @@ -37,6 +37,7 @@ '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../third_party/libusb/libusb.gyp:libusb', '../third_party/re2/re2.gyp:re2', + '../third_party/webrtc/modules/modules.gyp:desktop_capture', '../ui/base/strings/ui_strings.gyp:ui_strings', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', @@ -56,12 +57,18 @@ '../extensions/browser/extension_prefs_scope.h', '../extensions/browser/extension_error.cc', '../extensions/browser/extension_error.h', + '../extensions/browser/file_highlighter.cc', + '../extensions/browser/file_highlighter.h', '../extensions/browser/file_reader.cc', '../extensions/browser/file_reader.h', '../extensions/browser/pref_names.cc', '../extensions/browser/pref_names.h', '../extensions/browser/view_type_utils.cc', '../extensions/browser/view_type_utils.h', + 'browser/apps/app_url_redirector.cc', + 'browser/apps/app_url_redirector.h', + 'browser/apps/chrome_apps_client.cc', + 'browser/apps/chrome_apps_client.h', 'browser/apps/shortcut_manager.cc', 'browser/apps/shortcut_manager.h', 'browser/apps/shortcut_manager_factory.cc', @@ -84,6 +91,8 @@ 'browser/extensions/activity_log/database_string_table.h', 'browser/extensions/activity_log/fullstream_ui_policy.cc', 'browser/extensions/activity_log/fullstream_ui_policy.h', + 'browser/extensions/activity_log/uma_policy.cc', + 'browser/extensions/activity_log/uma_policy.h', 'browser/extensions/activity_log/web_request_constants.cc', 'browser/extensions/activity_log/web_request_constants.h', 'browser/extensions/admin_policy.cc', @@ -134,6 +143,14 @@ 'browser/extensions/api/bookmarks/bookmark_api_helpers.h', 'browser/extensions/api/bookmarks/bookmarks_api.cc', 'browser/extensions/api/bookmarks/bookmarks_api.h', + 'browser/extensions/api/braille_display_private/braille_controller_brlapi.cc', + 'browser/extensions/api/braille_display_private/braille_controller_brlapi.h', + 'browser/extensions/api/braille_display_private/braille_controller_stub.cc', + 'browser/extensions/api/braille_display_private/braille_controller.h', + 'browser/extensions/api/braille_display_private/braille_display_private_api.h', + 'browser/extensions/api/braille_display_private/braille_display_private_api.cc', + 'browser/extensions/api/braille_display_private/brlapi_connection.cc', + 'browser/extensions/api/braille_display_private/brlapi_connection.h', 'browser/extensions/api/browsing_data/browsing_data_api.cc', 'browser/extensions/api/browsing_data/browsing_data_api.h', 'browser/extensions/api/cloud_print_private/cloud_print_private_api.cc', @@ -197,6 +214,8 @@ 'browser/extensions/api/declarative_webrequest/webrequest_constants.h', 'browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc', 'browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h', + 'browser/extensions/api/desktop_capture/desktop_capture_api.cc', + 'browser/extensions/api/desktop_capture/desktop_capture_api.h', 'browser/extensions/api/developer_private/developer_private_api.cc', 'browser/extensions/api/developer_private/developer_private_api.h', 'browser/extensions/api/developer_private/developer_private_api_factory.cc', @@ -279,6 +298,28 @@ 'browser/extensions/api/idle/idle_manager_factory.h', 'browser/extensions/api/idltest/idltest_api.cc', 'browser/extensions/api/idltest/idltest_api.h', + 'browser/extensions/api/image_writer_private/error_messages.cc', + 'browser/extensions/api/image_writer_private/error_messages.h', + 'browser/extensions/api/image_writer_private/operation.cc', + 'browser/extensions/api/image_writer_private/operation_chromeos.cc', + 'browser/extensions/api/image_writer_private/operation.h', + 'browser/extensions/api/image_writer_private/operation_linux.cc', + 'browser/extensions/api/image_writer_private/operation_mac.cc', + 'browser/extensions/api/image_writer_private/operation_manager.cc', + 'browser/extensions/api/image_writer_private/operation_manager.h', + 'browser/extensions/api/image_writer_private/operation_win.cc', + 'browser/extensions/api/image_writer_private/image_writer_private_api.cc', + 'browser/extensions/api/image_writer_private/image_writer_private_api.h', + 'browser/extensions/api/image_writer_private/image_writer_utils.cc', + 'browser/extensions/api/image_writer_private/image_writer_utils.h', + 'browser/extensions/api/image_writer_private/removable_storage_provider.h', + 'browser/extensions/api/image_writer_private/removable_storage_provider_linux.cc', + 'browser/extensions/api/image_writer_private/removable_storage_provider_mac.cc', + 'browser/extensions/api/image_writer_private/removable_storage_provider_win.cc', + 'browser/extensions/api/image_writer_private/write_from_file_operation.cc', + 'browser/extensions/api/image_writer_private/write_from_file_operation.h', + 'browser/extensions/api/image_writer_private/write_from_url_operation.cc', + 'browser/extensions/api/image_writer_private/write_from_url_operation.h', 'browser/extensions/api/input/input.cc', 'browser/extensions/api/input/input.h', 'browser/extensions/api/location/location_api.cc', @@ -323,6 +364,14 @@ 'browser/extensions/api/messaging/native_message_port.h', 'browser/extensions/api/metrics_private/metrics_private_api.cc', 'browser/extensions/api/metrics_private/metrics_private_api.h', + 'browser/extensions/api/mdns/dns_sd_delegate.h', + 'browser/extensions/api/mdns/dns_sd_delegate.cc', + 'browser/extensions/api/mdns/dns_sd_device_lister.h', + 'browser/extensions/api/mdns/dns_sd_device_lister.cc', + 'browser/extensions/api/mdns/dns_sd_registry.h', + 'browser/extensions/api/mdns/dns_sd_registry.cc', + 'browser/extensions/api/mdns/mdns_api.h', + 'browser/extensions/api/mdns/mdns_api.cc', 'browser/extensions/api/module/module.cc', 'browser/extensions/api/module/module.h', 'browser/extensions/api/music_manager_private/device_id.cc', @@ -336,6 +385,8 @@ 'browser/extensions/api/networking_private/networking_private_api_chromeos.cc', 'browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc', 'browser/extensions/api/networking_private/networking_private_api.h', + 'browser/extensions/api/networking_private/networking_private_crypto.cc', + 'browser/extensions/api/networking_private/networking_private_crypto.h', 'browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc', 'browser/extensions/api/networking_private/networking_private_event_router.h', 'browser/extensions/api/networking_private/networking_private_event_router_factory.cc', @@ -387,16 +438,6 @@ 'browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h', 'browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h', 'browser/extensions/api/push_messaging/push_messaging_invalidation_mapper.h', - 'browser/extensions/api/recovery_private/recovery_operation.cc', - 'browser/extensions/api/recovery_private/recovery_operation.h', - 'browser/extensions/api/recovery_private/recovery_operation_manager.cc', - 'browser/extensions/api/recovery_private/recovery_operation_manager.h', - 'browser/extensions/api/recovery_private/recovery_private_api.cc', - 'browser/extensions/api/recovery_private/recovery_private_api.h', - 'browser/extensions/api/recovery_private/write_from_file_operation.cc', - 'browser/extensions/api/recovery_private/write_from_file_operation.h', - 'browser/extensions/api/recovery_private/write_from_url_operation.cc', - 'browser/extensions/api/recovery_private/write_from_url_operation.h', 'browser/extensions/api/runtime/runtime_api.cc', 'browser/extensions/api/runtime/runtime_api.h', 'browser/extensions/api/serial/serial_api.cc', @@ -409,12 +450,16 @@ 'browser/extensions/api/serial/serial_port_enumerator.h', 'browser/extensions/api/serial/serial_port_enumerator_posix.cc', 'browser/extensions/api/serial/serial_port_enumerator_win.cc', - 'browser/extensions/api/session_restore/session_restore_api.cc', - 'browser/extensions/api/session_restore/session_restore_api.h', - 'browser/extensions/api/signedin_devices/id_mapping_helper.cc', - 'browser/extensions/api/signedin_devices/id_mapping_helper.h', - 'browser/extensions/api/signedin_devices/signedin_devices_api.cc', - 'browser/extensions/api/signedin_devices/signedin_devices_api.h', + 'browser/extensions/api/sessions/sessions_api.cc', + 'browser/extensions/api/sessions/sessions_api.h', + 'browser/extensions/api/sessions/session_id.cc', + 'browser/extensions/api/sessions/session_id.h', + 'browser/extensions/api/signed_in_devices/id_mapping_helper.cc', + 'browser/extensions/api/signed_in_devices/id_mapping_helper.h', + 'browser/extensions/api/signed_in_devices/signed_in_devices_api.cc', + 'browser/extensions/api/signed_in_devices/signed_in_devices_api.h', + 'browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc', + 'browser/extensions/api/signed_in_devices/signed_in_devices_manager.h', 'browser/extensions/api/socket/socket.cc', 'browser/extensions/api/socket/socket.h', 'browser/extensions/api/socket/socket_api.cc', @@ -423,6 +468,10 @@ 'browser/extensions/api/socket/tcp_socket.h', 'browser/extensions/api/socket/udp_socket.cc', 'browser/extensions/api/socket/udp_socket.h', + 'browser/extensions/api/sockets_udp/udp_socket_event_dispatcher.h', + 'browser/extensions/api/sockets_udp/udp_socket_event_dispatcher.cc', + 'browser/extensions/api/sockets_udp/sockets_udp_api.cc', + 'browser/extensions/api/sockets_udp/sockets_udp_api.h', 'browser/extensions/api/spellcheck/spellcheck_api.cc', 'browser/extensions/api/spellcheck/spellcheck_api.h', 'browser/extensions/api/storage/leveldb_settings_storage_factory.cc', @@ -473,10 +522,11 @@ 'browser/extensions/api/system_cpu/system_cpu_api.h', 'browser/extensions/api/system_display/display_info_provider.cc', 'browser/extensions/api/system_display/display_info_provider.h', + 'browser/extensions/api/system_display/display_info_provider_aura.cc', 'browser/extensions/api/system_display/display_info_provider_chromeos.cc', + 'browser/extensions/api/system_display/display_info_provider_gtk.cc', 'browser/extensions/api/system_display/display_info_provider_mac.cc', 'browser/extensions/api/system_display/display_info_provider_win.cc', - 'browser/extensions/api/system_display/display_info_provider_x11.cc', 'browser/extensions/api/system_display/system_display_api.cc', 'browser/extensions/api/system_display/system_display_api.h', 'browser/extensions/api/system_indicator/system_indicator_api.h', @@ -484,10 +534,16 @@ 'browser/extensions/api/system_indicator/system_indicator_manager.h', 'browser/extensions/api/system_indicator/system_indicator_manager_factory.cc', 'browser/extensions/api/system_indicator/system_indicator_manager_factory.h', + 'browser/extensions/api/system_info/system_info_api.cc', + 'browser/extensions/api/system_info/system_info_api.h', + 'browser/extensions/api/system_info/system_info_provider.cc', + 'browser/extensions/api/system_info/system_info_provider.h', 'browser/extensions/api/system_memory/memory_info_provider.cc', 'browser/extensions/api/system_memory/memory_info_provider.h', 'browser/extensions/api/system_memory/system_memory_api.cc', 'browser/extensions/api/system_memory/system_memory_api.h', + 'browser/extensions/api/system_private/system_private_api.cc', + 'browser/extensions/api/system_private/system_private_api.h', 'browser/extensions/api/system_storage/storage_info_provider.cc', 'browser/extensions/api/system_storage/storage_info_provider.h', 'browser/extensions/api/system_storage/system_storage_api.cc', @@ -496,16 +552,18 @@ 'browser/extensions/api/tab_capture/tab_capture_api.h', 'browser/extensions/api/tab_capture/tab_capture_registry.cc', 'browser/extensions/api/tab_capture/tab_capture_registry.h', - 'browser/extensions/api/tab_capture/tab_capture_registry_factory.cc', - 'browser/extensions/api/tab_capture/tab_capture_registry_factory.h', 'browser/extensions/api/tabs/tabs_api.cc', 'browser/extensions/api/tabs/tabs_api.h', 'browser/extensions/api/tabs/tabs_windows_api.cc', 'browser/extensions/api/tabs/tabs_windows_api.h', 'browser/extensions/api/tabs/tabs_constants.cc', 'browser/extensions/api/tabs/tabs_constants.h', + 'browser/extensions/api/tabs/tabs_event_router.cc', + 'browser/extensions/api/tabs/tabs_event_router.h', 'browser/extensions/api/tabs/windows_event_router.cc', 'browser/extensions/api/tabs/windows_event_router.h', + 'browser/extensions/api/tabs/windows_util.cc', + 'browser/extensions/api/tabs/windows_util.h', 'browser/extensions/api/test/test_api.cc', 'browser/extensions/api/test/test_api.h', 'browser/extensions/api/top_sites/top_sites_api.cc', @@ -550,8 +608,6 @@ 'browser/extensions/blacklist.cc', 'browser/extensions/blacklist.h', 'browser/extensions/browser_action_test_util.h', - 'browser/extensions/browser_event_router.cc', - 'browser/extensions/browser_event_router.h', 'browser/extensions/browser_extension_window_controller.cc', 'browser/extensions/browser_extension_window_controller.h', 'browser/extensions/browser_permissions_policy_delegate.cc', @@ -573,6 +629,8 @@ 'browser/extensions/data_deleter.h', 'browser/extensions/default_apps.cc', 'browser/extensions/default_apps.h', + 'browser/extensions/devtools_util.h', + 'browser/extensions/devtools_util.cc', 'browser/extensions/error_console/error_console.cc', 'browser/extensions/error_console/error_console.h', 'browser/extensions/event_listener_map.cc', @@ -753,12 +811,6 @@ 'browser/extensions/state_store.h', 'browser/extensions/suggest_permission_util.h', 'browser/extensions/suggest_permission_util.cc', - 'browser/extensions/api/system_info/system_info_api.cc', - 'browser/extensions/api/system_info/system_info_api.h', - 'browser/extensions/api/system_info/system_info_provider.cc', - 'browser/extensions/api/system_info/system_info_provider.h', - 'browser/extensions/api/system_private/system_private_api.cc', - 'browser/extensions/api/system_private/system_private_api.h', 'browser/extensions/tab_helper.cc', 'browser/extensions/tab_helper.h', 'browser/extensions/theme_installed_infobar_delegate.cc', @@ -813,8 +865,10 @@ 'browser/extensions/api/audio/audio_service.cc', 'browser/extensions/api/diagnostics/diagnostics_api_nonchromeos.cc', 'browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc', + 'browser/extensions/api/image_writer_private/operation_linux.cc', 'browser/extensions/api/log_private/log_private_api_nonchromeos.cc', 'browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc', + 'browser/extensions/api/system_display/display_info_provider_aura.cc', 'browser/extensions/default_apps.cc', 'browser/extensions/default_apps.h', ], @@ -848,7 +902,6 @@ ['exclude', '^browser/extensions/.*_api\.cc$'], ['include', '^browser/extensions/api/activity_log_private/activity_log_private_api.cc'], ['include', '^browser/extensions/api/activity_log_private/activity_log_private_api.h'], - ['include', '^browser/extensions/api/alarms/alarm_manager.cc'], ['include', '^browser/extensions/api/content_settings/content_settings_api_constants.cc'], ['include', '^browser/extensions/api/content_settings/content_settings_helpers.cc'], ['include', '^browser/extensions/api/content_settings/content_settings_store.cc'], @@ -865,24 +918,15 @@ ['include', '^browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc'], ['include', '^browser/extensions/api/extension_action/extension_action_api.cc'], ['include', '^browser/extensions/api/extension_action/extension_page_actions_api_constants.cc'], - ['include', '^browser/extensions/api/file_handlers/app_file_handler_util.cc'], - ['include', '^browser/extensions/api/location/location_manager.cc'], ['include', '^browser/extensions/api/messaging/extension_message_port.cc'], ['include', '^browser/extensions/api/messaging/message_service.cc'], ['include', '^browser/extensions/api/module/module.cc'], ['include', '^browser/extensions/api/omnibox/omnibox_api.cc'], - ['include', '^browser/extensions/api/preference/chrome_direct_setting.cc'], - ['include', '^browser/extensions/api/preference/chrome_direct_setting_api.cc'], ['include', '^browser/extensions/api/preference/preference_api.cc'], - ['include', '^browser/extensions/api/processes/processes_api.cc'], - ['include', '^browser/extensions/api/processes/processes_api_constants.cc'], ['include', '^browser/extensions/api/proxy/proxy_api.cc'], ['include', '^browser/extensions/api/proxy/proxy_api_constants.cc'], - ['include', '^browser/extensions/api/push_messaging/push_messaging_api.cc'], ['include', '^browser/extensions/api/runtime/runtime_api.cc'], ['include', '^browser/extensions/api/storage/.*\.cc'], - ['include', '^browser/extensions/api/system_cpu/cpu_info_provider.cc'], - ['include', '^browser/extensions/api/system_storage/storage_info_provider.cc'], ['include', '^browser/extensions/api/tabs/tabs_constants.cc'], ['include', '^browser/extensions/api/web_navigation/frame_navigation_state.cc'], ['include', '^browser/extensions/api/web_navigation/web_navigation_api.cc'], @@ -955,6 +999,9 @@ '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', '../third_party/isimpledom/isimpledom.gyp:isimpledom', ], + 'sources!': [ + 'browser/extensions/api/system_display/display_info_provider_aura.cc', + ], 'conditions': [ ['win_use_allocator_shim==1', { 'dependencies': [ @@ -986,6 +1033,12 @@ }], ], }], + ['use_openssl==1', { + 'sources!': [ + # networking_private_crypto.cc uses NSS functions. + 'browser/extensions/api/networking_private/networking_private_crypto.cc', + ], + }], ['OS=="android"', { 'sources': [ 'browser/extensions/extension_error_ui_android.cc', @@ -993,9 +1046,29 @@ 'browser/extensions/extension_tab_util_android.cc', ], 'sources!': [ + 'browser/apps/shortcut_manager.cc', + 'browser/apps/shortcut_manager_factory.cc', + 'browser/extensions/activity_log/uma_policy.cc', + 'browser/extensions/api/declarative/rules_registry_with_cache.cc', + 'browser/extensions/api/processes/processes_api_constants.cc', + 'browser/extensions/api/web_navigation/frame_navigation_state.cc', + 'browser/extensions/api/web_navigation/web_navigation_api.cc', + 'browser/extensions/api/web_navigation/web_navigation_api_constants.cc', + 'browser/extensions/app_icon_loader_impl.cc', + 'browser/extensions/browser_extension_window_controller.cc', + 'browser/extensions/context_menu_matcher.cc', + 'browser/extensions/extension_context_menu_model.cc', 'browser/extensions/extension_error_ui_default.cc', 'browser/extensions/extension_error_ui_default.h', + 'browser/extensions/extension_function_util.cc', + 'browser/extensions/extension_infobar_delegate.cc', + 'browser/extensions/extension_install_ui.cc', 'browser/extensions/extension_tab_util.cc', + 'browser/extensions/extension_uninstall_dialog.cc', + 'browser/extensions/theme_installed_infobar_delegate.cc', + 'browser/extensions/webstore_startup_installer.cc', + 'browser/extensions/window_controller.cc', + 'browser/extensions/window_controller_list.cc', ], }], ['chrome_multiple_dll!=1', { @@ -1003,6 +1076,22 @@ '../webkit/support/webkit_support.gyp:glue', ], }], + ['use_brlapi==1', { + 'sources!': [ + 'browser/extensions/api/braille_display_private/braille_controller_stub.cc', + ], + 'dependencies' : [ + '../build/linux/system.gyp:libbrlapi', + ], + 'defines': [ + 'USE_BRLAPI', + ], + }, { # use_brlapi==0 + 'sources!': [ + 'browser/extensions/api/braille_display_private/braille_controller_brlapi.cc', + 'browser/extensions/api/braille_display_private/brlapi_connection.cc', + ], + }], ], }, ], diff --git a/chromium/chrome/chrome_browser_ui.gypi b/chromium/chrome/chrome_browser_ui.gypi index a869a13bfbc..06177bfe168 100644 --- a/chromium/chrome/chrome_browser_ui.gypi +++ b/chromium/chrome/chrome_browser_ui.gypi @@ -29,12 +29,10 @@ 'safe_browsing_proto', 'safe_browsing_report_proto', 'feedback_proto', - 'variations_seed_proto', '../components/components.gyp:auto_login_parser', '../content/content.gyp:content_browser', '../content/content.gyp:content_common', '../crypto/crypto.gyp:crypto', - '../media/media.gyp:media', '../skia/skia.gyp:skia', '../sync/sync.gyp:sync', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', @@ -77,6 +75,13 @@ 'browser/ui/android/autofill/autofill_dialog_result.h', 'browser/ui/android/autofill/autofill_popup_view_android.cc', 'browser/ui/android/autofill/autofill_popup_view_android.h', + 'browser/ui/android/infobar/auto_login_infobar_delegate_android.cc', + 'browser/ui/android/infobar/confirm_infobar.cc', + 'browser/ui/android/infobar/confirm_infobar.h', + 'browser/ui/android/infobar/infobar_android.cc', + 'browser/ui/android/infobar/infobar_android.h', + 'browser/ui/android/infobar/infobar_container_android.cc', + 'browser/ui/android/infobar/infobar_container_android.h', 'browser/ui/android/certificate_viewer_android.cc', 'browser/ui/android/chrome_http_auth_handler.cc', 'browser/ui/android/chrome_http_auth_handler.h', @@ -108,6 +113,8 @@ 'browser/ui/android/website_settings_popup_android.h', 'browser/ui/android/window_android_helper.cc', 'browser/ui/android/window_android_helper.h', + 'browser/ui/app_list/fast_show_pickler.cc', + 'browser/ui/app_list/fast_show_pickler.h', 'browser/ui/app_list/app_context_menu.cc', 'browser/ui/app_list/app_context_menu.h', 'browser/ui/app_list/app_context_menu_delegate.h', @@ -119,6 +126,7 @@ 'browser/ui/app_list/app_list_service_disabled.cc', 'browser/ui/app_list/app_list_service_impl.cc', 'browser/ui/app_list/app_list_service_impl.h', + 'browser/ui/app_list/app_list_service_mac.h', 'browser/ui/app_list/app_list_service_mac.mm', 'browser/ui/app_list/app_list_service_win.cc', 'browser/ui/app_list/app_list_service_win.h', @@ -136,6 +144,12 @@ 'browser/ui/app_list/search/app_search_provider.cc', 'browser/ui/app_list/search/app_search_provider.h', 'browser/ui/app_list/search/chrome_search_result.h', + 'browser/ui/app_list/search/common/json_response_fetcher.cc', + 'browser/ui/app_list/search/common/json_response_fetcher.h', + 'browser/ui/app_list/search/common/url_icon_source.cc', + 'browser/ui/app_list/search/common/url_icon_source.h', + 'browser/ui/app_list/search/common/webservice_search_provider.cc', + 'browser/ui/app_list/search/common/webservice_search_provider.h', 'browser/ui/app_list/search/history.cc', 'browser/ui/app_list/search/history.h', 'browser/ui/app_list/search/history_data.cc', @@ -149,6 +163,10 @@ 'browser/ui/app_list/search/mixer.h', 'browser/ui/app_list/search/omnibox_provider.cc', 'browser/ui/app_list/search/omnibox_provider.h', + 'browser/ui/app_list/search/people/people_provider.cc', + 'browser/ui/app_list/search/people/people_provider.h', + 'browser/ui/app_list/search/people/people_result.cc', + 'browser/ui/app_list/search/people/people_result.h', 'browser/ui/app_list/search/search_controller.cc', 'browser/ui/app_list/search/search_controller.h', 'browser/ui/app_list/search/search_provider.cc', @@ -163,16 +181,14 @@ 'browser/ui/app_list/search/tokenized_string_char_iterator.h', 'browser/ui/app_list/search/tokenized_string_match.cc', 'browser/ui/app_list/search/tokenized_string_match.h', - 'browser/ui/app_list/search/webstore_installer.cc', - 'browser/ui/app_list/search/webstore_installer.h', - 'browser/ui/app_list/search/webstore_provider.cc', - 'browser/ui/app_list/search/webstore_provider.h', - 'browser/ui/app_list/search/webstore_result.cc', - 'browser/ui/app_list/search/webstore_result.h', - 'browser/ui/app_list/search/webstore_result_icon_source.cc', - 'browser/ui/app_list/search/webstore_result_icon_source.h', - 'browser/ui/app_list/search/webstore_search_fetcher.cc', - 'browser/ui/app_list/search/webstore_search_fetcher.h', + 'browser/ui/app_list/search/webstore/webstore_cache.cc', + 'browser/ui/app_list/search/webstore/webstore_cache.h', + 'browser/ui/app_list/search/webstore/webstore_installer.cc', + 'browser/ui/app_list/search/webstore/webstore_installer.h', + 'browser/ui/app_list/search/webstore/webstore_provider.cc', + 'browser/ui/app_list/search/webstore/webstore_provider.h', + 'browser/ui/app_list/search/webstore/webstore_result.cc', + 'browser/ui/app_list/search/webstore/webstore_result.h', 'browser/ui/app_modal_dialogs/app_modal_dialog.cc', 'browser/ui/app_modal_dialogs/app_modal_dialog.h', 'browser/ui/app_modal_dialogs/app_modal_dialog_queue.cc', @@ -182,8 +198,14 @@ 'browser/ui/app_modal_dialogs/javascript_dialog_manager.cc', 'browser/ui/app_modal_dialogs/javascript_dialog_manager.h', 'browser/ui/app_modal_dialogs/native_app_modal_dialog.h', + 'browser/ui/apps/app_metro_infobar_delegate_win.cc', + 'browser/ui/apps/app_metro_infobar_delegate_win.h', + 'browser/ui/apps/apps_metro_handler_win.cc', + 'browser/ui/apps/apps_metro_handler_win.h', 'browser/ui/apps/chrome_shell_window_delegate.cc', 'browser/ui/apps/chrome_shell_window_delegate.h', + 'browser/ui/apps/directory_access_confirmation_dialog.cc', + 'browser/ui/apps/directory_access_confirmation_dialog.h', 'browser/ui/ash/ash_keyboard_controller_proxy.cc', 'browser/ui/ash/ash_keyboard_controller_proxy.h', 'browser/ui/ash/app_list/app_list_controller_ash.h', @@ -218,10 +240,10 @@ 'browser/ui/ash/ime_controller_chromeos.h', 'browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc', 'browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h', - 'browser/ui/ash/launcher/browser_launcher_item_controller.cc', - 'browser/ui/ash/launcher/browser_launcher_item_controller.h', 'browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc', 'browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h', + 'browser/ui/ash/launcher/browser_status_monitor.cc', + 'browser/ui/ash/launcher/browser_status_monitor.h', 'browser/ui/ash/launcher/chrome_launcher_app_menu_item.cc', 'browser/ui/ash/launcher/chrome_launcher_app_menu_item.h', 'browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.cc', @@ -232,10 +254,6 @@ 'browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h', 'browser/ui/ash/launcher/chrome_launcher_controller.cc', 'browser/ui/ash/launcher/chrome_launcher_controller.h', - 'browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc', - 'browser/ui/ash/launcher/chrome_launcher_controller_per_app.h', - 'browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc', - 'browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h', 'browser/ui/ash/launcher/launcher_app_tab_helper.cc', 'browser/ui/ash/launcher/launcher_app_tab_helper.h', 'browser/ui/ash/launcher/launcher_context_menu.cc', @@ -276,10 +294,6 @@ 'browser/ui/aura/tabs/dock_info_aurax11.cc', 'browser/ui/autofill/account_chooser_model.cc', 'browser/ui/autofill/account_chooser_model.h', - 'browser/ui/autofill/autocheckout_bubble.h', - 'browser/ui/autofill/autocheckout_bubble.cc', - 'browser/ui/autofill/autocheckout_bubble_controller.cc', - 'browser/ui/autofill/autocheckout_bubble_controller.h', 'browser/ui/autofill/autofill_dialog_common.cc', 'browser/ui/autofill/autofill_dialog_common.h', 'browser/ui/autofill/autofill_dialog_controller.cc', @@ -307,6 +321,8 @@ 'browser/ui/autofill/generated_credit_card_bubble_view.h', 'browser/ui/autofill/generated_credit_card_bubble_controller.cc', 'browser/ui/autofill/generated_credit_card_bubble_controller.h', + 'browser/ui/autofill/loading_animation.cc', + 'browser/ui/autofill/loading_animation.h', 'browser/ui/autofill/new_credit_card_bubble_view.cc', 'browser/ui/autofill/new_credit_card_bubble_view.h', 'browser/ui/autofill/new_credit_card_bubble_controller.cc', @@ -318,12 +334,8 @@ 'browser/ui/auto_login_infobar_delegate_android.h', 'browser/ui/auto_login_prompter.cc', 'browser/ui/auto_login_prompter.h', - 'browser/ui/blocked_content/blocked_content_container.cc', - 'browser/ui/blocked_content/blocked_content_container.h', - 'browser/ui/blocked_content/blocked_content_tab_helper.cc', - 'browser/ui/blocked_content/blocked_content_tab_helper.h', - 'browser/ui/blocked_content/blocked_content_tab_helper_delegate.cc', - 'browser/ui/blocked_content/blocked_content_tab_helper_delegate.h', + 'browser/ui/blocked_content/blocked_window_params.cc', + 'browser/ui/blocked_content/blocked_window_params.h', 'browser/ui/blocked_content/popup_blocker_tab_helper.cc', 'browser/ui/blocked_content/popup_blocker_tab_helper.h', 'browser/ui/bookmarks/bookmark_bar.h', @@ -435,6 +447,8 @@ 'browser/ui/cocoa/applescript/tab_applescript.mm', 'browser/ui/cocoa/applescript/window_applescript.h', 'browser/ui/cocoa/applescript/window_applescript.mm', + 'browser/ui/cocoa/apps/app_shim_menu_controller_mac.h', + 'browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm', 'browser/ui/cocoa/apps/chrome_shell_window_delegate_cocoa.mm', 'browser/ui/cocoa/apps/native_app_window_cocoa.h', 'browser/ui/cocoa/apps/native_app_window_cocoa.mm', @@ -452,6 +466,8 @@ 'browser/ui/cocoa/autofill/autofill_notification_controller.mm', 'browser/ui/cocoa/autofill/autofill_main_container.h', 'browser/ui/cocoa/autofill/autofill_main_container.mm', + 'browser/ui/cocoa/autofill/autofill_overlay_controller.h', + 'browser/ui/cocoa/autofill/autofill_overlay_controller.mm', 'browser/ui/cocoa/autofill/autofill_popup_view_bridge.h', 'browser/ui/cocoa/autofill/autofill_popup_view_bridge.mm', 'browser/ui/cocoa/autofill/autofill_popup_view_cocoa.h', @@ -614,6 +630,7 @@ 'browser/ui/cocoa/download/download_item_cell.mm', 'browser/ui/cocoa/download/download_item_controller.h', 'browser/ui/cocoa/download/download_item_controller.mm', + 'browser/ui/cocoa/download/download_item_drag_mac.mm', 'browser/ui/cocoa/download/download_item_mac.h', 'browser/ui/cocoa/download/download_item_mac.mm', 'browser/ui/cocoa/download/download_shelf_context_menu_controller.h', @@ -648,8 +665,8 @@ 'browser/ui/cocoa/extensions/browser_actions_controller.mm', 'browser/ui/cocoa/extensions/browser_actions_controller_prefs.h', 'browser/ui/cocoa/extensions/browser_actions_controller_prefs.cc', - 'browser/ui/cocoa/extensions/extension_action_context_menu.h', - 'browser/ui/cocoa/extensions/extension_action_context_menu.mm', + 'browser/ui/cocoa/extensions/extension_action_context_menu_controller.h', + 'browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm', 'browser/ui/cocoa/extensions/extension_install_dialog_controller.h', 'browser/ui/cocoa/extensions/extension_install_dialog_controller.mm', 'browser/ui/cocoa/extensions/extension_install_view_controller.h', @@ -692,6 +709,8 @@ 'browser/ui/cocoa/fullscreen_exit_bubble_controller.mm', 'browser/ui/cocoa/fullscreen_exit_bubble_view.h', 'browser/ui/cocoa/fullscreen_exit_bubble_view.mm', + 'browser/ui/cocoa/fullscreen_mode_controller.h', + 'browser/ui/cocoa/fullscreen_mode_controller.mm', 'browser/ui/cocoa/fullscreen_window.h', 'browser/ui/cocoa/fullscreen_window.mm', 'browser/ui/cocoa/global_error_bubble_controller.h', @@ -727,6 +746,10 @@ 'browser/ui/cocoa/infobars/confirm_infobar_controller.mm', 'browser/ui/cocoa/infobars/extension_infobar_controller.h', 'browser/ui/cocoa/infobars/extension_infobar_controller.mm', + 'browser/ui/cocoa/infobars/infobar_cocoa.h', + 'browser/ui/cocoa/infobars/infobar_cocoa.mm', + 'browser/ui/cocoa/infobars/infobar_container_cocoa.h', + 'browser/ui/cocoa/infobars/infobar_container_cocoa.mm', 'browser/ui/cocoa/infobars/infobar_container_controller.h', 'browser/ui/cocoa/infobars/infobar_container_controller.mm', 'browser/ui/cocoa/infobars/infobar_controller.h', @@ -735,9 +758,6 @@ 'browser/ui/cocoa/infobars/infobar_gradient_view.mm', 'browser/ui/cocoa/infobars/infobar_utilities.h', 'browser/ui/cocoa/infobars/infobar_utilities.mm', - 'browser/ui/cocoa/infobars/infobar.h', - 'browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc', - 'browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h', 'browser/ui/cocoa/infobars/translate_infobar_base.h', 'browser/ui/cocoa/infobars/translate_infobar_base.mm', 'browser/ui/cocoa/infobars/translate_message_infobar_controller.h', @@ -776,6 +796,8 @@ 'browser/ui/cocoa/location_bar/location_bar_view_mac.mm', 'browser/ui/cocoa/location_bar/location_icon_decoration.h', 'browser/ui/cocoa/location_bar/location_icon_decoration.mm', + 'browser/ui/cocoa/location_bar/mic_search_decoration.h', + 'browser/ui/cocoa/location_bar/mic_search_decoration.mm', 'browser/ui/cocoa/location_bar/page_action_decoration.h', 'browser/ui/cocoa/location_bar/page_action_decoration.mm', 'browser/ui/cocoa/location_bar/selected_keyword_decoration.h', @@ -787,14 +809,20 @@ 'browser/ui/cocoa/login_prompt_cocoa.h', 'browser/ui/cocoa/login_prompt_cocoa.mm', 'browser/ui/cocoa/main_menu_item.h', + 'browser/ui/cocoa/media_picker/desktop_media_picker_bridge.h', + 'browser/ui/cocoa/media_picker/desktop_media_picker_bridge.mm', + 'browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.h', + 'browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm', + 'browser/ui/cocoa/media_picker/desktop_media_picker_controller.h', + 'browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm', + 'browser/ui/cocoa/media_picker/desktop_media_picker_item.h', + 'browser/ui/cocoa/media_picker/desktop_media_picker_item.mm', 'browser/ui/cocoa/menu_button.h', 'browser/ui/cocoa/menu_button.mm', 'browser/ui/cocoa/multi_key_equivalent_button.h', 'browser/ui/cocoa/multi_key_equivalent_button.mm', 'browser/ui/cocoa/new_tab_button.h', 'browser/ui/cocoa/new_tab_button.mm', - 'browser/ui/cocoa/nine_part_button_cell.h', - 'browser/ui/cocoa/nine_part_button_cell.mm', 'browser/ui/cocoa/notifications/balloon_collection_cocoa.mm', 'browser/ui/cocoa/notifications/balloon_controller.h', 'browser/ui/cocoa/notifications/balloon_controller.mm', @@ -839,6 +867,7 @@ 'browser/ui/cocoa/panels/panel_utils_cocoa.mm', 'browser/ui/cocoa/panels/panel_window_controller_cocoa.h', 'browser/ui/cocoa/panels/panel_window_controller_cocoa.mm', + 'browser/ui/cocoa/pdf_password_dialog.mm', 'browser/ui/cocoa/presentation_mode_controller.h', 'browser/ui/cocoa/presentation_mode_controller.mm', 'browser/ui/cocoa/profile_menu_controller.h', @@ -892,8 +921,6 @@ 'browser/ui/cocoa/tabpose_window.h', 'browser/ui/cocoa/tabpose_window.mm', 'browser/ui/cocoa/tabs/dock_info_mac.cc', - 'browser/ui/cocoa/tabs/tab_audio_indicator_view_mac.h', - 'browser/ui/cocoa/tabs/tab_audio_indicator_view_mac.mm', 'browser/ui/cocoa/tabs/tab_controller.h', 'browser/ui/cocoa/tabs/tab_controller.mm', 'browser/ui/cocoa/tabs/tab_projecting_image_view.h', @@ -978,12 +1005,10 @@ 'browser/ui/crypto_module_password_dialog.h', 'browser/ui/crypto_module_password_dialog_nss.cc', 'browser/ui/crypto_module_password_dialog_openssl.cc', - 'browser/ui/extensions/app_metro_infobar_delegate_win.cc', - 'browser/ui/extensions/app_metro_infobar_delegate_win.h', 'browser/ui/extensions/application_launch.cc', 'browser/ui/extensions/application_launch.h', - 'browser/ui/extensions/apps_metro_handler_win.cc', - 'browser/ui/extensions/apps_metro_handler_win.h', + 'browser/ui/extensions/extension_installed_bubble.cc', + 'browser/ui/extensions/extension_installed_bubble.h', 'browser/ui/extensions/extension_install_ui_default.cc', 'browser/ui/extensions/extension_install_ui_default.h', 'browser/ui/extensions/extension_enable_flow.cc', @@ -1086,6 +1111,8 @@ 'browser/ui/gtk/custom_drag.h', 'browser/ui/gtk/download/download_in_progress_dialog_gtk.cc', 'browser/ui/gtk/download/download_in_progress_dialog_gtk.h', + 'browser/ui/gtk/download/download_item_drag.cc', + 'browser/ui/gtk/download/download_item_drag.h', 'browser/ui/gtk/download/download_item_gtk.cc', 'browser/ui/gtk/download/download_item_gtk.h', 'browser/ui/gtk/download/download_shelf_context_menu_gtk.cc', @@ -1289,6 +1316,8 @@ 'browser/ui/login/login_model.h', 'browser/ui/login/login_prompt.cc', 'browser/ui/login/login_prompt.h', + 'browser/ui/media_utils.cc', + 'browser/ui/media_utils.h', 'browser/ui/metro_pin_tab_helper_win.cc', 'browser/ui/metro_pin_tab_helper_win.h', 'browser/ui/native_focus_tracker.h', @@ -1391,6 +1420,10 @@ 'browser/ui/search/instant_unload_handler.h', 'browser/ui/search/search_delegate.cc', 'browser/ui/search/search_delegate.h', + 'browser/ui/search/search_ipc_router.cc', + 'browser/ui/search/search_ipc_router.h', + 'browser/ui/search/search_ipc_router_policy_impl.cc', + 'browser/ui/search/search_ipc_router_policy_impl.h', 'browser/ui/search/search_model.cc', 'browser/ui/search/search_model.h', 'browser/ui/search/search_model_observer.h', @@ -1478,8 +1511,6 @@ 'browser/ui/tabs/pinned_tab_service.h', 'browser/ui/tabs/pinned_tab_service_factory.cc', 'browser/ui/tabs/pinned_tab_service_factory.h', - 'browser/ui/tabs/tab_audio_indicator.cc', - 'browser/ui/tabs/tab_audio_indicator.h', 'browser/ui/tabs/tab_menu_model.cc', 'browser/ui/tabs/tab_menu_model.h', 'browser/ui/tabs/tab_resources.cc', @@ -1542,8 +1573,6 @@ 'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h', 'browser/ui/views/ash/tab_scrubber.h', 'browser/ui/views/ash/tab_scrubber.cc', - 'browser/ui/views/autofill/autocheckout_bubble_views.cc', - 'browser/ui/views/autofill/autocheckout_bubble_views.h', 'browser/ui/views/autofill/autofill_dialog_views.cc', 'browser/ui/views/autofill/autofill_dialog_views.h', 'browser/ui/views/autofill/autofill_popup_view_views.cc', @@ -1574,6 +1603,7 @@ 'browser/ui/views/bookmarks/bookmark_drag_drop_views.h', 'browser/ui/views/bookmarks/bookmark_editor_view.cc', 'browser/ui/views/bookmarks/bookmark_editor_view.h', + 'browser/ui/views/bookmarks/bookmark_menu_controller_observer.h', 'browser/ui/views/bookmarks/bookmark_menu_controller_views.cc', 'browser/ui/views/bookmarks/bookmark_menu_controller_views.h', 'browser/ui/views/bookmarks/bookmark_menu_delegate.cc', @@ -1592,7 +1622,6 @@ 'browser/ui/views/chrome_browser_main_extra_parts_views.h', 'browser/ui/views/chrome_views_delegate.cc', 'browser/ui/views/chrome_views_delegate.h', - 'browser/ui/views/chrome_views_delegate_chromeos.cc', 'browser/ui/views/chrome_web_dialog_view.cc', 'browser/ui/views/collected_cookies_views.cc', 'browser/ui/views/collected_cookies_views.h', @@ -1648,8 +1677,8 @@ 'browser/ui/views/extensions/extension_dialog_observer.cc', 'browser/ui/views/extensions/extension_dialog_observer.h', 'browser/ui/views/extensions/extension_install_dialog_view.cc', - 'browser/ui/views/extensions/extension_installed_bubble.cc', - 'browser/ui/views/extensions/extension_installed_bubble.h', + 'browser/ui/views/extensions/extension_installed_bubble_view.cc', + 'browser/ui/views/extensions/extension_installed_bubble_view.h', 'browser/ui/views/extensions/extension_keybinding_registry_views.cc', 'browser/ui/views/extensions/extension_keybinding_registry_views.h', 'browser/ui/views/extensions/extension_popup.cc', @@ -1726,8 +1755,21 @@ 'browser/ui/views/frame/minimize_button_metrics_win.cc', 'browser/ui/views/frame/minimize_button_metrics_win.h', 'browser/ui/views/frame/native_browser_frame.h', + 'browser/ui/views/frame/native_browser_frame_factory.cc', + 'browser/ui/views/frame/native_browser_frame_factory.h', + 'browser/ui/views/frame/native_browser_frame_factory_aura.cc', + 'browser/ui/views/frame/native_browser_frame_factory_win.cc', + 'browser/ui/views/frame/native_browser_frame_factory.cc', + 'browser/ui/views/frame/native_browser_frame_factory.h', 'browser/ui/views/frame/opaque_browser_frame_view.cc', 'browser/ui/views/frame/opaque_browser_frame_view.h', + 'browser/ui/views/frame/opaque_browser_frame_view_layout.cc', + 'browser/ui/views/frame/opaque_browser_frame_view_layout.h', + 'browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h', + 'browser/ui/views/frame/opaque_browser_frame_view_platform_specific.h', + 'browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc', + 'browser/ui/views/frame/opaque_browser_frame_view_linux.h', + 'browser/ui/views/frame/opaque_browser_frame_view_linux.cc', 'browser/ui/views/frame/popup_non_client_frame_view.cc', 'browser/ui/views/frame/popup_non_client_frame_view.h', 'browser/ui/views/frame/scroll_end_effect_controller.h', @@ -1866,8 +1908,11 @@ 'browser/ui/views/panels/taskbar_window_thumbnailer_win.h', 'browser/ui/views/password_generation_bubble_view.cc', 'browser/ui/views/password_generation_bubble_view.h', + 'browser/ui/views/pdf_password_dialog.cc', 'browser/ui/views/profile_chooser_view.cc', 'browser/ui/views/profile_chooser_view.h', + 'browser/ui/views/user_manager_view.cc', + 'browser/ui/views/user_manager_view.h', 'browser/ui/views/reload_button.cc', 'browser/ui/views/reload_button.h', 'browser/ui/views/sad_tab_view.cc', @@ -1881,6 +1926,7 @@ 'browser/ui/views/select_file_dialog_extension_factory.h', 'browser/ui/views/simple_message_box_views.cc', 'browser/ui/views/simple_message_box_win.cc', + 'browser/ui/views/simple_message_box_win.h', 'browser/ui/views/speech_recognition_bubble_views.cc', 'browser/ui/views/ssl_client_certificate_selector.cc', 'browser/ui/views/ssl_client_certificate_selector.h', @@ -1957,6 +2003,7 @@ 'browser/ui/views/website_settings/website_settings_popup_view.h', 'browser/ui/views/wrench_menu.cc', 'browser/ui/views/wrench_menu.h', + 'browser/ui/views/wrench_menu_observer.h', 'browser/ui/views/wrench_toolbar_button.cc', 'browser/ui/views/wrench_toolbar_button.h', 'browser/ui/web_applications/web_app_ui.cc', @@ -1985,10 +2032,6 @@ 'browser/ui/webui/chrome_web_contents_handler.h', 'browser/ui/webui/chrome_web_ui_controller_factory.cc', 'browser/ui/webui/chrome_web_ui_controller_factory.h', - 'browser/ui/webui/chromeos/about_network.cc', - 'browser/ui/webui/chromeos/about_network.h', - 'browser/ui/webui/chromeos/app_launch_ui.cc', - 'browser/ui/webui/chromeos/app_launch_ui.h', 'browser/ui/webui/chromeos/bluetooth_pairing_ui.cc', 'browser/ui/webui/chromeos/bluetooth_pairing_ui.h', 'browser/ui/webui/chromeos/choose_mobile_network_ui.cc', @@ -2001,10 +2044,18 @@ 'browser/ui/webui/chromeos/diagnostics/diagnostics_ui.h', 'browser/ui/webui/chromeos/drive_internals_ui.cc', 'browser/ui/webui/chromeos/drive_internals_ui.h', + 'browser/ui/webui/chromeos/first_run/first_run_actor.cc', + 'browser/ui/webui/chromeos/first_run/first_run_actor.h', + 'browser/ui/webui/chromeos/first_run/first_run_handler.cc', + 'browser/ui/webui/chromeos/first_run/first_run_handler.h', + 'browser/ui/webui/chromeos/first_run/first_run_ui.cc', + 'browser/ui/webui/chromeos/first_run/first_run_ui.h', 'browser/ui/webui/chromeos/imageburner/imageburner_ui.cc', 'browser/ui/webui/chromeos/imageburner/imageburner_ui.h', 'browser/ui/webui/chromeos/keyboard_overlay_ui.cc', 'browser/ui/webui/chromeos/keyboard_overlay_ui.h', + 'browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc', + 'browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h', 'browser/ui/webui/chromeos/login/base_screen_handler.cc', 'browser/ui/webui/chromeos/login/base_screen_handler.h', 'browser/ui/webui/chromeos/login/base_screen_handler_utils.h', @@ -2052,6 +2103,8 @@ 'browser/ui/webui/chromeos/mobile_setup_dialog.h', 'browser/ui/webui/chromeos/mobile_setup_ui.cc', 'browser/ui/webui/chromeos/mobile_setup_ui.h', + 'browser/ui/webui/chromeos/network_ui.cc', + 'browser/ui/webui/chromeos/network_ui.h', 'browser/ui/webui/chromeos/proxy_settings_ui.cc', 'browser/ui/webui/chromeos/proxy_settings_ui.h', 'browser/ui/webui/chromeos/sim_unlock_ui.cc', @@ -2062,6 +2115,8 @@ 'browser/ui/webui/chromeos/system_info_ui.h', 'browser/ui/webui/chromeos/ui_account_tweaks.cc', 'browser/ui/webui/chromeos/ui_account_tweaks.h', + 'browser/ui/webui/components_ui.cc', + 'browser/ui/webui/components_ui.h', 'browser/ui/webui/constrained_web_dialog_ui.cc', 'browser/ui/webui/constrained_web_dialog_ui.h', 'browser/ui/webui/constrained_web_dialog_delegate_base.cc', @@ -2082,6 +2137,8 @@ 'browser/ui/webui/extensions/command_handler.h', 'browser/ui/webui/extensions/extension_basic_info.cc', 'browser/ui/webui/extensions/extension_basic_info.h', + 'browser/ui/webui/extensions/extension_error_handler.cc', + 'browser/ui/webui/extensions/extension_error_handler.h', 'browser/ui/webui/extensions/extension_icon_source.cc', 'browser/ui/webui/extensions/extension_icon_source.h', 'browser/ui/webui/extensions/extension_info_ui.cc', @@ -2096,8 +2153,6 @@ 'browser/ui/webui/extensions/pack_extension_handler.h', 'browser/ui/webui/favicon_source.cc', 'browser/ui/webui/favicon_source.h', - 'browser/ui/webui/feedback_ui.cc', - 'browser/ui/webui/feedback_ui.h', 'browser/ui/webui/fileicon_source.cc', 'browser/ui/webui/fileicon_source.h', 'browser/ui/webui/flags_ui.cc', @@ -2132,10 +2187,6 @@ 'browser/ui/webui/inspect_ui.h', 'browser/ui/webui/instant_ui.cc', 'browser/ui/webui/instant_ui.h', - 'browser/ui/webui/local_discovery/local_discovery_ui.cc', - 'browser/ui/webui/local_discovery/local_discovery_ui.h', - 'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc', - 'browser/ui/webui/local_discovery/local_discovery_ui_handler.h', 'browser/ui/webui/media/webrtc_logs_ui.cc', 'browser/ui/webui/media/webrtc_logs_ui.h', 'browser/ui/webui/memory_internals/memory_internals_handler.cc', @@ -2224,16 +2275,6 @@ 'browser/ui/webui/options/chromeos/internet_options_handler.h', 'browser/ui/webui/options/chromeos/keyboard_handler.cc', 'browser/ui/webui/options/chromeos/keyboard_handler.h', - 'browser/ui/webui/options/chromeos/language_chewing_handler.cc', - 'browser/ui/webui/options/chromeos/language_chewing_handler.h', - 'browser/ui/webui/options/chromeos/language_hangul_handler.cc', - 'browser/ui/webui/options/chromeos/language_hangul_handler.h', - 'browser/ui/webui/options/chromeos/language_mozc_handler.cc', - 'browser/ui/webui/options/chromeos/language_mozc_handler.h', - 'browser/ui/webui/options/chromeos/language_options_util.cc', - 'browser/ui/webui/options/chromeos/language_options_util.h', - 'browser/ui/webui/options/chromeos/language_pinyin_handler.cc', - 'browser/ui/webui/options/chromeos/language_pinyin_handler.h', 'browser/ui/webui/options/chromeos/pointer_handler.cc', 'browser/ui/webui/options/chromeos/pointer_handler.h', 'browser/ui/webui/options/chromeos/proxy_handler.cc', @@ -2252,6 +2293,8 @@ 'browser/ui/webui/options/cookies_view_handler.h', 'browser/ui/webui/options/core_options_handler.cc', 'browser/ui/webui/options/core_options_handler.h', + 'browser/ui/webui/options/create_profile_handler.cc', + 'browser/ui/webui/options/create_profile_handler.h', 'browser/ui/webui/options/font_settings_handler.cc', 'browser/ui/webui/options/font_settings_handler.h', 'browser/ui/webui/options/font_settings_utils.h', @@ -2274,6 +2317,8 @@ 'browser/ui/webui/options/language_options_handler_common.h', 'browser/ui/webui/options/managed_user_create_confirm_handler.cc', 'browser/ui/webui/options/managed_user_create_confirm_handler.h', + 'browser/ui/webui/options/managed_user_import_handler.cc', + 'browser/ui/webui/options/managed_user_import_handler.h', 'browser/ui/webui/options/managed_user_learn_more_handler.cc', 'browser/ui/webui/options/managed_user_learn_more_handler.h', 'browser/ui/webui/options/manage_profile_handler.cc', @@ -2282,6 +2327,8 @@ 'browser/ui/webui/options/media_devices_selection_handler.h', 'browser/ui/webui/options/media_galleries_handler.cc', 'browser/ui/webui/options/media_galleries_handler.h', + 'browser/ui/webui/options/options_handlers_helper.cc', + 'browser/ui/webui/options/options_handlers_helper.h', 'browser/ui/webui/options/options_ui.cc', 'browser/ui/webui/options/options_ui.h', 'browser/ui/webui/options/password_manager_handler.cc', @@ -2328,8 +2375,6 @@ 'browser/ui/webui/quota_internals/quota_internals_types.h', 'browser/ui/webui/quota_internals/quota_internals_ui.cc', 'browser/ui/webui/quota_internals/quota_internals_ui.h', - 'browser/ui/webui/screenshot_source.cc', - 'browser/ui/webui/screenshot_source.h', 'browser/ui/webui/set_as_default_browser_ui.cc', 'browser/ui/webui/set_as_default_browser_ui.h', 'browser/ui/webui/signin/login_ui_service.cc', @@ -2415,7 +2460,10 @@ 'installer_util', '../components/components.gyp:autofill_content_risk_proto', '../components/component_strings.gyp:component_strings', + '../components/components.gyp:dom_distiller_core', + '../components/components.gyp:dom_distiller_webui', '../device/bluetooth/bluetooth.gyp:device_bluetooth', + '../media/media.gyp:media', '../net/net.gyp:net_with_v8', '../printing/printing.gyp:printing', '../third_party/adobe/flash/flash_player.gyp:flapper_version_h', @@ -2423,7 +2471,6 @@ '../third_party/hunspell/hunspell.gyp:hunspell', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../third_party/libjingle/libjingle.gyp:libjingle', - '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', '../third_party/npapi/npapi.gyp:npapi', '../third_party/re2/re2.gyp:re2', '../ui/compositor/compositor.gyp:compositor', @@ -2564,46 +2611,50 @@ 'dependencies': [ 'browser_chromeos', ], - 'sources/': [ - ['exclude', 'browser/first_run/upgrade_util.cc'], - ['exclude', 'browser/first_run/upgrade_util.h'], - ['exclude', 'browser/first_run/upgrade_util_linux.cc'], - ['exclude', 'browser/icon_loader_linux.cc'], - ['exclude', 'browser/icon_manager_linux.cc'], - ['exclude', 'browser/idle_linux.cc'], - ['exclude', 'browser/password_manager/native_backend_gnome_x.cc'], - ['exclude', 'browser/password_manager/native_backend_gnome_x.h'], - ['exclude', 'browser/password_manager/native_backend_kwallet_x.cc'], - ['exclude', 'browser/password_manager/native_backend_kwallet_x.h'], - ['exclude', 'browser/platform_util_linux.cc'], - ['exclude', 'browser/speech/extension_api/tts_extension_api_linux.cc'], - ['exclude', 'browser/storage_monitor/mtab_watcher_linux.cc'], - ['exclude', 'browser/storage_monitor/mtab_watcher_linux.h'], - ['exclude', 'browser/storage_monitor/storage_monitor_linux.cc'], - ['exclude', 'browser/storage_monitor/storage_monitor_linux.h'], - ['exclude', 'browser/ui/ash/caps_lock_delegate_views.cc'], - ['exclude', 'browser/ui/ash/chrome_shell_delegate_views.cc'], - ['exclude', 'browser/ui/ash/session_state_delegate_views.cc'], - ['exclude', 'browser/ui/screen_capture_notification_ui_stub.cc'], - ['exclude', 'browser/ui/views/frame/browser_desktop_root_window_host_x11.cc'], - ['exclude', 'browser/ui/views/frame/browser_desktop_root_window_host_x11.h'], - ['exclude', 'browser/ui/views/frame/desktop_browser_frame_aura.cc'], - ['exclude', 'browser/ui/views/frame/desktop_browser_frame_aura.h'], - ['exclude', 'browser/ui/views/frame/desktop_user_action_handler_aura.cc'], - ['exclude', 'browser/ui/views/frame/desktop_user_action_handler_aura.h'], - ['exclude', 'browser/ui/views/frame/global_menu_bar_x11.cc'], - ['exclude', 'browser/ui/views/frame/global_menu_bar_x11.h'], - ['exclude', 'browser/ui/views/frame/global_menu_bar_registrar_x11.cc'], - ['exclude', 'browser/ui/views/frame/global_menu_bar_registrar_x11.h'], - ['exclude', 'browser/ui/views/screen_capture_notification_ui_views.cc'], - ['exclude', 'browser/ui/webui/help/version_updater_basic.cc'], - ['exclude', 'browser/ui/webui/help/version_updater_basic.h'], - ['exclude', 'browser/ui/webui/signin/user_manager_screen_handler.h'], - ['exclude', 'browser/ui/webui/signin/user_manager_screen_handler.cc'], - ['exclude', 'browser/ui/webui/signin/user_manager_ui.h'], - ['exclude', 'browser/ui/webui/signin/user_manager_ui.cc'], - ['exclude', 'browser/upgrade_detector_impl.cc'], - ['exclude', 'browser/upgrade_detector_impl.h'], + 'sources!': [ + 'browser/first_run/upgrade_util.cc', + 'browser/first_run/upgrade_util.h', + 'browser/first_run/upgrade_util_linux.cc', + 'browser/icon_loader_linux.cc', + 'browser/icon_manager_linux.cc', + 'browser/idle_linux.cc', + 'browser/password_manager/native_backend_gnome_x.cc', + 'browser/password_manager/native_backend_gnome_x.h', + 'browser/password_manager/native_backend_kwallet_x.cc', + 'browser/password_manager/native_backend_kwallet_x.h', + 'browser/platform_util_linux.cc', + 'browser/speech/extension_api/tts_extension_api_linux.cc', + 'browser/storage_monitor/mtab_watcher_linux.cc', + 'browser/storage_monitor/mtab_watcher_linux.h', + 'browser/storage_monitor/storage_monitor_linux.cc', + 'browser/storage_monitor/storage_monitor_linux.h', + 'browser/ui/ash/caps_lock_delegate_views.cc', + 'browser/ui/ash/chrome_shell_delegate_views.cc', + 'browser/ui/ash/session_state_delegate_views.cc', + 'browser/ui/screen_capture_notification_ui_stub.cc', + 'browser/ui/startup/default_browser_prompt.cc', + 'browser/ui/startup/default_browser_prompt.h', + 'browser/ui/views/frame/browser_desktop_root_window_host_x11.cc', + 'browser/ui/views/frame/browser_desktop_root_window_host_x11.h', + 'browser/ui/views/frame/desktop_browser_frame_aura.cc', + 'browser/ui/views/frame/desktop_browser_frame_aura.h', + 'browser/ui/views/frame/desktop_user_action_handler_aura.cc', + 'browser/ui/views/frame/desktop_user_action_handler_aura.h', + 'browser/ui/views/frame/global_menu_bar_x11.cc', + 'browser/ui/views/frame/global_menu_bar_x11.h', + 'browser/ui/views/frame/global_menu_bar_registrar_x11.cc', + 'browser/ui/views/frame/global_menu_bar_registrar_x11.h', + 'browser/ui/views/frame/opaque_browser_frame_view_linux.h', + 'browser/ui/views/frame/opaque_browser_frame_view_linux.cc', + 'browser/ui/views/screen_capture_notification_ui_views.cc', + 'browser/ui/webui/help/version_updater_basic.cc', + 'browser/ui/webui/help/version_updater_basic.h', + 'browser/ui/webui/signin/user_manager_screen_handler.h', + 'browser/ui/webui/signin/user_manager_screen_handler.cc', + 'browser/ui/webui/signin/user_manager_ui.h', + 'browser/ui/webui/signin/user_manager_ui.cc', + 'browser/upgrade_detector_impl.cc', + 'browser/upgrade_detector_impl.h', ], }], ['use_cups==1', { @@ -2645,7 +2696,6 @@ # gtk2 is the only component that can interact with gtk2 in our new # world. 'browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui', - '../ui/linux_ui/linux_ui.gyp:linux_ui', '../build/linux/system.gyp:gio', ], }], @@ -2670,13 +2720,13 @@ ['exclude', '^browser/ui/views/frame/browser_frame_win.cc'], ['exclude', '^browser/ui/views/frame/browser_frame_win.h'], ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_win.cc'], + ['exclude', '^browser/ui/views/frame/native_browser_frame_factory_win.cc'], ['exclude', '^browser/ui/views/importer/import_progress_dialog_view.cc'], ['exclude', '^browser/ui/views/omnibox/omnibox_view_win.cc'], ['exclude', '^browser/ui/views/omnibox/omnibox_view_win.h'], ['exclude', '^browser/ui/views/color_chooser_dialog.cc'], ['exclude', '^browser/ui/views/color_chooser_dialog.h'], ['exclude', '^browser/ui/views/color_chooser_win.cc'], - ['exclude', '^browser/ui/views/simple_message_box_win.cc'], ['exclude', '^browser/ui/views/tabs/native_view_photobooth.h'], ['exclude', '^browser/ui/views/tabs/native_view_photobooth_win.cc'], ['exclude', '^browser/ui/views/tabs/native_view_photobooth_win.h'], @@ -2819,8 +2869,6 @@ # There's no Browser/BrowserList on Android. 'browser/ui/active_tab_tracker.cc', 'browser/ui/active_tab_tracker.h', - 'browser/ui/blocked_content/popup_blocker_tab_helper.cc', - 'browser/ui/blocked_content/popup_blocker_tab_helper.h', 'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.cc', 'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h', 'browser/ui/bookmarks/bookmark_context_menu_controller.cc', @@ -2830,7 +2878,6 @@ 'browser/ui/browser_finder.cc', 'browser/ui/browser_iterator.cc', 'browser/ui/browser_list.cc', - 'browser/ui/browser_navigator.cc', 'browser/ui/browser_otr_state.cc', 'browser/ui/browser_tab_contents.cc', 'browser/ui/browser_tab_restore_service_delegate.cc', @@ -2883,6 +2930,51 @@ 'browser/ui/webui/suggestions_internals/suggestions_internals_ui_handler.h', 'browser/ui/window_sizer/window_sizer.cc', 'browser/ui/window_sizer/window_sizer.h', + + # Also not used on android + 'browser/ui/apps/chrome_shell_window_delegate.cc', + 'browser/ui/autofill/account_chooser_model.cc', + 'browser/ui/autofill/autocheckout_bubble.cc', + 'browser/ui/autofill/autofill_dialog_sign_in_delegate.cc', + 'browser/ui/autofill/country_combobox_model.cc', + 'browser/ui/bookmarks/bookmark_drag_drop.cc', + 'browser/ui/bookmarks/bookmark_tab_helper_delegate.cc', + 'browser/ui/browser_content_setting_bubble_model_delegate.cc', + 'browser/ui/browser_tabrestore.cc', + 'browser/ui/browser_tab_strip_model_delegate.cc', + 'browser/ui/browser_toolbar_model_delegate.cc', + 'browser/ui/browser_view_prefs.cc', + 'browser/ui/chrome_style.cc', + 'browser/ui/chrome_web_modal_dialog_manager_delegate.cc', + 'browser/ui/collected_cookies_infobar_delegate.cc', + 'browser/ui/confirm_bubble_model.cc', + 'browser/ui/crypto_module_password_dialog_openssl.cc', + 'browser/ui/extensions/application_launch.cc', + 'browser/ui/fast_unload_controller.cc', + 'browser/ui/find_bar/find_bar_controller.cc', + 'browser/ui/fullscreen/fullscreen_controller.cc', + 'browser/ui/fullscreen/fullscreen_exit_bubble_type.cc', + 'browser/ui/immersive_fullscreen_configuration.cc', + 'browser/ui/options/options_util.cc', + 'browser/ui/sad_tab.cc', + 'browser/ui/search_engines/search_engine_tab_helper_delegate.cc', + 'browser/ui/search_engines/template_url_fetcher_ui_callbacks.cc', + 'browser/ui/search/search_delegate.cc', + 'browser/ui/search/search_ui.cc', + 'browser/ui/send_feedback_experiment.cc', + 'browser/ui/tab_modal_confirm_dialog_delegate.cc', + 'browser/ui/unload_controller.cc', + 'browser/ui/website_settings/permission_menu_model.cc', + 'browser/ui/website_settings/website_settings_utils.cc', + 'browser/ui/webui/certificate_viewer_ui.cc', + 'browser/ui/webui/chrome_web_contents_handler.cc', + 'browser/ui/webui/ntp/app_resource_cache_factory.cc', + 'browser/ui/webui/ntp/core_app_launcher_handler.cc', + 'browser/ui/webui/performance_monitor/performance_monitor_handler.cc', + 'browser/ui/webui/performance_monitor/performance_monitor_l10n.cc', + 'browser/ui/webui/performance_monitor/performance_monitor_ui.cc', + 'browser/ui/webui/performance_monitor/performance_monitor_ui_constants.cc', + 'browser/ui/webui/theme_handler.cc', ], 'sources/': [ ['exclude', '^browser/ui/autofill/.*credit_card_bubble.*'], @@ -2931,6 +3023,11 @@ 'include_dirs': [ '../third_party/GTM', ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/Quartz.framework', + ], + }, 'actions': [ { # This action is used to extract the localization data from xib @@ -3110,6 +3207,14 @@ 'browser/ui/webui/media/webrtc_logs_ui.h', ], }], + ['enable_mdns==1', { + 'sources': [ + 'browser/ui/webui/local_discovery/local_discovery_ui.cc', + 'browser/ui/webui/local_discovery/local_discovery_ui.h', + 'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc', + 'browser/ui/webui/local_discovery/local_discovery_ui_handler.h', + ], + }], ], }, ], diff --git a/chromium/chrome/chrome_common.gypi b/chromium/chrome/chrome_common.gypi index c29bd660305..315783646cb 100644 --- a/chromium/chrome/chrome_common.gypi +++ b/chromium/chrome/chrome_common.gypi @@ -24,7 +24,6 @@ # TODO(gregoryd): chrome_resources and chrome_strings could be # shared with the 64-bit target, but it does not work due to a gyp # issue. - '../third_party/cld/cld.gyp:cld', 'common_net', 'common_version', 'installer_util', @@ -37,6 +36,9 @@ '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', '<(DEPTH)/chrome/chrome_resources.gyp:theme_resources', '<(DEPTH)/chrome/common_constants.gyp:common_constants', + '<(DEPTH)/components/components.gyp:json_schema', + '<(DEPTH)/components/components.gyp:policy_component', + '<(DEPTH)/components/components.gyp:variations', '<(DEPTH)/components/components.gyp:visitedlink_common', '<(DEPTH)/content/content.gyp:content_common', '<(DEPTH)/net/net.gyp:net', @@ -44,9 +46,8 @@ '<(DEPTH)/third_party/icu/icu.gyp:icui18n', '<(DEPTH)/third_party/icu/icu.gyp:icuuc', '<(DEPTH)/third_party/libxml/libxml.gyp:libxml', - '<(DEPTH)/third_party/mt19937ar/mt19937ar.gyp:mt19937ar', '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', - '<(DEPTH)/third_party/zlib/zlib.gyp:zip', + '<(DEPTH)/third_party/zlib/google/zip.gyp:zip', '<(DEPTH)/ui/ui.gyp:ui_resources', '<(DEPTH)/url/url.gyp:url_lib', '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent', @@ -70,14 +71,22 @@ '../extensions/common/extension_paths.h', '../extensions/common/extension_resource.cc', '../extensions/common/extension_resource.h', + '../extensions/common/extension_urls.cc', + '../extensions/common/extension_urls.h', '../extensions/common/extensions_client.cc', '../extensions/common/extensions_client.h', + '../extensions/common/features/feature.cc', + '../extensions/common/features/feature.h', '../extensions/common/features/feature_provider.cc', '../extensions/common/features/feature_provider.h', '../extensions/common/id_util.cc', '../extensions/common/id_util.h', '../extensions/common/install_warning.cc', '../extensions/common/install_warning.h', + '../extensions/common/manifest.cc', + '../extensions/common/manifest.h', + '../extensions/common/manifest_constants.cc', + '../extensions/common/manifest_constants.h', '../extensions/common/matcher/regex_set_matcher.cc', '../extensions/common/matcher/regex_set_matcher.h', '../extensions/common/matcher/string_pattern.cc', @@ -95,6 +104,8 @@ '../extensions/common/one_shot_event.cc', '../extensions/common/one_shot_event.h', '../extensions/common/permissions/permissions_provider.h', + '../extensions/common/stack_frame.cc', + '../extensions/common/stack_frame.h', '../extensions/common/switches.cc', '../extensions/common/switches.h', '../extensions/common/url_pattern.cc', @@ -169,6 +180,7 @@ 'common/descriptors_android.h', 'common/dump_without_crashing.cc', 'common/dump_without_crashing.h', + 'common/encrypted_media_messages_android.h', 'common/extensions/api/commands/commands_handler.cc', 'common/extensions/api/commands/commands_handler.h', 'common/extensions/api/extension_action/action_info.cc', @@ -208,6 +220,8 @@ 'common/extensions/api/storage/storage_schema_manifest_handler.h', 'common/extensions/api/system_indicator/system_indicator_handler.cc', 'common/extensions/api/system_indicator/system_indicator_handler.h', + 'common/extensions/api/url_handlers/url_handlers_parser.cc', + 'common/extensions/api/url_handlers/url_handlers_parser.h', 'common/extensions/background_info.cc', 'common/extensions/background_info.h', 'common/extensions/chrome_extensions_client.cc', @@ -231,8 +245,6 @@ 'common/extensions/extension_icon_set.h', 'common/extensions/extension_l10n_util.cc', 'common/extensions/extension_l10n_util.h', - 'common/extensions/extension_manifest_constants.cc', - 'common/extensions/extension_manifest_constants.h', 'common/extensions/extension_messages.cc', 'common/extensions/extension_messages.h', 'common/extensions/extension_process_policy.cc', @@ -247,8 +259,6 @@ 'common/extensions/features/base_feature_provider.h', 'common/extensions/features/complex_feature.cc', 'common/extensions/features/complex_feature.h', - 'common/extensions/features/feature.cc', - 'common/extensions/features/feature.h', 'common/extensions/features/feature_channel.cc', 'common/extensions/features/feature_channel.h', 'common/extensions/features/manifest_feature.cc', @@ -259,8 +269,6 @@ 'common/extensions/features/simple_feature.h', 'common/extensions/incognito_handler.cc', 'common/extensions/incognito_handler.h', - 'common/extensions/manifest.cc', - 'common/extensions/manifest.h', 'common/extensions/manifest_handler.cc', 'common/extensions/manifest_handler.h', 'common/extensions/manifest_handler_helpers.cc', @@ -275,8 +283,8 @@ 'common/extensions/manifest_handlers/externally_connectable.h', 'common/extensions/manifest_handlers/icons_handler.cc', 'common/extensions/manifest_handlers/icons_handler.h', - 'common/extensions/manifest_handlers/kiosk_enabled_info.cc', - 'common/extensions/manifest_handlers/kiosk_enabled_info.h', + 'common/extensions/manifest_handlers/kiosk_mode_info.cc', + 'common/extensions/manifest_handlers/kiosk_mode_info.h', 'common/extensions/manifest_handlers/minimum_chrome_version_checker.cc', 'common/extensions/manifest_handlers/minimum_chrome_version_checker.h', 'common/extensions/manifest_handlers/nacl_modules_handler.cc', @@ -373,12 +381,10 @@ 'common/instant_restricted_id_cache.h', 'common/instant_types.cc', 'common/instant_types.h', - 'common/json_schema/json_schema_constants.cc', - 'common/json_schema/json_schema_constants.h', - 'common/json_schema/json_schema_validator.cc', - 'common/json_schema/json_schema_validator.h', 'common/localized_error.cc', 'common/localized_error.h', + 'common/local_discovery/service_discovery_client.cc', + 'common/local_discovery/service_discovery_client.h', 'common/logging_chrome.cc', 'common/logging_chrome.h', 'common/mac/app_mode_common.h', @@ -396,20 +402,14 @@ 'common/media/webrtc_logging_messages.h', 'common/metrics/caching_permuted_entropy_provider.cc', 'common/metrics/caching_permuted_entropy_provider.h', - 'common/metrics/entropy_provider.cc', - 'common/metrics/entropy_provider.h', 'common/metrics/metrics_log_base.cc', 'common/metrics/metrics_log_base.h', 'common/metrics/metrics_log_manager.cc', 'common/metrics/metrics_log_manager.h', 'common/metrics/metrics_service_base.cc', 'common/metrics/metrics_service_base.h', - 'common/metrics/metrics_util.cc', - 'common/metrics/metrics_util.h', 'common/metrics/variations/uniformity_field_trials.cc', 'common/metrics/variations/uniformity_field_trials.h', - 'common/metrics/variations/variations_associated_data.cc', - 'common/metrics/variations/variations_associated_data.h', 'common/metrics/variations/variations_util.cc', 'common/metrics/variations/variations_util.h', 'common/multi_process_lock.h', @@ -419,15 +419,12 @@ 'common/omaha_query_params/omaha_query_params.cc', 'common/omaha_query_params/omaha_query_params.h', 'common/omnibox_focus_state.h', - 'common/one_click_signin_messages.h', 'common/partial_circular_buffer.cc', 'common/partial_circular_buffer.h', 'common/pepper_flash.cc', 'common/pepper_flash.h', 'common/pepper_permission_util.cc', 'common/pepper_permission_util.h', - 'common/policy/policy_schema.cc', - 'common/policy/policy_schema.h', 'common/pref_names_util.cc', 'common/pref_names_util.h', 'common/print_messages.cc', @@ -457,8 +454,6 @@ 'common/spellcheck_marker.h', 'common/spellcheck_messages.h', 'common/spellcheck_result.h', - 'common/startup_metric_utils.cc', - 'common/startup_metric_utils.h', 'common/switch_utils.cc', 'common/switch_utils.h', 'common/thumbnail_score.cc', @@ -503,10 +498,6 @@ ['include', 'common/extensions/api/extension_api_stub.cc'], ['include', 'common/extensions/api/extension_action/action_info.cc'], ['include', 'common/extensions/api/extension_action/action_info.h'], - ['include', 'common/extensions/api/extension_action/browser_action_handler.cc'], - ['include', 'common/extensions/api/extension_action/browser_action_handler.h'], - ['include', 'common/extensions/api/extension_action/page_action_handler.cc'], - ['include', 'common/extensions/api/extension_action/page_action_handler.h'], ['include', 'common/extensions/api/i18n/default_locale_handler.cc'], ['include', 'common/extensions/api/i18n/default_locale_handler.h'], ['include', 'common/extensions/api/identity/oauth2_manifest_handler.cc'], @@ -515,8 +506,6 @@ ['include', 'common/extensions/api/managed_mode_private/managed_mode_handler.h'], ['include', 'common/extensions/api/plugins/plugins_handler.cc'], ['include', 'common/extensions/api/plugins/plugins_handler.h'], - ['include', 'common/extensions/api/spellcheck/spellcheck_handler.cc'], - ['include', 'common/extensions/api/spellcheck/spellcheck_handler.h'], ['include', 'common/extensions/api/storage/storage_schema_manifest_handler.cc'], ['include', 'common/extensions/api/storage/storage_schema_manifest_handler.h'], ], @@ -587,24 +576,34 @@ ['exclude', '^common/chrome_version_info_posix.cc'], ['exclude', '^common/service_'], ], + 'sources!': [ + 'common/badge_util.cc', + 'common/extensions/api/extension_action/browser_action_handler.cc', + 'common/extensions/api/extension_action/page_action_handler.cc', + 'common/extensions/api/spellcheck/spellcheck_handler.cc', + 'common/extensions/manifest_handlers/minimum_chrome_version_checker.cc', + 'common/extensions/manifest_handlers/nacl_modules_handler.cc', + 'common/icon_with_badge_image_source.cc', + 'common/importer/imported_bookmark_entry.cc', + 'common/importer/importer_bridge.cc', + 'common/importer/importer_data_types.cc', + 'common/importer/importer_url_row.cc', + 'common/net/url_util.cc', + 'common/spellcheck_common.cc', + ], 'dependencies!': [ '<(DEPTH)/chrome/app/policy/cloud_policy_codegen.gyp:policy', ], }], ['OS=="win"', { 'include_dirs': [ + '<(DEPTH)/breakpad/src', '<(DEPTH)/third_party/wtl/include', ], - 'sources!': [ - 'common/crash_keys.cc', - 'common/crash_keys.h', - ], }], ['enable_mdns == 1', { 'sources': [ 'common/local_discovery/local_discovery_messages.h', - 'common/local_discovery/service_discovery_client.cc', - 'common/local_discovery/service_discovery_client.h', ] }], ['toolkit_uses_gtk == 1', { @@ -651,6 +650,11 @@ ['exclude', '^common/automation_'] ] }], + ['enable_plugins==0', { + 'source!' : [ + 'common/pepper_permission_util.cc', + ], + }], ['use_system_nspr==1', { 'dependencies': [ '<(DEPTH)/base/third_party/nspr/nspr.gyp:nspr', @@ -667,6 +671,16 @@ 'common/print_messages.h', ] }], + ['cld_version==0 or cld_version==1', { + 'dependencies': [ + '<(DEPTH)/third_party/cld/cld.gyp:cld', + ], + }], + ['cld_version==0 or cld_version==2', { + 'dependencies': [ + '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2', + ], + }], ], 'target_conditions': [ ['OS == "ios"', { diff --git a/chromium/chrome/chrome_dll.gypi b/chromium/chrome/chrome_dll.gypi index a64ad95e6b7..967cec86b9d 100644 --- a/chromium/chrome/chrome_dll.gypi +++ b/chromium/chrome/chrome_dll.gypi @@ -102,13 +102,11 @@ # On Windows, link the dependencies (libraries) that make # up actual Chromium functionality into this .dll. 'chrome_dll_pdb_workaround', - 'chrome_resources.gyp:chrome_resources', 'chrome_version_resources', '../chrome/chrome_resources.gyp:chrome_unscaled_resources', '../crypto/crypto.gyp:crypto', '../printing/printing.gyp:printing', '../net/net.gyp:net_resources', - '../third_party/cld/cld.gyp:cld', '../ui/views/views.gyp:views', '../webkit/webkit_resources.gyp:webkit_resources', ], @@ -125,30 +123,8 @@ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc', '../base/win/dllmain.cc', - '../ui/resources/cursors/aliasb.cur', - '../ui/resources/cursors/cell.cur', - '../ui/resources/cursors/col_resize.cur', - '../ui/resources/cursors/copy.cur', - '../ui/resources/cursors/none.cur', - '../ui/resources/cursors/row_resize.cur', - '../ui/resources/cursors/vertical_text.cur', - '../ui/resources/cursors/zoom_in.cur', - '../ui/resources/cursors/zoom_out.cur', - - # TODO: It would be nice to have these pulled in - # automatically from direct_dependent_settings in - # their various targets (net.gyp:net_resources, etc.), - # but that causes errors in other targets when - # resulting .res files get referenced multiple times. - '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', + # Cursors. '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', @@ -249,6 +225,16 @@ '../content/content.gyp:content_app_browser', ], }], + ['cld_version==0 or cld_version==1', { + 'dependencies': [ + '../third_party/cld/cld.gyp:cld', + ], + }], + ['cld_version==0 or cld_version==2', { + 'dependencies': [ + '../third_party/cld_2/cld_2.gyp:cld_2', + ], + }], ['OS=="mac" and component!="shared_library"', { 'includes': [ 'chrome_dll_bundle.gypi' ], }], diff --git a/chromium/chrome/chrome_dll_bundle.gypi b/chromium/chrome/chrome_dll_bundle.gypi index 9b8d1af5ea2..57bd2b9776f 100644 --- a/chromium/chrome/chrome_dll_bundle.gypi +++ b/chromium/chrome/chrome_dll_bundle.gypi @@ -61,7 +61,6 @@ 'app/theme/menu_overflow_down.pdf', 'app/theme/menu_overflow_up.pdf', 'browser/mac/install.sh', - '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak', '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))', diff --git a/chromium/chrome/chrome_exe.gypi b/chromium/chrome/chrome_exe.gypi index 78047eb957c..67b0efa448b 100644 --- a/chromium/chrome/chrome_exe.gypi +++ b/chromium/chrome/chrome_exe.gypi @@ -436,6 +436,9 @@ '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', ], }], + ['chrome_multiple_dll', { + 'defines': ['CHROME_MULTIPLE_DLL'], + }], ['OS=="mac" and asan==1', { 'xcode_settings': { # Override the outer definition of CHROMIUM_STRIP_SAVE_FILE. diff --git a/chromium/chrome/chrome_installer.gypi b/chromium/chrome/chrome_installer.gypi index f4c5f5d9d70..4f130941510 100644 --- a/chromium/chrome/chrome_installer.gypi +++ b/chromium/chrome/chrome_installer.gypi @@ -270,6 +270,8 @@ 'installer/mini_installer/chrome.release', 'installer/setup/archive_patch_helper.cc', 'installer/setup/archive_patch_helper.h', + 'installer/setup/cf_migration.cc', + 'installer/setup/cf_migration.h', 'installer/setup/chrome_frame_quick_enable.cc', 'installer/setup/chrome_frame_quick_enable.h', 'installer/setup/chrome_frame_ready_mode.cc', @@ -553,7 +555,6 @@ # TODO(mmoss) Any convenient way to get all the relevant build # files? (e.g. all locales, resources, etc.) '<(PRODUCT_DIR)/chrome', - '<(PRODUCT_DIR)/chrome.pak', '<(PRODUCT_DIR)/chrome_sandbox', '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', diff --git a/chromium/chrome/chrome_ios_bundle_resources.gypi b/chromium/chrome/chrome_ios_bundle_resources.gypi index 988654bb795..efcb5f8416e 100644 --- a/chromium/chrome/chrome_ios_bundle_resources.gypi +++ b/chromium/chrome/chrome_ios_bundle_resources.gypi @@ -7,7 +7,6 @@ '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources', ], 'mac_bundle_resources': [ - '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak', diff --git a/chromium/chrome/chrome_nibs.gyp b/chromium/chrome/chrome_nibs.gyp index 2e12fc63db8..cdc4c526293 100644 --- a/chromium/chrome/chrome_nibs.gyp +++ b/chromium/chrome/chrome_nibs.gyp @@ -167,18 +167,6 @@ 'browser/ui/cocoa/info_bubble_view.mm', 'browser/ui/cocoa/info_bubble_window.h', 'browser/ui/cocoa/info_bubble_window.mm', - 'browser/ui/cocoa/infobars/after_translate_infobar_controller.h', - 'browser/ui/cocoa/infobars/after_translate_infobar_controller.mm', - 'browser/ui/cocoa/infobars/alternate_nav_infobar_controller.h', - 'browser/ui/cocoa/infobars/alternate_nav_infobar_controller.mm', - 'browser/ui/cocoa/infobars/before_translate_infobar_controller.h', - 'browser/ui/cocoa/infobars/before_translate_infobar_controller.mm', - 'browser/ui/cocoa/infobars/confirm_infobar_controller.h', - 'browser/ui/cocoa/infobars/confirm_infobar_controller.mm', - 'browser/ui/cocoa/infobars/extension_infobar_controller.h', - 'browser/ui/cocoa/infobars/extension_infobar_controller.mm', - 'browser/ui/cocoa/infobars/infobar_container_controller.h', - 'browser/ui/cocoa/infobars/infobar_container_controller.mm', 'browser/ui/cocoa/infobars/infobar_controller.h', 'browser/ui/cocoa/infobars/infobar_controller.mm', 'browser/ui/cocoa/infobars/infobar_gradient_view.h', diff --git a/chromium/chrome/chrome_nibs.gypi b/chromium/chrome/chrome_nibs.gypi index 7c7aa330ad9..57fa683a980 100644 --- a/chromium/chrome/chrome_nibs.gypi +++ b/chromium/chrome/chrome_nibs.gypi @@ -24,6 +24,7 @@ 'app/nibs/ContentBlockedPlugins.xib', 'app/nibs/ContentBlockedPopups.xib', 'app/nibs/ContentBlockedGeolocation.xib', + 'app/nibs/ContentBlockedSavePassword.xib', 'app/nibs/ContentBlockedSimple.xib', 'app/nibs/ContentProtocolHandlers.xib', 'app/nibs/CookieDetailsView.xib', @@ -60,7 +61,6 @@ 'app/nibs/GlobalErrorBubble.xib', 'app/nibs/HungRendererDialog.xib', 'app/nibs/InfoBar.xib', - 'app/nibs/InfoBarContainer.xib', 'app/nibs/Notification.xib', 'app/nibs/Panel.xib', 'app/nibs/ScreenCaptureNotification.xib', diff --git a/chromium/chrome/chrome_renderer.gypi b/chromium/chrome/chrome_renderer.gypi index 2fe5126e612..7b8b758234b 100644 --- a/chromium/chrome/chrome_renderer.gypi +++ b/chromium/chrome/chrome_renderer.gypi @@ -14,6 +14,7 @@ 'chrome_resources.gyp:chrome_resources', 'chrome_resources.gyp:chrome_strings', '../components/components.gyp:autofill_content_renderer', + '../components/components.gyp:startup_metric_utils', '../components/components.gyp:visitedlink_renderer', '../content/content.gyp:content_renderer', '../net/net.gyp:net', @@ -77,8 +78,12 @@ 'renderer/extensions/content_watcher.h', 'renderer/extensions/context_menus_custom_bindings.cc', 'renderer/extensions/context_menus_custom_bindings.h', + 'renderer/extensions/css_native_handler.cc', + 'renderer/extensions/css_native_handler.h', 'renderer/extensions/dispatcher.cc', 'renderer/extensions/dispatcher.h', + 'renderer/extensions/document_custom_bindings.cc', + 'renderer/extensions/document_custom_bindings.h', 'renderer/extensions/dom_activity_logger.cc', 'renderer/extensions/dom_activity_logger.h', 'renderer/extensions/event_bindings.cc', @@ -152,11 +157,15 @@ 'renderer/extensions/web_request_custom_bindings.h', 'renderer/extensions/webstore_bindings.cc', 'renderer/extensions/webstore_bindings.h', + 'renderer/extensions/webview_custom_bindings.cc', + 'renderer/extensions/webview_custom_bindings.h', 'renderer/frame_sniffer.cc', 'renderer/frame_sniffer.h', 'renderer/isolated_world_ids.h', 'renderer/loadtimes_extension_bindings.cc', 'renderer/loadtimes_extension_bindings.h', + 'renderer/media/chrome_key_systems.cc', + 'renderer/media/chrome_key_systems.h', 'renderer/media/chrome_webrtc_log_message_delegate.cc', 'renderer/media/chrome_webrtc_log_message_delegate.h', 'renderer/media/webrtc_logging_message_filter.cc', @@ -171,8 +180,6 @@ 'renderer/net/renderer_net_predictor.h', 'renderer/net_benchmarking_extension.cc', 'renderer/net_benchmarking_extension.h', - 'renderer/one_click_signin_agent.cc', - 'renderer/one_click_signin_agent.h', 'renderer/playback_extension.cc', 'renderer/playback_extension.h', 'renderer/resource_bundle_source_map.cc', @@ -200,6 +207,7 @@ 'renderer/resources/extensions/json_schema.js', 'renderer/resources/extensions/last_error.js', 'renderer/resources/extensions/messaging.js', + 'renderer/resources/extensions/messaging_utils.js', 'renderer/resources/extensions/notifications_custom_bindings.js', 'renderer/resources/extensions/omnibox_custom_bindings.js', 'renderer/resources/extensions/page_action_custom_bindings.js', @@ -408,10 +416,29 @@ 'sources!': [ 'renderer/prerender/prerender_media_load_deferrer.cc', 'renderer/prerender/prerender_media_load_deferrer.h', + 'renderer/extensions/api_definitions_natives.cc', + 'renderer/extensions/app_window_custom_bindings.cc', + 'renderer/extensions/chrome_v8_extension.cc', + 'renderer/extensions/chrome_v8_extension_handler.cc', + 'renderer/extensions/context_menus_custom_bindings.cc', + 'renderer/extensions/extension_custom_bindings.cc', + 'renderer/extensions/file_browser_handler_custom_bindings.cc', + 'renderer/extensions/page_actions_custom_bindings.cc', + 'renderer/extensions/render_view_observer_natives.cc', + 'renderer/extensions/send_request_natives.cc', + 'renderer/extensions/tabs_custom_bindings.cc', + 'renderer/extensions/tts_custom_bindings.cc', ], 'defines': [ 'ENABLE_MOBILE_YOUTUBE_PLUGIN', ], + 'conditions' : [ + ['google_tv==1', { + 'sources!' : [ + 'renderer/media/chrome_key_systems.cc', + ] + }], + ], }], ['OS=="win"', { 'include_dirs': [ diff --git a/chromium/chrome/chrome_repack_chrome.gypi b/chromium/chrome/chrome_repack_chrome.gypi index a89543575fe..f9f2f2dd393 100644 --- a/chromium/chrome/chrome_repack_chrome.gypi +++ b/chromium/chrome/chrome_repack_chrome.gypi @@ -5,25 +5,8 @@ 'action_name': 'repack_chrome', 'variables': { 'pak_inputs': [ - '<(grit_out_dir)/browser_resources.pak', - '<(grit_out_dir)/common_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', ], - 'conditions': [ - ['OS != "ios"', { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', - ], - }], - ['enable_extensions==1', { - 'pak_inputs': [ - '<(grit_out_dir)/extensions_api_resources.pak', - ], - }], - ], }, 'inputs': [ '<(repack_path)', diff --git a/chromium/chrome/chrome_repack_resources.gypi b/chromium/chrome/chrome_repack_resources.gypi index 8519aabd446..f442cd25993 100644 --- a/chromium/chrome/chrome_repack_resources.gypi +++ b/chromium/chrome/chrome_repack_resources.gypi @@ -5,14 +5,27 @@ 'action_name': 'repack_resources', 'variables': { 'pak_inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak', + '<(grit_out_dir)/browser_resources.pak', + '<(grit_out_dir)/common_resources.pak', '<(grit_out_dir)/memory_internals_resources.pak', '<(grit_out_dir)/net_internals_resources.pak', '<(grit_out_dir)/signin_internals_resources.pak', '<(grit_out_dir)/sync_internals_resources.pak', '<(grit_out_dir)/translate_internals_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak', ], 'conditions': [ + ['OS != "ios"', { + 'pak_inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/components/dom_distiller_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', + '<(grit_out_dir)/devtools_discovery_page_resources.pak', + ], + }], ['OS != "ios" and OS != "android"', { # New paks should be added here by default. 'pak_inputs': [ @@ -23,9 +36,9 @@ '<(grit_out_dir)/sync_file_system_internals_resources.pak', ], }], - ['OS != "ios"', { + ['enable_extensions==1', { 'pak_inputs': [ - '<(grit_out_dir)/devtools_discovery_page_resources.pak', + '<(grit_out_dir)/extensions_api_resources.pak', ], }], ], diff --git a/chromium/chrome/chrome_resources.gyp b/chromium/chrome/chrome_resources.gyp index 30840648424..02e3789582f 100644 --- a/chromium/chrome/chrome_resources.gyp +++ b/chromium/chrome/chrome_resources.gyp @@ -55,6 +55,7 @@ 'conditions': [ ['OS != "ios"', { 'dependencies': [ + '../components/components.gyp:dom_distiller_resources', '../content/browser/devtools/devtools_resources.gyp:devtools_resources', '../content/browser/tracing/tracing_resources.gyp:tracing_resources', ], @@ -278,6 +279,7 @@ }, 'dependencies': [ 'chrome_extra_resources', + 'packed_resources', ], 'actions': [ { diff --git a/chromium/chrome/chrome_syzygy.gyp b/chromium/chrome/chrome_syzygy.gyp index d4994ac1813..0801d18e62b 100644 --- a/chromium/chrome/chrome_syzygy.gyp +++ b/chromium/chrome/chrome_syzygy.gyp @@ -19,7 +19,8 @@ ], }], # Note, not else. - ['OS=="win" and fastbuild==0 and chrome_multiple_dll==1', { + ['OS=="win" and fastbuild==0 and chrome_multiple_dll==1 and ' + '(asan!=1 or buildtype!="Official")', { 'variables': { 'dll_name': 'chrome_child', }, @@ -33,6 +34,34 @@ ], }, ], + }, { + 'conditions': [ + ['OS=="win" and fastbuild==0 and chrome_multiple_dll==1 and ' + 'asan==1 and buildtype=="Official"', { + 'targets': [ + { + 'target_name': 'chrome_child_dll_syzygy', + 'type': 'none', + 'inputs': [ + '<(PRODUCT_DIR)/chrome_child.dll', + '<(PRODUCT_DIR)/chrome_child.dll.pdb', + ], + 'outputs': [ + '<(PRODUCT_DIR)/syzygy/chrome_child.dll', + '<(PRODUCT_DIR)/syzygy/chrome_child.dll.pdb', + ], + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/syzygy', + 'files': [ + '<(PRODUCT_DIR)/chrome_child.dll', + '<(PRODUCT_DIR)/chrome_child.dll.pdb', + ], + }, + ], + }], + }], + ], }], ], } diff --git a/chromium/chrome/chrome_syzygy.gypi b/chromium/chrome/chrome_syzygy.gypi index 0fbf6bc548b..a3201cc1510 100644 --- a/chromium/chrome/chrome_syzygy.gypi +++ b/chromium/chrome/chrome_syzygy.gypi @@ -51,7 +51,6 @@ 'msvs_cygwin_shell': 0, 'inputs': [ '<(PRODUCT_DIR)/<(dll_name).dll', - '<(PRODUCT_DIR)/<(dll_name).dll.pdb', '<(DEPTH)/chrome/tools/build/win/win-syzyasan-filter.txt', ], 'outputs': [ @@ -59,7 +58,7 @@ '<(dest_dir)/<(dll_name).dll.pdb', '<(dest_dir)/asan_rtl.dll', '<(dest_dir)/asan_rtl.dll.pdb', - '<(dest_dir)/win-syzyasan-filter.txt.json', + '<(dest_dir)/win-syzyasan-filter-<(dll_name).txt.json', ], 'action': [ 'python', @@ -69,6 +68,8 @@ '--input_symbol', '<(PRODUCT_DIR)/<(dll_name).dll.pdb', '--filter', '<(DEPTH)/chrome/tools/build/win/win-syzyasan-filter.txt', + '--output-filter-file', + '<(dest_dir)/win-syzyasan-filter-<(dll_name).txt.json', '--destination_dir', '<(dest_dir)', ], }, diff --git a/chromium/chrome/chrome_tests.gypi b/chromium/chrome/chrome_tests.gypi index 1a5ef06fb85..6e362a6348f 100644 --- a/chromium/chrome/chrome_tests.gypi +++ b/chromium/chrome/chrome_tests.gypi @@ -9,7 +9,6 @@ 'common/automation_constants.h', 'common/pref_names.cc', 'common/pref_names.h', - 'browser/chromeos/cros/network_constants.h', 'test/automation/browser_proxy.cc', 'test/automation/browser_proxy.h', 'test/automation/tab_proxy.cc', @@ -69,8 +68,6 @@ 'sources': [ 'test/automation/proxy_launcher.cc', 'test/automation/proxy_launcher.h', - 'test/reliability/automated_ui_test_base.cc', - 'test/reliability/automated_ui_test_base.h', 'test/ui/javascript_test_util.cc', 'test/ui/run_all_unittests.cc', 'test/ui/ui_perf_test.cc', @@ -101,70 +98,6 @@ 'msvs_disabled_warnings': [ 4267, ], }, { - 'target_name': 'automated_ui_tests', - 'type': 'executable', - 'dependencies': [ - 'browser', - 'chrome_resources.gyp:theme_resources', - 'renderer', - 'test_support_common', - 'test_support_ui', - 'test_support_ui_runner', - '../base/base.gyp:base', - '../skia/skia.gyp:skia', - '../third_party/libxml/libxml.gyp:libxml', - '../testing/gtest.gyp:gtest', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'test/reliability/automated_ui_tests.cc', - 'test/reliability/automated_ui_tests.h', - ], - 'conditions': [ - ['OS=="win" and buildtype=="Official"', { - 'configurations': { - 'Release': { - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WholeProgramOptimization': 'false', - }, - }, - }, - }, - },], - ['use_x11==1', { - 'dependencies': [ - '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', - ], - }], - ['OS=="win"', { - 'dependencies': [ - 'automated_ui_tests_exe_pdb_workaround', - ], - 'include_dirs': [ - '<(DEPTH)/third_party/wtl/include', - ], - 'conditions': [ - ['win_use_allocator_shim==1', { - 'dependencies': [ - '<(allocator_target)', - ], - }], - ], - }], - ['OS=="linux" and enable_webrtc==1', { - 'dependencies': [ - # TODO(tommi): Figure out why the 32bit lucid builder fails to - # find this dependency for this target (other builders pick it up - # correctly). crbug.com/231068. - '../third_party/libjingle/libjingle.gyp:libpeerconnection', - ], - }], - ], - }, - { 'target_name': 'interactive_ui_tests', 'type': 'executable', 'dependencies': [ @@ -179,6 +112,7 @@ 'test_support_common', # NOTE: don't add test_support_ui, no more UITests. See # http://crbug.com/137365 + '../google_apis/google_apis.gyp:google_apis_test_support', '../third_party/hunspell/hunspell.gyp:hunspell', '../net/net.gyp:net', '../net/net.gyp:net_resources', @@ -206,10 +140,16 @@ ], 'sources': [ '../apps/app_shim/app_shim_quit_interactive_uitest_mac.mm', + '../ui/views/corewm/desktop_capture_controller_unittest.cc', + '../ui/views/widget/widget_interactive_uitest.cc', + 'browser/apps/app_browsertest_util.cc', + 'browser/apps/app_browsertest_util.h', + 'browser/apps/web_view_interactive_browsertest.cc', 'browser/autofill/autofill_interactive_uitest.cc', 'browser/browser_keyevents_browsertest.cc', 'browser/extensions/api/omnibox/omnibox_api_interactive_test.cc', 'browser/extensions/api/tabs/tabs_interactive_test.cc', + 'browser/extensions/browsertest_util.cc', 'browser/extensions/extension_apitest.cc', 'browser/extensions/extension_browsertest.cc', 'browser/extensions/extension_crash_recovery_browsertest.cc', @@ -218,9 +158,6 @@ 'browser/extensions/extension_test_message_listener.cc', 'browser/extensions/extension_test_message_listener.h', 'browser/extensions/notifications_apitest.cc', - 'browser/extensions/platform_app_browsertest_util.cc', - 'browser/extensions/platform_app_browsertest_util.h', - 'browser/extensions/web_view_interactive_browsertest.cc', 'browser/extensions/window_open_interactive_apitest.cc', 'browser/extensions/extension_fullscreen_apitest.cc', 'browser/extensions/extension_pointer_lock_apitest.cc', @@ -230,6 +167,7 @@ 'browser/notifications/notification_browsertest.cc', 'browser/printing/print_dialog_cloud_interative_uitest.cc', 'browser/task_manager/task_manager_browsertest_util.cc', + 'browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc', 'browser/ui/browser_focus_uitest.cc', 'browser/ui/cocoa/panels/panel_cocoa_browsertest.mm', 'browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc', @@ -259,6 +197,8 @@ 'browser/ui/search/instant_test_utils.cc', 'browser/ui/search/local_ntp_browsertest.cc', 'browser/ui/startup/startup_browser_creator_interactive_uitest.cc', + 'browser/ui/toolbar/test_toolbar_model.cc', + 'browser/ui/toolbar/test_toolbar_model.h', 'browser/ui/views/ash/tab_scrubber_browsertest.cc', 'browser/ui/views/bookmarks/bookmark_bar_view_test.cc', 'browser/ui/views/button_dropdown_test.cc', @@ -372,6 +312,7 @@ }, { # else: toolkit_views == 0 'sources/': [ ['exclude', '^browser/ui/views/'], + ['exclude', '^../ui/views/'], ], }], ['use_ash==1', { @@ -384,13 +325,16 @@ 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc', ], }], + ['use_aura==0 or chromeos==1', { + 'sources!': [ + '../ui/views/corewm/desktop_capture_controller_unittest.cc', + ], + }], ['chromeos==1', { 'dependencies': [ '../chromeos/chromeos.gyp:chromeos', ], 'sources': [ - 'browser/chromeos/cros/cros_in_process_browser_test.cc', - 'browser/chromeos/cros/cros_in_process_browser_test.h', 'browser/chromeos/input_method/textinput_browsertest.cc', 'browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc', 'browser/chromeos/input_method/textinput_test_helper.cc', @@ -398,6 +342,9 @@ 'browser/chromeos/login/captive_portal_window_browsertest.cc', 'browser/chromeos/login/eula_browsertest.cc', 'browser/chromeos/login/login_browsertest.cc', + 'browser/chromeos/login/login_manager_test.cc', + 'browser/chromeos/login/login_manager_test.h', + 'browser/chromeos/login/login_ui_browsertest.cc', 'browser/chromeos/login/oobe_browsertest.cc', 'browser/chromeos/login/screen_locker_browsertest.cc', 'browser/chromeos/login/screen_locker_tester.cc', @@ -491,271 +438,6 @@ ], # conditions }, { - # Third-party support sources for chromedriver_lib. - 'target_name': 'chromedriver_support', - 'type': 'static_library', - 'sources': [ - '../third_party/mongoose/mongoose.c', - '../third_party/mongoose/mongoose.h', - '../third_party/webdriver/atoms.cc', - '../third_party/webdriver/atoms.h', - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - # Although this one is probably safe to ignore. - # Mongose casts -1 directly as HANDLE (definitely safe to ignore). - 'msvs_disabled_warnings': [4267, 4306, ], - }, - { - # chromedriver is the chromium implementation of WebDriver. - # See http://www.chromium.org/developers/testing/webdriver-for-chrome - 'target_name': 'chromedriver_lib', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../net/net.gyp:net', - '../skia/skia.gyp:skia', - '../sync/sync.gyp:sync', - '../testing/gtest.gyp:gtest', - '../third_party/icu/icu.gyp:icui18n', - '../third_party/icu/icu.gyp:icuuc', - '../third_party/libxml/libxml.gyp:libxml', - '../url/url.gyp:url_lib', - 'browser', - 'chrome', - 'chrome_resources.gyp:chrome_resources', - 'chrome_resources.gyp:chrome_strings', - 'chromedriver_support', - 'common', - 'test_support_ui', - 'test_support_ui_runner', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'test/webdriver/commands/alert_commands.cc', - 'test/webdriver/commands/alert_commands.h', - 'test/webdriver/commands/appcache_status_command.cc', - 'test/webdriver/commands/appcache_status_command.h', - 'test/webdriver/commands/browser_connection_commands.cc', - 'test/webdriver/commands/browser_connection_commands.h', - 'test/webdriver/commands/chrome_commands.cc', - 'test/webdriver/commands/chrome_commands.h', - 'test/webdriver/commands/command.cc', - 'test/webdriver/commands/command.h', - 'test/webdriver/commands/cookie_commands.cc', - 'test/webdriver/commands/cookie_commands.h', - 'test/webdriver/commands/create_session.cc', - 'test/webdriver/commands/create_session.h', - 'test/webdriver/commands/execute_async_script_command.cc', - 'test/webdriver/commands/execute_async_script_command.h', - 'test/webdriver/commands/execute_command.cc', - 'test/webdriver/commands/execute_command.h', - 'test/webdriver/commands/file_upload_command.cc', - 'test/webdriver/commands/file_upload_command.h', - 'test/webdriver/commands/find_element_commands.cc', - 'test/webdriver/commands/find_element_commands.h', - 'test/webdriver/commands/html5_location_commands.cc', - 'test/webdriver/commands/html5_location_commands.h', - 'test/webdriver/commands/html5_storage_commands.cc', - 'test/webdriver/commands/html5_storage_commands.h', - 'test/webdriver/commands/keys_command.cc', - 'test/webdriver/commands/keys_command.h', - 'test/webdriver/commands/log_command.cc', - 'test/webdriver/commands/log_command.h', - 'test/webdriver/commands/navigate_commands.cc', - 'test/webdriver/commands/navigate_commands.h', - 'test/webdriver/commands/mouse_commands.cc', - 'test/webdriver/commands/mouse_commands.h', - 'test/webdriver/commands/response.h', - 'test/webdriver/commands/response.cc', - 'test/webdriver/commands/screenshot_command.cc', - 'test/webdriver/commands/screenshot_command.h', - 'test/webdriver/commands/session_with_id.cc', - 'test/webdriver/commands/session_with_id.h', - 'test/webdriver/commands/set_timeout_commands.cc', - 'test/webdriver/commands/set_timeout_commands.h', - 'test/webdriver/commands/source_command.cc', - 'test/webdriver/commands/source_command.h', - 'test/webdriver/commands/target_locator_commands.cc', - 'test/webdriver/commands/target_locator_commands.h', - 'test/webdriver/commands/title_command.cc', - 'test/webdriver/commands/title_command.h', - 'test/webdriver/commands/url_command.cc', - 'test/webdriver/commands/url_command.h', - 'test/webdriver/commands/webdriver_command.cc', - 'test/webdriver/commands/webdriver_command.h', - 'test/webdriver/commands/webelement_commands.cc', - 'test/webdriver/commands/webelement_commands.h', - 'test/webdriver/commands/window_commands.cc', - 'test/webdriver/commands/window_commands.h', - 'test/webdriver/frame_path.cc', - 'test/webdriver/frame_path.h', - 'test/webdriver/http_response.cc', - 'test/webdriver/http_response.h', - 'test/webdriver/keycode_text_conversion.h', - 'test/webdriver/keycode_text_conversion_gtk.cc', - 'test/webdriver/keycode_text_conversion_mac.mm', - 'test/webdriver/keycode_text_conversion_win.cc', - 'test/webdriver/keycode_text_conversion_x.cc', - 'test/webdriver/webdriver_automation.cc', - 'test/webdriver/webdriver_automation.h', - 'test/webdriver/webdriver_basic_types.cc', - 'test/webdriver/webdriver_basic_types.h', - 'test/webdriver/webdriver_capabilities_parser.cc', - 'test/webdriver/webdriver_capabilities_parser.h', - 'test/webdriver/webdriver_dispatch.cc', - 'test/webdriver/webdriver_dispatch.h', - 'test/webdriver/webdriver_element_id.cc', - 'test/webdriver/webdriver_element_id.h', - 'test/webdriver/webdriver_error.cc', - 'test/webdriver/webdriver_error.h', - 'test/webdriver/webdriver_key_converter.cc', - 'test/webdriver/webdriver_key_converter.h', - 'test/webdriver/webdriver_logging.cc', - 'test/webdriver/webdriver_logging.h', - 'test/webdriver/webdriver_session.cc', - 'test/webdriver/webdriver_session.h', - 'test/webdriver/webdriver_session_manager.cc', - 'test/webdriver/webdriver_session_manager.h', - 'test/webdriver/webdriver_switches.cc', - 'test/webdriver/webdriver_switches.h', - 'test/webdriver/webdriver_util.cc', - 'test/webdriver/webdriver_util.h', - 'test/webdriver/webdriver_util_mac.mm', - ], - 'conditions': [ - ['use_x11==1', { - 'dependencies': [ - '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', - ], - }], - ['toolkit_uses_gtk == 1', { - 'dependencies': [ - '../build/linux/system.gyp:gtk', - ], - 'sources!': [ - 'test/webdriver/keycode_text_conversion_x.cc', - ], - }], - ['toolkit_uses_gtk == 0', { - 'sources!': [ - 'test/webdriver/keycode_text_conversion_gtk.cc', - ], - }], - ['OS=="linux" and toolkit_views==1', { - 'dependencies': [ - '../ui/views/views.gyp:views', - ], - }], - ['os_posix == 1 and OS != "mac" and OS != "android"', { - 'conditions': [ - ['linux_use_tcmalloc==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }], - ], - }, - { - 'target_name': 'chromedriver', - 'type': 'executable', - 'dependencies': [ - 'chromedriver_lib', - '../base/base.gyp:base', - '../skia/skia.gyp:skia', - '../testing/gtest.gyp:gtest', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'test/webdriver/webdriver_server.cc', - ], - 'conditions': [ - ['OS=="win"', { - 'conditions': [ - ['win_use_allocator_shim==1', { - 'dependencies': [ - '<(allocator_target)', - ], - }], - ], - 'link_settings': { - 'libraries': [ - '-lOleAcc.lib', - '-lws2_32.lib', - ], - }, - 'configurations': { - 'Debug': { - 'msvs_settings': { - 'VCLinkerTool': { - 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', - }, - }, - }, - }, - }], - ] - }, - { - 'target_name': 'chromedriver_unittests', - 'type': 'executable', - 'dependencies': [ - 'chromedriver_lib', - '../base/base.gyp:run_all_unittests', - '../base/base.gyp:test_support_base', - '../testing/gtest.gyp:gtest', - '../skia/skia.gyp:skia', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'test/webdriver/commands/set_timeout_commands_unittest.cc', - 'test/webdriver/frame_path_unittest.cc', - 'test/webdriver/http_response_unittest.cc', - 'test/webdriver/keycode_text_conversion_unittest.cc', - 'test/webdriver/webdriver_capabilities_parser_unittest.cc', - 'test/webdriver/webdriver_dispatch_unittest.cc', - 'test/webdriver/webdriver_key_converter_unittest.cc', - 'test/webdriver/webdriver_test_util.cc', - 'test/webdriver/webdriver_test_util.h', - 'test/webdriver/webdriver_util_unittest.cc', - ], - 'conditions': [ - ['OS=="win"', { - 'conditions': [ - ['win_use_allocator_shim==1', { - 'dependencies': [ - '<(allocator_target)', - ], - }], - ], - 'link_settings': { - 'libraries': [ - '-lOleAcc.lib', - '-lws2_32.lib', - ], - }, - 'configurations': { - 'Debug': { - 'msvs_settings': { - 'VCLinkerTool': { - 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', - }, - }, - }, - }, - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], - }], - ], - }, - { 'target_name': 'chrome_devtools_lib', 'type': 'static_library', 'hard_dependency': 1, @@ -794,6 +476,8 @@ 'test/chromedriver/chrome/chrome_android_impl.h', 'test/chromedriver/chrome/chrome_desktop_impl.cc', 'test/chromedriver/chrome/chrome_desktop_impl.h', + 'test/chromedriver/chrome/chrome_existing_impl.cc', + 'test/chromedriver/chrome/chrome_existing_impl.h', 'test/chromedriver/chrome/chrome_finder.cc', 'test/chromedriver/chrome/chrome_finder.h', 'test/chromedriver/chrome/chrome_finder_mac.mm', @@ -817,6 +501,8 @@ 'test/chromedriver/chrome/geolocation_override_manager.cc', 'test/chromedriver/chrome/geolocation_override_manager.h', 'test/chromedriver/chrome/geoposition.h', + 'test/chromedriver/chrome/heap_snapshot_taker.cc', + 'test/chromedriver/chrome/heap_snapshot_taker.h', 'test/chromedriver/chrome/javascript_dialog_manager.cc', 'test/chromedriver/chrome/javascript_dialog_manager.h', 'test/chromedriver/chrome/log.h', @@ -829,6 +515,8 @@ 'test/chromedriver/chrome/status.h', 'test/chromedriver/chrome/ui_events.cc', 'test/chromedriver/chrome/ui_events.h', + 'test/chromedriver/chrome/util.cc', + 'test/chromedriver/chrome/util.h', 'test/chromedriver/chrome/version.cc', 'test/chromedriver/chrome/version.h', 'test/chromedriver/chrome/web_view.h', @@ -936,10 +624,13 @@ { 'target_name': 'chromedriver2_lib', 'type': 'static_library', + 'hard_dependency': 1, 'dependencies': [ 'chrome_devtools_lib', '../base/base.gyp:base', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../crypto/crypto.gyp:crypto', + '../net/net.gyp:http_server', '../net/net.gyp:net', '../ui/ui.gyp:ui', ], @@ -947,6 +638,8 @@ '..', ], 'sources': [ + '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/version.cc', + '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/version.h', '../third_party/webdriver/atoms.cc', '../third_party/webdriver/atoms.h', 'test/chromedriver/alert_commands.cc', @@ -972,6 +665,8 @@ 'test/chromedriver/keycode_text_conversion_x.cc', 'test/chromedriver/logging.cc', 'test/chromedriver/logging.h', + 'test/chromedriver/server/http_handler.cc', + 'test/chromedriver/server/http_handler.h', 'test/chromedriver/session.cc', 'test/chromedriver/session.h', 'test/chromedriver/session_commands.cc', @@ -982,33 +677,57 @@ 'test/chromedriver/window_commands.cc', 'test/chromedriver/window_commands.h', ], + 'actions': [ + { + 'action_name': 'embed_version_in_cpp', + 'inputs': [ + 'test/chromedriver/cpp_source.py', + 'test/chromedriver/embed_version_in_cpp.py', + 'test/chromedriver/VERSION', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/version.cc', + '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/version.h', + ], + 'action': [ 'python', + 'test/chromedriver/embed_version_in_cpp.py', + '--version-file', + 'test/chromedriver/VERSION', + '--directory', + '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver', + ], + 'message': 'Generating version info', + }, + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '<(SHARED_INTERMEDIATE_DIR)', + ], + }, # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], }, + # TODO(kkania): Remove this in favor of 'chromedriver' target right below. { - 'target_name': 'chromedriver2_server_lib', - 'type': 'static_library', + 'target_name': 'chromedriver2_server', + 'type': 'executable', 'dependencies': [ 'chromedriver2_lib', - '../base/base.gyp:base', - '../net/net.gyp:http_server', - '../net/net.gyp:net', ], 'include_dirs': [ '..', ], 'sources': [ - 'test/chromedriver/server/http_handler.cc', - 'test/chromedriver/server/http_handler.h', + 'test/chromedriver/server/chromedriver_server.cc', ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], }, { - 'target_name': 'chromedriver2_server', + 'target_name': 'chromedriver', 'type': 'executable', 'dependencies': [ - 'chromedriver2_server_lib', + 'chromedriver2_lib', ], 'include_dirs': [ '..', @@ -1024,7 +743,6 @@ 'type': 'executable', 'dependencies': [ 'chromedriver2_lib', - 'chromedriver2_server_lib', '../base/base.gyp:base', '../base/base.gyp:run_all_unittests', '../net/net.gyp:http_server', @@ -1042,6 +760,7 @@ 'test/chromedriver/chrome/dom_tracker_unittest.cc', 'test/chromedriver/chrome/frame_tracker_unittest.cc', 'test/chromedriver/chrome/geolocation_override_manager_unittest.cc', + 'test/chromedriver/chrome/heap_snapshot_taker_unittest.cc', 'test/chromedriver/chrome/javascript_dialog_manager_unittest.cc', 'test/chromedriver/chrome/navigation_tracker_unittest.cc', 'test/chromedriver/chrome/performance_logger_unittest.cc', @@ -1116,13 +835,16 @@ 'chrome_resources.gyp:packed_resources', 'common/extensions/api/api.gyp:api', 'renderer', + 'test/perf/perf_test.gyp:*', 'test_support_common', + 'test_support_unit', '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../base/base.gyp:test_support_base', '../components/components.gyp:autofill_content_risk_proto', '../components/components.gyp:autofill_content_test_support', '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks', + '../google_apis/google_apis.gyp:google_apis_test_support', '../net/net.gyp:net', '../net/net.gyp:net_test_support', '../skia/skia.gyp:skia', @@ -1131,11 +853,11 @@ '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', - '../third_party/cld/cld.gyp:cld', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../third_party/safe_browsing/safe_browsing.gyp:safe_browsing', + '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support', '../ui/ui.gyp:webui_test_support', '../v8/tools/gyp/v8.gyp:v8', @@ -1145,6 +867,7 @@ ], 'include_dirs': [ '..', + '<(SHARED_INTERMEDIATE_DIR)', ], 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER', @@ -1152,7 +875,21 @@ 'sources': [ '../apps/app_restore_service_browsertest.cc', '../apps/load_and_launch_browsertest.cc', + # TODO(blundell): Bring up a components_browsertests target and move + # this test to be in that target. crbug.com/283846 + '../components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc', + '../components/autofill/content/renderer/test_password_autofill_agent.h', + '../components/autofill/content/renderer/test_password_autofill_agent.cc', + '../remoting/test/auth_browsertest.cc', + '../remoting/test/launch_browsertest.cc', + '../remoting/test/key_code_conv.cc', + '../remoting/test/key_code_conv.h', + '../remoting/test/key_code_map.h', + '../remoting/test/me2me_browsertest.cc', '../remoting/test/remote_desktop_browsertest.cc', + '../remoting/test/remote_desktop_browsertest.h', + '../remoting/test/waiter.cc', + '../remoting/test/waiter.h', 'app/breakpad_mac_stubs.mm', 'app/chrome_command_ids.h', 'app/chrome_dll.rc', @@ -1161,6 +898,13 @@ 'browser/accessibility/accessibility_extension_apitest.cc', 'browser/accessibility/browser_accessibility_state_browsertest.cc', 'browser/app_controller_mac_browsertest.mm', + 'browser/apps/ad_view_browsertest.cc', + 'browser/apps/app_browsertest.cc', + 'browser/apps/app_browsertest_util.cc', + 'browser/apps/app_browsertest_util.h', + 'browser/apps/app_url_redirector_browsertest.cc', + 'browser/apps/web_view_browsertest.cc', + 'browser/apps/window_controls_browsertest.cc', 'browser/autocomplete/autocomplete_browsertest.cc', 'browser/autofill/autofill_browsertest.cc', 'browser/autofill/autofill_driver_impl_browsertest.cc', @@ -1182,23 +926,20 @@ 'browser/chromeos/accessibility/magnification_manager_browsertest.cc', 'browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc', 'browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc', - 'browser/chromeos/cros/cros_in_process_browser_test.cc', - 'browser/chromeos/cros/cros_in_process_browser_test.h', 'browser/chromeos/drive/drive_integration_service_browsertest.cc', 'browser/chromeos/drive/test_util.cc', 'browser/chromeos/drive/test_util.h', 'browser/chromeos/extensions/echo_private_apitest.cc', - 'browser/chromeos/extensions/file_manager/desktop_notifications_browsertest.cc', - 'browser/chromeos/extensions/file_manager/drive_test_util.cc', - 'browser/chromeos/extensions/file_manager/drive_test_util.h', - 'browser/chromeos/extensions/file_manager/event_router_browsertest.cc', - 'browser/chromeos/extensions/file_manager/external_filesystem_apitest.cc', 'browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc', 'browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc', - 'browser/chromeos/extensions/file_manager/file_manager_browsertest.cc', 'browser/chromeos/extensions/info_private_apitest.cc', 'browser/chromeos/extensions/input_method_apitest_chromeos.cc', 'browser/chromeos/extensions/wallpaper_private_apitest.cc', + 'browser/chromeos/file_manager/desktop_notifications_browsertest.cc', + 'browser/chromeos/file_manager/drive_test_util.cc', + 'browser/chromeos/file_manager/drive_test_util.h', + 'browser/chromeos/file_manager/external_filesystem_apitest.cc', + 'browser/chromeos/file_manager/file_manager_browsertest.cc', 'browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc', 'browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.cc', 'browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.h', @@ -1208,9 +949,11 @@ 'browser/chromeos/login/enrollment/mock_enrollment_screen.h', 'browser/chromeos/login/existing_user_controller_browsertest.cc', 'browser/chromeos/login/kiosk_browsertest.cc', + 'browser/chromeos/login/login_screen_policy_browsertest.cc', 'browser/chromeos/login/login_utils_browsertest.cc', 'browser/chromeos/login/login_manager_test.cc', 'browser/chromeos/login/login_manager_test.h', + 'browser/chromeos/login/managed/supervised_user_creation_browsertest.cc', 'browser/chromeos/login/mock_authenticator.cc', 'browser/chromeos/login/mock_authenticator.h', 'browser/chromeos/login/session_login_browsertest.cc', @@ -1235,7 +978,6 @@ 'browser/chromeos/login/wizard_controller_browsertest.cc', 'browser/chromeos/login/wizard_in_process_browser_test.cc', 'browser/chromeos/login/wizard_in_process_browser_test.h', - 'browser/chromeos/media/media_player_browsertest.cc', 'browser/chromeos/memory/oom_priority_manager_browsertest.cc', 'browser/chromeos/policy/device_local_account_browsertest.cc', 'browser/chromeos/policy/device_policy_cros_browser_test.cc', @@ -1244,6 +986,7 @@ 'browser/chromeos/policy/login_screen_default_policy_browsertest.cc', 'browser/chromeos/policy/policy_cert_verifier_browsertest.cc', 'browser/chromeos/policy/power_policy_browsertest.cc', + 'browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc', 'browser/chromeos/policy/variations_service_policy_browsertest.cc', 'browser/chromeos/power/peripheral_battery_observer_browsertest.cc', 'browser/chromeos/profiles/profile_helper_browsertest.cc', @@ -1264,7 +1007,7 @@ 'browser/errorpage_browsertest.cc', 'browser/extensions/active_tab_apitest.cc', 'browser/extensions/activity_log/activity_log_browsertest.cc', - 'browser/extensions/ad_view_browsertest.cc', + 'browser/extensions/activity_log/uma_policy_browsertest.cc', 'browser/extensions/alert_apitest.cc', 'browser/extensions/all_urls_apitest.cc', 'browser/extensions/api/activity_log_private/activity_log_private_apitest.cc', @@ -1273,6 +1016,7 @@ 'browser/extensions/api/autotest_private/autotest_private_apitest.cc', 'browser/extensions/api/bluetooth/bluetooth_apitest.cc', 'browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc', + 'browser/extensions/api/braille_display_private/braille_display_private_apitest.cc', 'browser/extensions/api/bookmarks/bookmark_apitest.cc', 'browser/extensions/api/browsing_data/browsing_data_test.cc', 'browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc', @@ -1285,6 +1029,7 @@ 'browser/extensions/api/debugger/debugger_extension_apitest.cc', 'browser/extensions/api/declarative/declarative_apitest.cc', 'browser/extensions/api/declarative_content/declarative_content_apitest.cc', + 'browser/extensions/api/desktop_capture/desktop_capture_apitest.cc', 'browser/extensions/api/developer_private/developer_private_apitest.cc', 'browser/extensions/api/dial/dial_apitest.cc', 'browser/extensions/api/dns/dns_apitest.cc', @@ -1307,8 +1052,8 @@ 'browser/extensions/api/management/management_api_browsertest.cc', 'browser/extensions/api/management/management_apitest.cc', 'browser/extensions/api/management/management_browsertest.cc', + 'browser/extensions/api/mdns/mdns_apitest.cc', 'browser/extensions/api/media_galleries/media_galleries_apitest.cc', - 'browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc', 'browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc', 'browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc', 'browser/extensions/api/messaging/native_messaging_apitest.cc', @@ -1329,8 +1074,9 @@ 'browser/extensions/api/rtc_private/rtc_private_apitest.cc', 'browser/extensions/api/runtime/runtime_apitest.cc', 'browser/extensions/api/serial/serial_apitest.cc', - 'browser/extensions/api/session_restore/session_restore_apitest.cc', + 'browser/extensions/api/sessions/sessions_apitest.cc', 'browser/extensions/api/socket/socket_apitest.cc', + 'browser/extensions/api/sockets_udp/sockets_udp_apitest.cc', 'browser/extensions/api/storage/settings_apitest.cc', 'browser/extensions/api/streams_private/streams_private_apitest.cc', 'browser/extensions/api/sync_file_system/sync_file_system_apitest.cc', @@ -1358,6 +1104,9 @@ 'browser/extensions/background_app_browsertest.cc', 'browser/extensions/background_page_apitest.cc', 'browser/extensions/background_scripts_apitest.cc', + 'browser/extensions/browsertest_util.cc', + 'browser/extensions/browsertest_util.h', + 'browser/extensions/browsertest_util_browsertest.cc', 'browser/extensions/chrome_app_api_browsertest.cc', 'browser/extensions/content_script_apitest.cc', 'browser/extensions/content_security_policy_apitest.cc', @@ -1366,12 +1115,12 @@ 'browser/extensions/cross_origin_xhr_apitest.cc', 'browser/extensions/crx_installer_browsertest.cc', 'browser/extensions/docs/examples/apps/calculator_browsertest.cc', + 'browser/extensions/error_console/error_console_browsertest.cc', 'browser/extensions/events_apitest.cc', 'browser/extensions/execute_script_apitest.cc', 'browser/extensions/extension_apitest.cc', 'browser/extensions/extension_apitest.h', 'browser/extensions/extension_bindings_apitest.cc', - 'browser/extensions/extension_blacklist_browsertest.cc', 'browser/extensions/extension_browsertest.cc', 'browser/extensions/extension_browsertest.h', 'browser/extensions/extension_context_menu_browsertest.cc', @@ -1406,9 +1155,6 @@ 'browser/extensions/mutation_observers_apitest.cc', 'browser/extensions/options_page_apitest.cc', 'browser/extensions/page_action_browsertest.cc', - 'browser/extensions/platform_app_browsertest.cc', - 'browser/extensions/platform_app_browsertest_util.cc', - 'browser/extensions/platform_app_browsertest_util.h', 'browser/extensions/plugin_apitest.cc', 'browser/extensions/process_management_browsertest.cc', 'browser/extensions/requirements_checker_browsertest.cc', @@ -1419,9 +1165,7 @@ 'browser/extensions/subscribe_page_action_browsertest.cc', 'browser/extensions/test_extension_dir.cc', 'browser/extensions/test_extension_dir.h', - 'browser/extensions/window_controls_browsertest.cc', 'browser/extensions/web_contents_browsertest.cc', - 'browser/extensions/web_view_browsertest.cc', 'browser/extensions/webstore_startup_installer_browsertest.cc', 'browser/extensions/window_open_apitest.cc', 'browser/external_extension_browsertest.cc', @@ -1440,16 +1184,21 @@ 'browser/importer/importer_unittest_utils.h', 'browser/infobars/infobar_extension_apitest.cc', 'browser/infobars/infobars_browsertest.cc', + 'browser/lifetime/browser_close_manager_browsertest.cc', 'browser/loadtimes_extension_bindings_browsertest.cc', 'browser/locale_tests_browsertest.cc', 'browser/logging_chrome_browsertest.cc', 'browser/managed_mode/managed_mode_browsertest.cc', 'browser/managed_mode/managed_mode_resource_throttle_browsertest.cc', 'browser/managed_mode/managed_user_service_browsertest.cc', + 'browser/media/encrypted_media_browsertest.cc', + 'browser/media/media_browsertest.cc', + 'browser/media/media_browsertest.h', 'browser/media/chrome_media_stream_infobar_browsertest.cc', 'browser/media/chrome_webrtc_browsertest.cc', 'browser/media/chrome_webrtc_audio_quality_browsertest.cc', 'browser/media/chrome_webrtc_video_quality_browsertest.cc', + 'browser/media/encrypted_media_istypesupported_browsertest.cc', 'browser/media/webrtc_browsertest_base.cc', 'browser/media/webrtc_browsertest_base.h', 'browser/media/webrtc_browsertest_common.cc', @@ -1470,7 +1219,6 @@ 'browser/notifications/sync_notifier/notification_bitmap_fetcher_browsertest.cc', 'browser/notifications/sync_notifier/sync_notifier_test_utils.cc', 'browser/notifications/sync_notifier/sync_notifier_test_utils.h', - 'browser/page_cycler/page_cycler_browsertest.cc', 'browser/password_manager/password_manager_browsertest.cc', 'browser/performance_monitor/performance_monitor_browsertest.cc', 'browser/policy/cloud/cloud_policy_browsertest.cc', @@ -1483,8 +1231,6 @@ 'browser/policy/mock_policy_service.h', 'browser/policy/policy_browsertest.cc', 'browser/policy/policy_prefs_browsertest.cc', - 'browser/policy/test_utils.cc', - 'browser/policy/test_utils.h', 'browser/prefs/pref_functional_browsertest.cc', 'browser/prefs/pref_service_browsertest.cc', 'browser/prefs/synced_pref_change_registrar_browsertest.cc', @@ -1495,15 +1241,14 @@ 'browser/printing/print_preview_dialog_controller_browsertest.cc', 'browser/printing/printing_layout_browsertest.cc', 'browser/process_singleton_browsertest.cc', - 'browser/profiles/avatar_menu_model_browsertest.cc', 'browser/profiles/profile_browsertest.cc', + 'browser/profiles/profile_list_desktop_browsertest.cc', 'browser/profiles/profile_manager_browsertest.cc', 'browser/profile_resetter/profile_resetter_browsertest.cc', 'browser/referrer_policy_browsertest.cc', 'browser/renderer_host/render_process_host_chrome_browsertest.cc', 'browser/renderer_host/web_cache_manager_browsertest.cc', 'browser/repost_form_warning_browsertest.cc', - 'browser/rlz/rlz_extension_apitest.cc', 'browser/safe_browsing/local_safebrowsing_test_server.cc', 'browser/safe_browsing/safe_browsing_blocking_page_test.cc', 'browser/safe_browsing/safe_browsing_service_browsertest.cc', @@ -1541,16 +1286,20 @@ 'browser/translate/translate_manager_browsertest.cc', 'browser/ui/app_list/app_list_controller_browsertest.cc', 'browser/ui/app_list/app_list_service_mac_browsertest.mm', - 'browser/ui/app_list/search/webstore_provider_browsertest.cc', + 'browser/ui/app_list/search/people/people_provider_browsertest.cc', + 'browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc', + 'browser/ui/app_list/test/app_list_service_test_api.h', + 'browser/ui/app_list/test/app_list_service_test_api_ash.cc', + 'browser/ui/app_list/test/app_list_service_test_api_ash.h', + 'browser/ui/app_list/test/app_list_service_test_api_mac.mm', + 'browser/ui/app_list/test/app_list_service_test_api_win.cc', 'browser/ui/ash/caps_lock_delegate_chromeos_browsertest.cc', 'browser/ui/ash/chrome_shell_delegate_browsertest.cc', 'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc', - 'browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc', 'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc', 'browser/ui/ash/shelf_browsertest.cc', 'browser/ui/ash/volume_controller_browsertest_chromeos.cc', 'browser/ui/autofill/autofill_dialog_controller_browsertest.cc', - 'browser/ui/autofill/autofill_popup_controller_browsertest.cc', 'browser/ui/blocked_content/popup_blocker_browsertest.cc', 'browser/ui/bookmarks/bookmark_browsertest.cc', 'browser/ui/browser_browsertest.cc', @@ -1561,7 +1310,9 @@ 'browser/ui/browser_navigator_browsertest_chromeos.cc', 'browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm', 'browser/ui/cocoa/applescript/window_applescript_test.mm', - 'browser/ui/cocoa//autofill/autofill_dialog_cocoa_browsertest.mm', + 'browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm', + 'browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm', + 'browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm', 'browser/ui/cocoa/browser_window_cocoa_browsertest.mm', 'browser/ui/cocoa/browser_window_controller_browsertest.mm', 'browser/ui/cocoa/certificate_viewer_mac_browsertest.mm', @@ -1569,7 +1320,7 @@ 'browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm', 'browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm', 'browser/ui/cocoa/dev_tools_controller_browsertest.mm', - 'browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm', + 'browser/ui/cocoa/extensions/extension_action_context_menu_controller_browsertest.mm', 'browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm', 'browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h', 'browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm', @@ -1600,11 +1351,11 @@ 'browser/ui/tab_modal_confirm_dialog_browsertest.h', 'browser/ui/toolbar/test_toolbar_model.cc', 'browser/ui/toolbar/test_toolbar_model.h', - 'browser/ui/views/app_list/app_list_controller_win_browsertest.cc', 'browser/ui/views/avatar_menu_button_browsertest.cc', 'browser/ui/views/browser_actions_container_browsertest.cc', 'browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc', 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc', + 'browser/ui/views/frame/browser_view_browsertest.cc', 'browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc', 'browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc', 'browser/ui/views/select_file_dialog_extension_browsertest.cc', @@ -1616,6 +1367,9 @@ 'browser/ui/webui/chrome_url_data_manager_browsertest.cc', 'browser/ui/webui/constrained_web_dialog_ui_browsertest.cc', 'browser/ui/webui/downloads_dom_handler_browsertest.cc', + 'browser/ui/webui/downloads_ui_browsertest.cc', + 'browser/ui/webui/downloads_ui_browsertest.h', + 'browser/ui/webui/downloads_ui_browsertest.js', 'browser/ui/webui/extensions/chromeos/kiosk_apps_browsertest.js', 'browser/ui/webui/extensions/extension_settings_browsertest.js', 'browser/ui/webui/help/help_browsertest.js', @@ -1656,6 +1410,7 @@ 'browser/ui/webui/options/settings_format_browsertest.js', 'browser/ui/webui/policy_ui_browsertest.cc', 'browser/ui/webui/print_preview/print_preview_ui_browsertest.cc', + 'browser/ui/webui/signin/user_manager_ui_browsertest.cc', 'browser/ui/webui/sync_setup_browsertest.js', 'browser/ui/webui/web_ui_test_handler.cc', 'browser/ui/webui/web_ui_test_handler.h', @@ -1677,6 +1432,7 @@ 'renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc', 'renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc', 'renderer/translate/translate_helper_browsertest.cc', + 'renderer/translate/translate_script_browsertest.cc', 'test/base/chrome_render_view_test.cc', 'test/base/chrome_render_view_test.h', 'test/base/chrome_test_launcher.cc', @@ -1714,6 +1470,7 @@ 'test/data/webui/net_internals/prerender_view.js', 'test/data/webui/net_internals/test_view.js', 'test/data/webui/net_internals/timeline_view.js', + 'test/data/webui/net_internals/waterfall_view.js', 'test/data/webui/ntp4.js', 'test/data/webui/ntp4_browsertest.cc', 'test/data/webui/ntp4_browsertest.h', @@ -1766,6 +1523,11 @@ 'browser/ui/sync/one_click_signin_bubble_links_delegate_browsertest.cc', ] }], + ['enable_autofill_dialog==0', { + 'sources!': [ + 'browser/ui/autofill/autofill_dialog_controller_browsertest.cc', + ] + }], ['disable_nacl==0', { 'sources':[ 'browser/extensions/extension_nacl_browsertest.cc', @@ -1848,6 +1610,8 @@ 'browser/signin/signin_browsertest.cc', # chromeos does not use cross-platform panels 'browser/ui/panels/panel_extension_browsertest.cc', + # chromeos does not use the desktop user manager + 'browser/ui/webui/signin/user_manager_ui_browsertest.cc', ], 'dependencies': [ '../dbus/dbus.gyp:dbus_test_support', @@ -1910,11 +1674,6 @@ 'browser/ui/gtk/view_id_util_browsertest.cc', ], }], - ['enable_rlz==0', { - 'sources!': [ - 'browser/rlz/rlz_extension_apitest.cc', - ], - }], ['enable_webrtc==0', { 'sources!': [ 'browser/media/chrome_webrtc_browsertest.cc', @@ -1936,7 +1695,6 @@ '<(DEPTH)/third_party/wtl/include', ], 'dependencies': [ - 'app_host', 'browser_tests_exe_pdb_workaround', 'chrome_version_resources', 'security_tests', # run time dependency @@ -1955,7 +1713,6 @@ 'browser/chromeos/system/tray_accessibility_browsertest.cc', 'browser/ui/ash/caps_lock_delegate_chromeos_browsertest.cc', 'browser/ui/ash/chrome_shell_delegate_browsertest.cc', - 'browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc', 'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc', 'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc', 'browser/ui/ash/shelf_browsertest.cc', @@ -1989,8 +1746,7 @@ ], # TODO(mark): We really want this for all non-static library # targets, but when we tried to pull it up to the common.gypi - # level, it broke other things like the ui, startup, and - # page_cycler tests. *shrug* + # level, it broke other things like the ui and startup tests. *shrug* 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC', @@ -2027,6 +1783,7 @@ ['OS=="mac" or OS=="win"', { 'sources': [ 'browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc', + 'browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc', ], }], ['os_posix == 0 or chromeos == 1', { @@ -2072,7 +1829,7 @@ }], ['enable_plugins==1', { 'dependencies': [ - # Runtime dependency. + # Runtime dependencies. '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', '../media/media.gyp:clearkeycdmadapter', ], @@ -2091,6 +1848,16 @@ ['exclude', '^test/data/webui/print_preview.js'], ], }], + ['enable_mdns==1', { + 'sources' : [ + 'browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc', + ] + }], + [ 'use_brlapi==0', { + 'sources!': [ + 'browser/extensions/api/braille_display_private/braille_display_private_apitest.cc' + ] + }], ], # conditions }, # target browser_tests { @@ -2106,6 +1873,7 @@ 'chrome_resources.gyp:packed_extra_resources', 'chrome_resources.gyp:packed_resources', 'renderer', + 'test/perf/perf_test.gyp:*', 'test_support_common', '../base/base.gyp:base', '../base/base.gyp:base_i18n', @@ -2116,7 +1884,7 @@ '../sync/sync.gyp:sync', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', - '../third_party/cld/cld.gyp:cld', + '../testing/perf/perf_test.gyp:*', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', @@ -2131,11 +1899,17 @@ 'HAS_OUT_OF_PROC_TEST_RUNNER', ], 'sources': [ + '../components/autofill/content/renderer/test_password_autofill_agent.cc', + '../components/autofill/content/renderer/test_password_autofill_agent.h', 'app/breakpad_mac_stubs.mm', 'app/chrome_command_ids.h', 'app/chrome_dll.rc', 'app/chrome_dll_resource.h', 'app/chrome_version.rc.version', + 'browser/extensions/api/tab_capture/tab_capture_performancetest.cc', + 'browser/extensions/browsertest_util.cc', + 'browser/extensions/extension_apitest.cc', + 'browser/extensions/extension_browsertest.cc', 'test/base/chrome_render_view_test.cc', 'test/base/chrome_render_view_test.h', 'test/base/chrome_test_launcher.cc', @@ -2235,8 +2009,7 @@ ], # TODO(mark): We really want this for all non-static library # targets, but when we tried to pull it up to the common.gypi - # level, it broke other things like the ui, startup, and - # page_cycler tests. *shrug* + # level, it broke other things like the ui and startup tests. *shrug* 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC', @@ -2262,71 +2035,6 @@ ], # conditions }, # target performance_browser_tests { - # To run the tests from page_load_test.cc on Linux, we need to: - # - # a) Run with CHROME_HEADLESS=1 to generate crash dumps. - # b) Strip the binary if it's a debug build. (binary may be over 2GB) - 'target_name': 'reliability_tests', - 'type': 'executable', - 'dependencies': [ - 'browser', - 'chrome', - 'chrome_resources.gyp:theme_resources', - 'test_support_common', - 'test_support_ui', - 'test_support_ui_runner', - '../skia/skia.gyp:skia', - '../testing/gtest.gyp:gtest', - '../third_party/WebKit/public/blink.gyp:blink', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'test/reliability/page_load_test.cc', - ], - 'conditions': [ - ['OS=="win" and buildtype=="Official"', { - 'configurations': { - 'Release': { - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WholeProgramOptimization': 'false', - }, - }, - }, - }, - },], - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '<(allocator_target)', - ], - 'configurations': { - 'Debug': { - 'msvs_settings': { - 'VCLinkerTool': { - 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', - }, - }, - }, - }, - },], - ['toolkit_uses_gtk == 1', { - 'dependencies': [ - '../build/linux/system.gyp:gtk', - ], - },], - ['OS=="linux" and enable_webrtc==1', { - 'dependencies': [ - # TODO(tommi): Figure out why the 32bit lucid builder fails to - # find this dependency for this target (other builders pick it up - # correctly). crbug.com/231068. - '../third_party/libjingle/libjingle.gyp:libpeerconnection', - ], - }], - ], - }, - { 'target_name': 'performance_ui_tests', 'type': 'executable', 'dependencies': [ @@ -2334,11 +2042,13 @@ 'chrome_resources.gyp:chrome_resources', 'chrome_resources.gyp:chrome_strings', 'debugger', + 'test/perf/perf_test.gyp:*', 'test_support_common', 'test_support_ui', '../base/base.gyp:base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', + '../testing/perf/perf_test.gyp:*', ], 'sources': [ # TODO(darin): Move other UIPerfTests here. @@ -2610,6 +2320,7 @@ 'browser', 'chrome', 'common/extensions/api/api.gyp:api', + 'test/perf/perf_test.gyp:*', 'test_support_common', '../skia/skia.gyp:skia', '../sync/sync.gyp:sync', @@ -2809,9 +2520,6 @@ { 'target_name': 'perf_tests', 'type': 'executable', - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', # Needed by key_systems.cc. - ], 'dependencies': [ 'browser', 'chrome_resources.gyp:chrome_resources', @@ -2826,16 +2534,11 @@ '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', '../webkit/support/webkit_support.gyp:glue', - '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', ], 'sources': [ 'test/perf/perftests.cc', 'test/perf/url_parse_perftest.cc', '../content/browser/net/sqlite_persistent_cookie_store_perftest.cc', - - # TODO(boliu): Move this to a separate components_perftest target - # under components/. - '../components/visitedlink/test/visitedlink_perftest.cc', ], 'conditions': [ ['use_x11==1', { @@ -3131,13 +2834,11 @@ 'suppress_wildcard': 1, 'type': 'none', 'dependencies': [ - 'automated_ui_tests', '../base/base.gyp:base_unittests', # browser_tests's use of subprocesses chokes gcov on 10.6? # Disabling for now (enabled on linux/windows below). # 'browser_tests', '../ipc/ipc.gyp:ipc_tests', - '../media/media.gyp:media_unittests', '../net/net.gyp:net_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', @@ -3147,6 +2848,10 @@ '../sync/sync.gyp:sync_unit_tests', ], # 'dependencies' 'conditions': [ + ['OS!="ios"', { + 'dependencies': [ + '../media/media.gyp:media_unittests', + ]}], ['OS=="win"', { 'dependencies': [ # Courgette has not been ported from Windows. @@ -3173,7 +2878,6 @@ 'gpu_tests', 'performance_ui_tests', 'pyautolib', - 'reliability_tests', 'sync_integration_tests', ]}], ['OS=="mac"', { @@ -3269,11 +2973,11 @@ 'dependencies': [ 'chrome_java', 'chromium_testshell_java', + 'chrome_java_test_support', '../base/base.gyp:base', '../base/base.gyp:base_java_test_support', '../content/content.gyp:content_java_test_support', '../sync/sync.gyp:sync_javatests', - '../tools/android/forwarder/forwarder.gyp:forwarder', ], 'variables': { 'apk_name': 'ChromiumTestShellTest', @@ -3304,6 +3008,21 @@ ], 'includes': [ '../build/uiautomator_test.gypi' ], }, + { + 'target_name': 'chrome_java_test_support', + 'type': 'none', + 'variables': { + 'package_name': 'chrome_java_test_support', + 'java_in_dir': '../chrome/test/android/javatests', + }, + 'dependencies': [ + 'chrome_java', + '../content/content.gyp:content_java_test_support', + '../sync/sync.gyp:sync_java', + '../sync/sync.gyp:sync_java_test_support', + ], + 'includes': [ '../build/java.gypi' ], + }, ], }], ['test_isolation_mode != "noop"', { @@ -3372,21 +3091,6 @@ 'targets' : [ { # This target is only depended upon in Windows. - 'target_name': 'automated_ui_tests_exe_pdb_workaround', - 'type': 'static_library', - 'sources': [ 'empty_pdb_workaround.cc' ], - 'msvs_settings': { - 'VCCLCompilerTool': { - # This *in the compile phase* must match the pdb name that's - # output by the final link. See empty_pdb_workaround.cc for - # more details. - 'DebugInformationFormat': '3', - 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/automated_ui_tests.exe.pdb', - }, - }, - }, - { - # This target is only depended upon in Windows. 'target_name': 'browser_tests_exe_pdb_workaround', 'type': 'static_library', 'sources': [ 'empty_pdb_workaround.cc' ], diff --git a/chromium/chrome/chrome_tests_unit.gypi b/chromium/chrome/chrome_tests_unit.gypi index f7394c85850..1b77d80efc1 100644 --- a/chromium/chrome/chrome_tests_unit.gypi +++ b/chromium/chrome/chrome_tests_unit.gypi @@ -21,10 +21,11 @@ '../components/components.gyp:sessions_test_support', '../content/content.gyp:content_app_both', '../content/content.gyp:test_support_content', - '../media/media.gyp:media_test_support', '../net/net.gyp:net', '../net/net.gyp:net_test_support', '../skia/skia.gyp:skia', + '../sql/sql.gyp:sql', + '../sql/sql.gyp:test_support_sql', '../sync/sync.gyp:sync', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -44,6 +45,8 @@ 'browser/android/mock_google_location_settings_helper.cc', 'browser/android/mock_google_location_settings_helper.h', 'browser/android/tab_android_test_stubs.cc', + 'browser/bookmarks/bookmark_test_helpers.cc', + 'browser/bookmarks/bookmark_test_helpers.h', 'browser/browsing_data/mock_browsing_data_appcache_helper.cc', 'browser/browsing_data/mock_browsing_data_appcache_helper.h', 'browser/browsing_data/mock_browsing_data_cookie_helper.cc', @@ -64,14 +67,14 @@ 'browser/browsing_data/mock_browsing_data_server_bound_cert_helper.h', 'browser/chromeos/contacts/contact_test_util.cc', 'browser/chromeos/contacts/contact_test_util.h', - 'browser/chromeos/cros/mock_network_library.cc', - 'browser/chromeos/cros/mock_network_library.h', 'browser/chromeos/input_method/mock_candidate_window_controller.cc', 'browser/chromeos/input_method/mock_candidate_window_controller.h', 'browser/chromeos/input_method/mock_input_method_manager.cc', 'browser/chromeos/input_method/mock_input_method_manager.h', 'browser/chromeos/login/fake_login_utils.cc', 'browser/chromeos/login/fake_login_utils.h', + 'browser/chromeos/login/fake_user_manager.cc', + 'browser/chromeos/login/fake_user_manager.h', 'browser/chromeos/login/mock_authenticator.cc', 'browser/chromeos/login/mock_authenticator.h', 'browser/chromeos/login/mock_login_display.cc', @@ -145,6 +148,8 @@ 'browser/password_manager/password_form_data.h', 'browser/password_manager/test_password_store.cc', 'browser/password_manager/test_password_store.h', + 'browser/policy/cloud/mock_cloud_external_data_manager.cc', + 'browser/policy/cloud/mock_cloud_external_data_manager.h', 'browser/policy/cloud/mock_cloud_policy_client.cc', 'browser/policy/cloud/mock_cloud_policy_client.h', 'browser/policy/cloud/mock_cloud_policy_store.cc', @@ -153,6 +158,8 @@ 'browser/policy/cloud/policy_builder.h', 'browser/policy/mock_configuration_policy_provider.cc', 'browser/policy/mock_configuration_policy_provider.h', + 'browser/policy/policy_test_utils.cc', + 'browser/policy/policy_test_utils.h', 'browser/policy/test/local_policy_test_server.cc', 'browser/policy/test/local_policy_test_server.h', 'browser/prefs/pref_service_mock_builder.cc', @@ -163,6 +170,8 @@ 'browser/search_engines/template_url_service_test_util.h', 'browser/sessions/session_service_test_helper.cc', 'browser/sessions/session_service_test_helper.h', + 'browser/signin/fake_profile_oauth2_token_service.cc', + 'browser/signin/fake_profile_oauth2_token_service.h', 'browser/signin/fake_signin_manager.cc', 'browser/signin/fake_signin_manager.h', 'browser/ssl/ssl_client_auth_requestor_mock.cc', @@ -214,8 +223,6 @@ 'test/automation/value_conversion_util.h', 'test/automation/window_proxy.cc', 'test/automation/window_proxy.h', - 'test/base/bookmark_load_observer.cc', - 'test/base/bookmark_load_observer.h', 'test/base/chrome_render_view_host_test_harness.cc', 'test/base/chrome_render_view_host_test_harness.h', 'test/base/chrome_test_suite.cc', @@ -232,6 +239,8 @@ 'test/base/module_system_test.h', 'test/base/profile_mock.cc', 'test/base/profile_mock.h', + 'test/base/scoped_browser_locale.cc', + 'test/base/scoped_browser_locale.h', 'test/base/scoped_testing_local_state.cc', 'test/base/scoped_testing_local_state.h', 'test/base/test_browser_window.cc', @@ -301,6 +310,7 @@ '../content/content.gyp:content_worker', '../components/components.gyp:autofill_core_test_support', '../ipc/ipc.gyp:test_support_ipc', + '../media/media.gyp:media_test_support', '../ppapi/ppapi_internal.gyp:ppapi_shared', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../webkit/support/webkit_support.gyp:glue_child', @@ -393,8 +403,10 @@ }], ['OS=="win" or OS=="mac"', { 'sources': [ - 'common/media_galleries/pmp_test_helper.cc', - 'common/media_galleries/pmp_test_helper.h', + 'common/media_galleries/picasa_test_util.cc', + 'common/media_galleries/picasa_test_util.cc', + 'common/media_galleries/pmp_test_util.cc', + 'common/media_galleries/pmp_test_util.h', ], }], ['OS=="mac"', { @@ -452,7 +464,6 @@ # 2) test-specific support libraries: '../base/base.gyp:test_support_base', '../content/content.gyp:content_app_both', - '../media/media.gyp:media_test_support', '../net/net.gyp:net', '../net/net.gyp:net_test_support', '../sync/sync.gyp:test_support_sync_api', @@ -484,14 +495,6 @@ 'include_dirs': [ '..', ], - 'defines': [ - 'CLD_WINDOWS', - ], - 'direct_dependent_settings': { - 'defines': [ - 'CLD_WINDOWS', - ], - }, 'msvs_settings': { 'VCLinkerTool': { 'conditions': [ @@ -506,6 +509,9 @@ '../apps/saved_files_service_unittest.cc', '../apps/app_shim/extension_app_shim_handler_mac_unittest.cc', '../apps/shell_window_geometry_cache_unittest.cc', + '../components/autofill/content/renderer/test_password_autofill_agent.cc', + '../components/autofill/content/renderer/test_password_autofill_agent.h', + '../extensions/browser/file_highlighter_unittest.cc', '../extensions/browser/file_reader_unittest.cc', '../extensions/common/event_filter_unittest.cc', '../extensions/common/extension_resource_unittest.cc', @@ -545,8 +551,6 @@ 'browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc', 'browser/bookmarks/bookmark_html_writer_unittest.cc', 'browser/bookmarks/bookmark_index_unittest.cc', - 'browser/bookmarks/bookmark_model_test_utils.cc', - 'browser/bookmarks/bookmark_model_test_utils.h', 'browser/bookmarks/bookmark_model_unittest.cc', 'browser/bookmarks/bookmark_node_data_unittest.cc', 'browser/bookmarks/bookmark_utils_unittest.cc', @@ -575,6 +579,7 @@ 'browser/chromeos/accessibility/magnification_manager_unittest.cc', 'browser/chromeos/attestation/attestation_ca_client_unittest.cc', 'browser/chromeos/attestation/attestation_policy_observer_unittest.cc', + 'browser/chromeos/attestation/platform_verification_flow_unittest.cc', 'browser/chromeos/contacts/contact_database_unittest.cc', 'browser/chromeos/contacts/contact_manager_stub.cc', 'browser/chromeos/contacts/contact_manager_stub.h', @@ -588,15 +593,6 @@ 'browser/chromeos/contacts/gdata_contacts_service_stub.h', 'browser/chromeos/contacts/gdata_contacts_service_unittest.cc', 'browser/chromeos/contacts/google_contact_store_unittest.cc', - 'browser/chromeos/cros/network_constants.h', - 'browser/chromeos/cros/network_library.cc', - 'browser/chromeos/cros/network_library.h', - 'browser/chromeos/cros/network_library_impl_base.cc', - 'browser/chromeos/cros/network_library_impl_base.h', - 'browser/chromeos/cros/network_library_impl_stub.cc', - 'browser/chromeos/cros/network_library_impl_stub.h', - 'browser/chromeos/cros/network_library_unittest.cc', - 'browser/chromeos/cros/network_property_ui_data_unittest.cc', 'browser/chromeos/customization_document_unittest.cc', 'browser/chromeos/dbus/cros_dbus_service_unittest.cc', 'browser/chromeos/dbus/printer_service_provider_unittest.cc', @@ -617,7 +613,6 @@ 'browser/chromeos/drive/fake_file_system_unittest.cc', 'browser/chromeos/drive/fake_free_disk_space_getter.cc', 'browser/chromeos/drive/fake_free_disk_space_getter.h', - 'browser/chromeos/drive/file_cache_metadata_unittest.cc', 'browser/chromeos/drive/file_cache_unittest.cc', 'browser/chromeos/drive/file_change_unittest.cc', 'browser/chromeos/drive/file_system/copy_operation_unittest.cc', @@ -636,7 +631,6 @@ 'browser/chromeos/drive/file_system/update_operation_unittest.cc', 'browser/chromeos/drive/file_system_unittest.cc', 'browser/chromeos/drive/file_system_util_unittest.cc', - 'browser/chromeos/drive/file_write_helper_unittest.cc', 'browser/chromeos/drive/file_write_watcher_unittest.cc', 'browser/chromeos/drive/fileapi_worker_unittest.cc', 'browser/chromeos/drive/job_queue_unittest.cc', @@ -651,10 +645,17 @@ 'browser/chromeos/drive/test_util.cc', 'browser/chromeos/drive/test_util.h', 'browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc', + 'browser/chromeos/drive/write_on_cache_file_unittest.cc', 'browser/chromeos/extensions/default_app_order_unittest.cc', - 'browser/chromeos/extensions/file_manager/desktop_notifications_unittest.cc', - 'browser/chromeos/extensions/file_manager/file_tasks_unittest.cc', - 'browser/chromeos/extensions/file_manager/file_watcher_unittest.cc', + 'browser/chromeos/file_manager/desktop_notifications_unittest.cc', + 'browser/chromeos/file_manager/fake_disk_mount_manager.cc', + 'browser/chromeos/file_manager/fake_disk_mount_manager.h', + 'browser/chromeos/file_manager/file_tasks_unittest.cc', + 'browser/chromeos/file_manager/file_watcher_unittest.cc', + 'browser/chromeos/file_manager/mime_util_unittest.cc', + 'browser/chromeos/file_manager/mounted_disk_monitor_unittest.cc', + 'browser/chromeos/file_manager/url_util_unittest.cc', + 'browser/chromeos/file_manager/volume_manager_unittest.cc', 'browser/chromeos/extensions/wallpaper_private_api_unittest.cc', 'browser/chromeos/external_metrics_unittest.cc', 'browser/chromeos/fileapi/file_access_permissions_unittest.cc', @@ -664,7 +665,6 @@ 'browser/chromeos/input_method/browser_state_monitor_unittest.cc', 'browser/chromeos/input_method/candidate_window_controller_impl_unittest.cc', 'browser/chromeos/input_method/candidate_window_view_unittest.cc', - 'browser/chromeos/input_method/ibus_controller_base_unittest.cc', 'browser/chromeos/input_method/ibus_controller_impl_unittest.cc', 'browser/chromeos/input_method/ibus_controller_unittest.cc', 'browser/chromeos/input_method/input_method_configuration_unittest.cc', @@ -674,13 +674,13 @@ 'browser/chromeos/keyboard_driven_event_rewriter_unittest.cc', 'browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc', 'browser/chromeos/kiosk_mode/kiosk_mode_settings_unittest.cc', - 'browser/chromeos/language_preferences_unittest.cc', 'browser/chromeos/login/default_pinned_apps_field_trial_unittest.cc', 'browser/chromeos/login/existing_user_controller_auto_login_unittest.cc', 'browser/chromeos/login/hwid_checker_unittest.cc', 'browser/chromeos/login/merge_session_load_page_unittest.cc', 'browser/chromeos/login/mock_auth_attempt_state_resolver.cc', 'browser/chromeos/login/mock_auth_attempt_state_resolver.h', + 'browser/chromeos/login/multi_profile_user_controller_unittest.cc', 'browser/chromeos/login/online_attempt_unittest.cc', 'browser/chromeos/login/parallel_authenticator_unittest.cc', 'browser/chromeos/login/screens/screen_context_unittest.cc', @@ -692,20 +692,24 @@ 'browser/chromeos/net/network_portal_detector_impl_unittest.cc', 'browser/chromeos/net/onc_utils_unittest.cc', 'browser/chromeos/offline/offline_load_page_unittest.cc', + 'browser/chromeos/options/network_property_ui_data_unittest.cc', 'browser/chromeos/policy/auto_enrollment_client_unittest.cc', + 'browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc', + 'browser/chromeos/policy/cloud_external_data_store_unittest.cc', 'browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc', 'browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc', 'browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc', 'browser/chromeos/policy/device_local_account_policy_service_unittest.cc', 'browser/chromeos/policy/enterprise_install_attributes_unittest.cc', 'browser/chromeos/policy/login_screen_power_management_policy_unittest.cc', - 'browser/chromeos/policy/network_configuration_updater_impl_cros_unittest.cc', + 'browser/chromeos/policy/network_configuration_updater_unittest.cc', 'browser/chromeos/policy/proxy_policy_provider_unittest.cc', 'browser/chromeos/policy/recommendation_restorer_unittest.cc', 'browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc', 'browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc', 'browser/chromeos/power/power_prefs_unittest.cc', 'browser/chromeos/preferences_unittest.cc', + 'browser/chromeos/profiles/profile_list_chromeos_unittest.cc', 'browser/chromeos/session_length_limiter_unittest.cc', 'browser/chromeos/proxy_config_service_impl_unittest.cc', 'browser/chromeos/settings/cros_settings_unittest.cc', @@ -746,19 +750,19 @@ 'browser/custom_handlers/protocol_handler_registry_unittest.cc', 'browser/diagnostics/diagnostics_model_unittest.cc', 'browser/diagnostics/diagnostics_controller_unittest.cc', - 'browser/download/chrome_download_manager_delegate_unittest.cc', - 'browser/download/download_item_model_unittest.cc', 'browser/download/all_download_item_notifier_unittest.cc', + 'browser/download/chrome_download_manager_delegate_unittest.cc', + 'browser/download/download_field_trial_unittest.cc', 'browser/download/download_history_unittest.cc', + 'browser/download/download_item_model_unittest.cc', + 'browser/download/download_path_reservation_tracker_unittest.cc', 'browser/download/download_query_unittest.cc', 'browser/download/download_request_infobar_delegate_unittest.cc', 'browser/download/download_request_limiter_unittest.cc', - 'browser/download/download_path_reservation_tracker_unittest.cc', 'browser/download/download_shelf_unittest.cc', 'browser/download/download_status_updater_unittest.cc', 'browser/download/download_target_determiner_unittest.cc', 'browser/download/download_ui_controller_unittest.cc', - 'browser/download/download_util_unittest.cc', 'browser/drive/drive_api_util_unittest.cc', 'browser/drive/drive_uploader_unittest.cc', 'browser/drive/event_logger_unittest.cc', @@ -766,11 +770,13 @@ 'browser/enumerate_modules_model_unittest_win.cc', 'browser/extensions/active_tab_unittest.cc', 'browser/extensions/activity_log/activity_database_unittest.cc', + 'browser/extensions/activity_log/activity_log_enabled_unittest.cc', 'browser/extensions/activity_log/activity_log_unittest.cc', 'browser/extensions/activity_log/activity_log_policy_unittest.cc', 'browser/extensions/activity_log/counting_policy_unittest.cc', 'browser/extensions/activity_log/database_string_table_unittest.cc', 'browser/extensions/activity_log/fullstream_ui_policy_unittest.cc', + 'browser/extensions/activity_log/uma_policy_unittest.cc', 'browser/extensions/admin_policy_unittest.cc', 'browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc', 'browser/extensions/api/alarms/alarms_api_unittest.cc', @@ -807,6 +813,8 @@ 'browser/extensions/api/log_private/syslog_parser_unittest.cc', 'browser/extensions/api/messaging/native_message_process_host_unittest.cc', 'browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc', + 'browser/extensions/api/mdns/dns_sd_registry_unittest.cc', + 'browser/extensions/api/networking_private/networking_private_crypto_unittest.cc', 'browser/extensions/api/omnibox/omnibox_unittest.cc', 'browser/extensions/api/permissions/permissions_api_helpers_unittest.cc', 'browser/extensions/api/power/power_api_unittest.cc', @@ -815,11 +823,13 @@ 'browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher_unittest.cc', 'browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc', 'browser/extensions/api/serial/serial_port_enumerator_unittest.cc', - 'browser/extensions/api/signedin_devices/id_mapping_helper_unittest.cc', - 'browser/extensions/api/signedin_devices/signedin_devices_api_unittest.cc', + 'browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc', + 'browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc', + 'browser/extensions/api/signed_in_devices/signed_in_devices_manager_unittest.cc', 'browser/extensions/api/socket/socket_api_unittest.cc', 'browser/extensions/api/socket/tcp_socket_unittest.cc', 'browser/extensions/api/socket/udp_socket_unittest.cc', + 'browser/extensions/api/sockets_udp/sockets_udp_api_unittest.cc', 'browser/extensions/api/storage/policy_value_store_unittest.cc', 'browser/extensions/api/storage/settings_frontend_unittest.cc', 'browser/extensions/api/storage/settings_quota_unittest.cc', @@ -933,17 +943,19 @@ 'browser/history/shortcuts_database_unittest.cc', 'browser/history/snippet_unittest.cc', 'browser/history/thumbnail_database_unittest.cc', + 'browser/history/top_sites_cache_unittest.cc', 'browser/history/top_sites_database_unittest.cc', 'browser/history/top_sites_impl_unittest.cc', - 'browser/history/top_sites_likely_impl_unittest.cc', 'browser/history/typed_url_syncable_service_unittest.cc', 'browser/history/url_database_unittest.cc', + 'browser/history/url_utils_unittest.cc', 'browser/history/visit_database_unittest.cc', 'browser/history/visit_filter_unittest.cc', 'browser/history/visit_tracker_unittest.cc', 'browser/importer/firefox_profile_lock_unittest.cc', 'browser/importer/profile_writer_unittest.cc', 'browser/internal_auth_unittest.cc', + 'browser/install_module_verifier_unittest_win.cc', 'browser/invalidation/invalidation_service_android_unittest.cc', 'browser/invalidation/invalidation_service_test_template.cc', 'browser/invalidation/invalidation_service_test_template.h', @@ -953,12 +965,17 @@ 'browser/local_discovery/privet_confirm_api_flow_unittest.cc', 'browser/local_discovery/privet_http_unittest.cc', 'browser/local_discovery/privet_url_fetcher_unittest.cc', + 'browser/local_discovery/cloud_print_account_manager_unittest.cc', + 'browser/local_discovery/cloud_print_printer_list_unittest.cc', + 'browser/local_discovery/service_discovery_client_mac_unittest.mm', 'browser/mac/keystone_glue_unittest.mm', 'browser/managed_mode/managed_mode_url_filter_unittest.cc', 'browser/managed_mode/managed_user_service_unittest.cc', 'browser/managed_mode/managed_user_sync_service_unittest.cc', 'browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc', 'browser/managed_mode/managed_user_registration_utility_unittest.cc', + 'browser/managed_mode/managed_user_settings_service_unittest.cc', + 'browser/managed_mode/supervised_user_pref_store_unittest.cc', 'browser/media/desktop_media_picker_model_unittest.cc', 'browser/media/webrtc_log_uploader_unittest.cc', 'browser/media_galleries/fileapi/native_media_file_util_unittest.cc', @@ -979,14 +996,15 @@ 'browser/metrics/thread_watcher_unittest.cc', 'browser/metrics/time_ticks_experiment_unittest.cc', 'browser/metrics/variations/variations_http_header_provider_unittest.cc', - 'browser/metrics/variations/variations_seed_processor_unittest.cc', 'browser/metrics/variations/variations_service_unittest.cc', 'browser/metrics/variations/variations_request_scheduler_unittest.cc', 'browser/nacl_host/nacl_file_host_unittest.cc', + 'browser/nacl_host/nacl_process_host_unittest.cc', 'browser/nacl_host/nacl_validation_cache_unittest.cc', 'browser/nacl_host/pnacl_translation_cache_unittest.cc', 'browser/nacl_host/pnacl_host_unittest.cc', 'browser/net/chrome_fraudulent_certificate_reporter_unittest.cc', + 'browser/net/chrome_network_data_saving_metrics_unittest.cc', 'browser/net/chrome_network_delegate_unittest.cc', 'browser/net/connection_tester_unittest.cc', 'browser/net/dns_probe_runner_unittest.cc', @@ -1008,6 +1026,7 @@ 'browser/net/ssl_config_service_manager_pref_unittest.cc', 'browser/net/transport_security_persister_unittest.cc', 'browser/net/url_info_unittest.cc', + 'browser/network_time/navigation_time_helper_unittest.cc', 'browser/notifications/desktop_notification_service_unittest.cc', 'browser/notifications/message_center_notifications_unittest_win.cc', 'browser/notifications/message_center_settings_controller_unittest.cc', @@ -1016,13 +1035,13 @@ 'browser/notifications/sync_notifier/sync_notifier_test_utils.cc', 'browser/notifications/sync_notifier/sync_notifier_test_utils.h', 'browser/omnibox/omnibox_field_trial_unittest.cc', - 'browser/page_cycler/page_cycler_unittest.cc', 'browser/parsers/metadata_parser_filebase_unittest.cc', 'browser/password_manager/login_database_unittest.cc', 'browser/password_manager/native_backend_gnome_x_unittest.cc', 'browser/password_manager/native_backend_kwallet_x_unittest.cc', 'browser/password_manager/password_form_manager_unittest.cc', 'browser/password_manager/password_generation_manager_unittest.cc', + 'browser/password_manager/password_manager_metrics_util_unittest.cc', 'browser/password_manager/password_manager_unittest.cc', 'browser/password_manager/password_store_unittest.cc', 'browser/password_manager/password_store_default_unittest.cc', @@ -1035,8 +1054,6 @@ 'browser/plugins/plugin_prefs_unittest.cc', 'browser/policy/async_policy_provider_unittest.cc', 'browser/policy/browser_policy_connector_unittest.cc', - 'browser/policy/cloud/cloud_external_data_manager_base_unittest.cc', - 'browser/policy/cloud/cloud_external_data_store_unittest.cc', 'browser/policy/cloud/cloud_policy_client_unittest.cc', 'browser/policy/cloud/cloud_policy_core_unittest.cc', 'browser/policy/cloud/cloud_policy_invalidator_unittest.cc', @@ -1048,6 +1065,7 @@ 'browser/policy/cloud/component_cloud_policy_store_unittest.cc', 'browser/policy/cloud/component_cloud_policy_updater_unittest.cc', 'browser/policy/cloud/device_management_service_unittest.cc', + 'browser/policy/cloud/external_policy_data_fetcher_unittest.cc', 'browser/policy/cloud/external_policy_data_updater_unittest.cc', 'browser/policy/cloud/mock_device_management_service.cc', 'browser/policy/cloud/mock_device_management_service.h', @@ -1061,10 +1079,10 @@ 'browser/policy/cloud/user_policy_signin_service_unittest.cc', 'browser/policy/config_dir_policy_loader_unittest.cc', 'browser/policy/configuration_policy_handler_unittest.cc', + 'browser/policy/configuration_policy_handler_list_unittest.cc', 'browser/policy/configuration_policy_pref_store_unittest.cc', 'browser/policy/configuration_policy_provider_test.cc', 'browser/policy/configuration_policy_provider_test.h', - 'browser/policy/managed_mode_policy_provider_unittest.cc', 'browser/policy/mock_policy_service.cc', 'browser/policy/mock_policy_service.h', 'browser/policy/policy_bundle_unittest.cc', @@ -1110,7 +1128,6 @@ 'browser/process_singleton_linux_unittest.cc', 'browser/process_singleton_mac_unittest.cc', 'browser/profile_resetter/profile_resetter_unittest.cc', - 'browser/profiles/avatar_menu_model_unittest.cc', 'browser/profiles/file_path_verifier_win_unittest.cc', 'browser/profiles/gaia_info_update_service_unittest.cc', 'browser/profiles/off_the_record_profile_impl_unittest.cc', @@ -1118,16 +1135,21 @@ 'browser/profiles/profile_info_cache_unittest.cc', 'browser/profiles/profile_info_cache_unittest.h', 'browser/profiles/profile_info_util_unittest.cc', + 'browser/profiles/profile_list_desktop_unittest.cc', 'browser/profiles/profile_loader_unittest.cc', 'browser/profiles/profile_manager_unittest.cc', 'browser/profiles/profile_shortcut_manager_unittest_win.cc', 'browser/renderer_host/plugin_info_message_filter_unittest.cc', 'browser/renderer_host/web_cache_manager_unittest.cc', 'browser/resources/google_now/background.js', - 'browser/resources/google_now/cards.js', 'browser/resources/google_now/background_test_util.js', 'browser/resources/google_now/background_unittest.gtestjs', + 'browser/resources/google_now/cards.js', 'browser/resources/google_now/cards_unittest.gtestjs', + 'browser/resources/google_now/common_test_util.js', + 'browser/resources/google_now/utility.js', + 'browser/resources/google_now/utility_test_util.js', + 'browser/resources/google_now/utility_unittest.gtestjs', 'browser/resources/print_preview/data/measurement_system.js', 'browser/resources/print_preview/data/measurement_system_unittest.gtestjs', 'browser/resources/print_preview/print_preview_utils.js', @@ -1138,6 +1160,7 @@ 'browser/safe_browsing/chunk_range_unittest.cc', 'browser/safe_browsing/client_side_detection_host_unittest.cc', 'browser/safe_browsing/client_side_detection_service_unittest.cc', + 'browser/safe_browsing/database_manager_unittest.cc', 'browser/safe_browsing/download_feedback_service_unittest.cc', 'browser/safe_browsing/download_feedback_unittest.cc', 'browser/safe_browsing/download_protection_service_unittest.cc', @@ -1171,13 +1194,10 @@ 'browser/sessions/session_backend_unittest.cc', 'browser/sessions/session_service_unittest.cc', 'browser/sessions/session_types_unittest.cc', - 'browser/shell_integration_unittest.cc', + 'browser/shell_integration_linux_unittest.cc', 'browser/shell_integration_win_unittest.cc', 'browser/signin/fake_auth_status_provider.cc', 'browser/signin/fake_auth_status_provider.h', - 'browser/signin/oauth2_token_service_test_util.cc', - 'browser/signin/oauth2_token_service_test_util.h', - 'browser/signin/oauth2_token_service_unittest.cc', 'browser/signin/profile_oauth2_token_service_request_unittest.cc', 'browser/signin/profile_oauth2_token_service_unittest.cc', 'browser/signin/signin_global_error_unittest.cc', @@ -1202,6 +1222,7 @@ 'browser/spellchecker/spellcheck_service_unittest.cc', 'browser/spellchecker/spelling_service_client_unittest.cc', 'browser/spellchecker/word_trimmer_unittest.cc', + 'browser/status_icons/status_icon_menu_model_unittest.cc', 'browser/status_icons/status_icon_unittest.cc', 'browser/status_icons/status_tray_unittest.cc', 'browser/storage_monitor/image_capture_device_manager_unittest.mm', @@ -1283,6 +1304,7 @@ 'browser/sync/profile_sync_service_unittest.cc', 'browser/sync/profile_sync_test_util.cc', 'browser/sync/profile_sync_test_util.h', + 'browser/sync/sessions2/tab_node_pool2_unittest.cc', 'browser/sync/sync_global_error_unittest.cc', 'browser/sync/sync_prefs_unittest.cc', 'browser/sync/sync_startup_tracker_unittest.cc', @@ -1291,20 +1313,26 @@ 'browser/sync/test/test_http_bridge_factory.h', 'browser/sync/test_profile_sync_service.cc', 'browser/sync/test_profile_sync_service.h', - 'browser/sync_file_system/drive_backend/api_util_unittest.cc', - 'browser/sync_file_system/drive_backend/drive_file_sync_service_fake_unittest.cc', - 'browser/sync_file_system/drive_backend/drive_file_sync_service_sync_unittest.cc', - 'browser/sync_file_system/drive_backend/drive_file_sync_service_unittest.cc', - 'browser/sync_file_system/drive_backend/drive_metadata_store_unittest.cc', - 'browser/sync_file_system/drive_backend/fake_api_util.cc', - 'browser/sync_file_system/drive_backend/fake_api_util.h', - 'browser/sync_file_system/drive_backend/fake_api_util_unittest.cc', - 'browser/sync_file_system/drive_backend/fake_drive_service_helper.cc', - 'browser/sync_file_system/drive_backend/fake_drive_service_helper.h', - 'browser/sync_file_system/drive_backend/local_sync_operation_resolver_unittest.cc', 'browser/sync_file_system/drive_backend/metadata_database_unittest.cc', 'browser/sync_file_system/drive_backend/metadata_db_migration_util_unittest.cc', - 'browser/sync_file_system/drive_backend/remote_sync_operation_resolver_unittest.cc', + 'browser/sync_file_system/drive_backend_v1/api_util_unittest.cc', + 'browser/sync_file_system/drive_backend_v1/drive_file_sync_service_fake_unittest.cc', + 'browser/sync_file_system/drive_backend_v1/drive_file_sync_service_sync_unittest.cc', + 'browser/sync_file_system/drive_backend_v1/drive_file_sync_service_unittest.cc', + 'browser/sync_file_system/drive_backend_v1/drive_metadata_store_unittest.cc', + 'browser/sync_file_system/drive_backend_v1/fake_api_util.cc', + 'browser/sync_file_system/drive_backend_v1/fake_api_util.h', + 'browser/sync_file_system/drive_backend_v1/fake_api_util_unittest.cc', + 'browser/sync_file_system/drive_backend_v1/fake_drive_service_helper.cc', + 'browser/sync_file_system/drive_backend_v1/fake_drive_service_helper.h', + 'browser/sync_file_system/drive_backend_v1/local_sync_operation_resolver_unittest.cc', + 'browser/sync_file_system/drive_backend_v1/origin_operation_queue_unittest.cc', + 'browser/sync_file_system/drive_backend_v1/remote_sync_operation_resolver_unittest.cc', + 'browser/sync_file_system/drive_backend/drive_backend_test_util.cc', + 'browser/sync_file_system/drive_backend/drive_backend_test_util.h', + 'browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc', + 'browser/sync_file_system/drive_backend/drive_backend_test_util.cc', + 'browser/sync_file_system/drive_backend/drive_backend_test_util.h', 'browser/sync_file_system/fake_remote_change_processor.cc', 'browser/sync_file_system/fake_remote_change_processor.h', 'browser/sync_file_system/file_change_unittest.cc', @@ -1334,6 +1362,7 @@ 'browser/tab_contents/render_view_context_menu_test_util.h', 'browser/tab_contents/render_view_context_menu_unittest.cc', 'browser/task_manager/task_manager_unittest.cc', + 'browser/task_manager/task_manager_util_unittest.cc', 'browser/task_profiler/task_profiler_data_serializer_unittest.cc', 'browser/themes/browser_theme_pack_unittest.cc', 'browser/themes/theme_properties_unittest.cc', @@ -1347,17 +1376,15 @@ 'browser/translate/translate_browser_metrics_unittest.cc', 'browser/translate/translate_manager_unittest.cc', 'browser/translate/translate_prefs_unittest.cc', + 'browser/translate/translate_script_unittest.cc', 'browser/ui/android/tab_model/tab_model_unittest.cc', 'browser/ui/ash/event_rewriter_unittest.cc', 'browser/ui/ash/ime_controller_chromeos_unittest.cc', - 'browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc', - 'browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc', - 'browser/ui/ash/launcher/chrome_launcher_controller_per_browser_unittest.cc', + 'browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc', 'browser/ui/ash/launcher/launcher_context_menu_unittest.cc', 'browser/ui/ash/screenshot_taker_unittest.cc', 'browser/ui/ash/window_positioner_unittest.cc', 'browser/ui/autofill/account_chooser_model_unittest.cc', - 'browser/ui/autofill/autocheckout_bubble_controller_unittest.cc', 'browser/ui/autofill/autofill_dialog_controller_unittest.cc', 'browser/ui/autofill/autofill_dialog_models_unittest.cc', 'browser/ui/autofill/autofill_dialog_types_unittest.cc', @@ -1398,6 +1425,7 @@ 'browser/ui/cocoa/autofill/autofill_main_container_unittest.mm', 'browser/ui/cocoa/autofill/autofill_notification_container_unittest.mm', 'browser/ui/cocoa/autofill/autofill_notification_controller_unittest.mm', + 'browser/ui/cocoa/autofill/autofill_overlay_controller_unittest.mm', 'browser/ui/cocoa/autofill/autofill_pop_up_button_unittest.mm', 'browser/ui/cocoa/autofill/autofill_textfield_unittest.mm', 'browser/ui/cocoa/autofill/autofill_section_container_unittest.mm', @@ -1498,6 +1526,8 @@ 'browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm', 'browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm', 'browser/ui/cocoa/infobars/infobar_gradient_view_unittest.mm', + 'browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc', + 'browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h', 'browser/ui/cocoa/infobars/translate_infobar_unittest.mm', 'browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm', 'browser/ui/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm', @@ -1507,8 +1537,8 @@ 'browser/ui/cocoa/location_bar/image_decoration_unittest.mm', 'browser/ui/cocoa/location_bar/keyword_hint_decoration_unittest.mm', 'browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm', + 'browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm', 'browser/ui/cocoa/menu_button_unittest.mm', - 'browser/ui/cocoa/nine_part_button_cell_unittest.mm', 'browser/ui/cocoa/notifications/balloon_controller_unittest.mm', 'browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm', 'browser/ui/cocoa/nsmenuitem_additions_unittest.mm', @@ -1532,7 +1562,6 @@ 'browser/ui/cocoa/tab_contents/sad_tab_view_unittest.mm', 'browser/ui/cocoa/table_row_nsimage_cache_unittest.mm', 'browser/ui/cocoa/tabpose_window_unittest.mm', - 'browser/ui/cocoa/tabs/tab_audio_indicator_view_mac_unittest.mm', 'browser/ui/cocoa/tabs/tab_controller_unittest.mm', 'browser/ui/cocoa/tabs/tab_projecting_image_view_unittest.mm', 'browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm', @@ -1584,7 +1613,10 @@ 'browser/ui/search/instant_ntp_prerenderer_unittest.cc', 'browser/ui/search/instant_page_unittest.cc', 'browser/ui/search/search_delegate_unittest.cc', + 'browser/ui/search/search_ipc_router_policy_unittest.cc', + 'browser/ui/search/search_ipc_router_unittest.cc', 'browser/ui/search/search_model_unittest.cc', + 'browser/ui/search/search_tab_helper_unittest.cc', 'browser/ui/startup/session_crashed_infobar_delegate_unittest.cc', 'browser/ui/sync/one_click_signin_helper_unittest.cc', 'browser/ui/sync/one_click_signin_sync_starter_unittest.cc', @@ -1595,7 +1627,6 @@ 'browser/ui/tabs/pinned_tab_codec_unittest.cc', 'browser/ui/tabs/pinned_tab_service_unittest.cc', 'browser/ui/tabs/pinned_tab_test_utils.cc', - 'browser/ui/tabs/tab_audio_indicator_unittest.cc', 'browser/ui/tabs/tab_menu_model_unittest.cc', 'browser/ui/tabs/tab_strip_model_unittest.cc', 'browser/ui/tabs/test_tab_strip_model_delegate.cc', @@ -1623,12 +1654,14 @@ 'browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc', 'browser/ui/views/bookmarks/bookmark_sync_promo_view_unittest.cc', 'browser/ui/views/confirm_bubble_views_unittest.cc', + 'browser/ui/views/constrained_window_views_unittest.cc', 'browser/ui/views/crypto_module_password_dialog_view_unittest.cc', 'browser/ui/views/extensions/browser_action_drag_data_unittest.cc', 'browser/ui/views/first_run_bubble_unittest.cc', 'browser/ui/views/frame/browser_view_layout_unittest.cc', 'browser/ui/views/frame/browser_view_unittest.cc', 'browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc', + 'browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc', 'browser/ui/views/reload_button_unittest.cc', 'browser/ui/views/select_file_dialog_extension_unittest.cc', 'browser/ui/views/status_icons/status_tray_win_unittest.cc', @@ -1643,6 +1676,7 @@ 'browser/ui/webui/fileicon_source_unittest.cc', 'browser/ui/webui/history_ui_unittest.cc', 'browser/ui/webui/ntp/android/partner_bookmarks_shim_unittest.cc', + 'browser/ui/webui/ntp/ntp_user_data_logger_unittest.cc', 'browser/ui/webui/ntp/suggestions_combiner_unittest.cc', 'browser/ui/webui/options/chromeos/cros_language_options_handler_unittest.cc', 'browser/ui/webui/options/language_options_handler_unittest.cc', @@ -1660,6 +1694,7 @@ 'browser/ui/zoom/zoom_controller_unittest.cc', 'browser/upload_list_unittest.cc', 'browser/chrome_content_browser_client_unittest.cc', + 'browser/undo/bookmark_undo_service_test.cc', 'browser/undo/undo_manager_test.cc', 'browser/usb/usb_context_unittest.cc', 'browser/user_style_sheet_watcher_unittest.cc', @@ -1682,7 +1717,6 @@ 'browser/webdata/token_service_table_unittest.cc', 'browser/webdata/web_apps_table_unittest.cc', 'common/cancelable_task_tracker_unittest.cc', - 'common/child_process_logging_mac_unittest.mm', 'common/chrome_paths_unittest.cc', 'common/cloud_print/cloud_print_helpers_unittest.cc', 'common/chrome_content_client_unittest.cc', @@ -1757,9 +1791,6 @@ 'common/favicon/favicon_url_parser_unittest.cc', 'common/importer/firefox_importer_utils_unittest.cc', 'common/instant_restricted_id_cache_unittest.cc', - 'common/json_schema/json_schema_validator_unittest.cc', - 'common/json_schema/json_schema_validator_unittest_base.cc', - 'common/json_schema/json_schema_validator_unittest_base.h', 'common/mac/cfbundle_blocker_unittest.mm', 'common/mac/mock_launchd.cc', 'common/mac/mock_launchd.h', @@ -1767,17 +1798,13 @@ 'common/mac/objc_method_swizzle_unittest.mm', 'common/mac/objc_zombie_unittest.mm', 'common/metrics/caching_permuted_entropy_provider_unittest.cc', - 'common/metrics/entropy_provider_unittest.cc', 'common/metrics/metrics_log_base_unittest.cc', 'common/metrics/metrics_log_manager_unittest.cc', - 'common/metrics/metrics_util_unittest.cc', - 'common/metrics/variations/variations_associated_data_unittest.cc', 'common/metrics/variations/variations_util_unittest.cc', 'common/multi_process_lock_unittest.cc', 'common/net/url_fixer_upper_unittest.cc', 'common/net/x509_certificate_model_unittest.cc', 'common/partial_circular_buffer_unittest.cc', - 'common/policy/policy_schema_unittest.cc', 'common/pref_names_util_unittest.cc', 'common/service_process_util_unittest.cc', 'common/switch_utils_unittest.cc', @@ -1793,6 +1820,7 @@ 'renderer/extensions/event_unittest.cc', 'renderer/extensions/extension_localization_peer_unittest.cc', 'renderer/extensions/json_schema_unittest.cc', + 'renderer/extensions/messaging_utils_unittest.cc', 'renderer/extensions/module_system_unittest.cc', 'renderer/extensions/renderer_permissions_policy_delegate_unittest.cc', 'renderer/extensions/safe_builtins_unittest.cc', @@ -1849,9 +1877,6 @@ # TODO(joi): Move to //components/components_tests.gypi once # remaining dependencies back to //chrome are eliminated. - '../components/autofill/content/browser/autocheckout/whitelist_manager_unittest.cc', - '../components/autofill/content/browser/autocheckout_manager_unittest.cc', - '../components/autofill/content/browser/autocheckout_page_meta_data_unittest.cc', '../components/autofill/content/browser/autofill_driver_impl_unittest.cc', '../components/autofill/content/browser/wallet/full_wallet_unittest.cc', '../components/autofill/content/browser/wallet/instrument_unittest.cc', @@ -1922,6 +1947,9 @@ '../google_apis/gaia/oauth2_access_token_fetcher_unittest.cc', '../google_apis/gaia/oauth2_api_call_flow_unittest.cc', '../google_apis/gaia/oauth2_mint_token_flow_unittest.cc', + '../google_apis/gaia/oauth2_token_service_test_util.cc', + '../google_apis/gaia/oauth2_token_service_test_util.h', + '../google_apis/gaia/oauth2_token_service_unittest.cc', '../skia/ext/analysis_canvas_unittest.cc', '../skia/ext/bitmap_platform_device_mac_unittest.cc', '../skia/ext/convolver_unittest.cc', @@ -1934,7 +1962,6 @@ '../skia/ext/skia_utils_mac_unittest.mm', '../skia/ext/vector_canvas_unittest.cc', '../testing/gtest_mac_unittest.mm', - '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc', '../third_party/zlib/google/zip_reader_unittest.cc', '../third_party/zlib/google/zip_unittest.cc', '../tools/json_schema_compiler/test/additional_properties_unittest.cc', @@ -1970,8 +1997,8 @@ '../components/component_strings.gyp:component_strings', '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks', '../gpu/gpu.gyp:gpu_unittest_utils', + '../media/media.gyp:media_test_support', '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared', - '../third_party/cld/cld.gyp:cld', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', @@ -2044,6 +2071,7 @@ ['disable_nacl==1', { 'sources!':[ 'browser/nacl_host/nacl_file_host_unittest.cc', + 'browser/nacl_host/nacl_process_host_unittest.cc', 'browser/nacl_host/nacl_validation_cache_unittest.cc', 'browser/nacl_host/pnacl_host_unittest.cc', 'browser/nacl_host/pnacl_translation_cache_unittest.cc', @@ -2058,6 +2086,7 @@ ['exclude', '^../extensions/'], ['exclude', '^browser/extensions/activity_log/'], ['exclude', '^browser/extensions/api/'], + ['exclude', '^browser/extensions/error_console/'], ['exclude', '^browser/sync/glue/extensions_activity_monitor_unittest.cc'], ['exclude', '^common/extensions/api/'], ['exclude', '^common/extensions/manifest_handlers/'], @@ -2132,6 +2161,7 @@ 'utility/local_discovery/local_domain_resolver_unittest.cc', 'utility/local_discovery/service_discovery_client_unittest.cc', 'browser/local_discovery/privet_device_lister_unittest.cc', + 'browser/local_discovery/privet_notifications_unittest.cc' ] }], ['configuration_policy==0', { @@ -2168,7 +2198,6 @@ ['enable_autofill_dialog!=1 or OS=="android"', { 'sources!': [ 'browser/ui/autofill/account_chooser_model_unittest.cc', - 'browser/ui/autofill/autocheckout_bubble_controller_unittest.cc', 'browser/ui/autofill/autofill_credit_card_bubble_controller_unittest.cc', 'browser/ui/autofill/autofill_dialog_controller_unittest.cc', 'browser/ui/autofill/mock_autofill_dialog_view_delegate.cc', @@ -2222,15 +2251,14 @@ 'browser/policy/cloud/user_cloud_policy_manager_unittest.cc', 'browser/policy/cloud/user_cloud_policy_store_unittest.cc', 'browser/policy/cloud/user_policy_signin_service_unittest.cc', + 'browser/profiles/profile_list_desktop_unittest.cc', 'browser/safe_browsing/download_protection_service_unittest.cc', + 'browser/shell_integration_linux_unittest.cc', 'browser/signin/signin_manager_unittest.cc', 'browser/storage_monitor/storage_monitor_linux_unittest.cc', 'browser/ui/sync/one_click_signin_helper_unittest.cc', 'browser/ui/sync/one_click_signin_sync_starter_unittest.cc', ], - 'sources': [ - 'browser/ui/webui/feedback_ui_unittest.cc', - ], }, { # else: chromeos == 0 'sources/': [ ['exclude', '^browser/chromeos/'], @@ -2348,7 +2376,7 @@ ], # TODO(mark): We really want this for all non-static library targets, # but when we tried to pull it up to the common.gypi level, it broke - # other things like the ui, startup, and page_cycler tests. *shrug* + # other things like the ui and startup tests. *shrug* 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, }], ['OS!="mac" and OS!="ios"', { @@ -2367,7 +2395,7 @@ ['OS=="win" or OS=="mac"', { 'sources': [ 'browser/media_galleries/fileapi/itunes_file_util_unittest.cc', - 'browser/media_galleries/fileapi/picasa/picasa_file_util_unittest.cc', + 'browser/media_galleries/fileapi/picasa_file_util_unittest.cc', 'utility/media_galleries/itunes_library_parser_unittest.cc', 'utility/media_galleries/picasa_album_table_reader_unittest.cc', 'utility/media_galleries/picasa_albums_indexer_unittest.cc', @@ -2457,8 +2485,6 @@ # ContentProvider. 'browser/bookmarks/bookmark_html_writer_unittest.cc', - 'browser/shell_integration_unittest.cc', - # No service process (which also requires multiprocess lock). 'common/multi_process_lock_unittest.cc', @@ -2469,19 +2495,17 @@ 'browser/download/download_shelf_unittest.cc', 'browser/storage_monitor/media_storage_util_unittest.cc', 'browser/net/gaia/gaia_oauth_fetcher_unittest.cc', - 'browser/page_cycler/page_cycler_unittest.cc', 'browser/policy/async_policy_provider_unittest.cc', - 'browser/policy/cloud/cloud_external_data_manager_base_unittest.cc', - 'browser/policy/cloud/cloud_external_data_store_unittest.cc', 'browser/policy/cloud/component_cloud_policy_service_unittest.cc', 'browser/policy/cloud/component_cloud_policy_store_unittest.cc', 'browser/policy/cloud/component_cloud_policy_updater_unittest.cc', + 'browser/policy/cloud/external_policy_data_fetcher_unittest.cc', 'browser/policy/cloud/external_policy_data_updater_unittest.cc', 'browser/policy/cloud/resource_cache_unittest.cc', 'browser/policy/config_dir_policy_loader_unittest.cc', - 'browser/policy/managed_mode_policy_provider_unittest.cc', 'browser/policy/policy_path_parser_unittest.cc', 'browser/profiles/off_the_record_profile_impl_unittest.cc', + 'browser/profiles/profile_list_desktop_unittest.cc', 'browser/profiles/profile_loader_unittest.cc', 'browser/search/search_unittest.cc', 'browser/signin/profile_oauth2_token_service_unittest.cc', @@ -2500,7 +2524,10 @@ 'browser/ui/search/instant_ntp_prerenderer_unittest.cc', 'browser/ui/search/instant_page_unittest.cc', 'browser/ui/search/search_delegate_unittest.cc', + 'browser/ui/search/search_ipc_router_policy_unittest.cc', + 'browser/ui/search/search_ipc_router_unittest.cc', 'browser/ui/search/search_model_unittest.cc', + 'browser/ui/search/search_tab_helper_unittest.cc', 'browser/ui/tab_contents/tab_contents_iterator_unittest.cc', 'browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc', 'browser/ui/toolbar/toolbar_model_unittest.cc', @@ -2540,6 +2567,10 @@ # USB service is not supported on Android. 'browser/usb/usb_context_unittest.cc', + + # Bookmark undo is not used on Android. + 'browser/undo/bookmark_undo_service_test.cc', + 'browser/undo/undo_manager_test.cc', ], 'sources/': [ ['exclude', '^browser/captive_portal/'], @@ -2560,7 +2591,6 @@ ['exclude', '^browser/ui/tabs/'], ['exclude', '^browser/ui/toolbar/'], ['exclude', '^browser/ui/webui/downloads_'], - ['exclude', '^browser/ui/webui/feedback_'], ['exclude', '^browser/ui/webui/flags_'], ['exclude', '^browser/ui/webui/help/'], ['exclude', '^browser/ui/webui/options/'], @@ -2614,6 +2644,10 @@ ], }], ['use_openssl==1', { + 'sources!': [ + # networking_private_crypto.cc uses NSS functions. + 'browser/extensions/api/networking_private/networking_private_crypto_unittest.cc', + ], 'sources/': [ # OpenSSL build does not support firefox importer. See # http://crbug.com/64926 @@ -2630,6 +2664,27 @@ ['exclude', '^browser/extensions/blacklist_unittest.cc'], ], }], + ['cld_version==0 or cld_version==1', { + 'defines': [ + 'CLD_WINDOWS', + ], + 'direct_dependent_settings': { + 'defines': [ + 'CLD_WINDOWS', + ], + }, + 'sources': [ + '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc', + ], + 'dependencies': [ + '../third_party/cld/cld.gyp:cld', + ], + }], + ['enable_app_list==1', { + 'sources': [ + 'browser/ui/app_list/test/fast_show_pickler_unittest.cc', + ], + }], ], 'target_conditions': [ ['OS == "ios"', { @@ -2649,6 +2704,7 @@ '<@(chromium_child_dependencies)', '../content/content.gyp:content_app_both', # 2) test-specific support libraries: + '../base/base.gyp:run_all_unittests', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', 'test_support_common', @@ -2664,7 +2720,6 @@ 'app/delay_load_hook_win.h', 'app/delay_load_hook_unittest_win.cc', 'app/hard_error_handler_win.cc', - 'app/run_all_unittests.cc', 'common/crash_keys.cc', 'common/crash_keys.h', ], @@ -2677,7 +2732,7 @@ ['OS=="mac"', { # TODO(mark): We really want this for all non-static library targets, # but when we tried to pull it up to the common.gypi level, it broke - # other things like the ui, startup, and page_cycler tests. *shrug* + # other things like the ui and startup tests. *shrug* 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, }], ['OS=="win"', { @@ -2755,5 +2810,25 @@ }, ], }], + ['enable_app_list==1', { + 'targets': [ + { + # Unit tests for chrome app list, not run on any bots, this is for faster + # compile/link/test cycles during development. + 'target_name': 'chrome_app_list_unittests', + 'type': '<(gtest_target_type)', + 'dependencies': [ + '../base/base.gyp:run_all_unittests', + '../skia/skia.gyp:skia', + '../testing/gtest.gyp:gtest', + 'apps', + 'browser_ui', + ], + 'sources': [ + 'browser/ui/app_list/test/fast_show_pickler_unittest.cc', + ], + }, + ], + }], ], # 'conditions' } diff --git a/chromium/chrome/common/extensions/api/api.gyp b/chromium/chrome/common/extensions/api/api.gyp index 465021ae042..7fddbf97e90 100644 --- a/chromium/chrome/common/extensions/api/api.gyp +++ b/chromium/chrome/common/extensions/api/api.gyp @@ -30,6 +30,7 @@ 'bluetooth.idl', 'bookmark_manager_private.json', 'bookmarks.json', + 'braille_display_private.idl', 'browsing_data.json', 'chromeos_info_private.json', 'cloud_print_private.json', @@ -39,8 +40,10 @@ 'cookies.json', 'debugger.json', 'developer_private.idl', + 'desktop_capture.idl', 'diagnostics.idl', 'dial.idl', + 'dns.idl', 'downloads.idl', 'echo_private.json', 'downloads_internal.idl', @@ -48,10 +51,9 @@ 'events.json', 'experimental_accessibility.json', 'experimental_discovery.idl', - 'experimental_dns.idl', 'experimental_history.json', 'experimental_identity.idl', - 'experimental_idltest.idl', + 'file_browser_private.json', 'location.idl', 'system_memory.idl', 'extension.json', @@ -64,11 +66,13 @@ 'identity.idl', 'identity_private.idl', 'idle.json', + 'idltest.idl', 'infobars.json', 'input_ime.json', 'log_private.idl', 'management.json', 'manifest_types.json', + 'mdns.idl', 'media_galleries.idl', 'media_galleries_private.idl', 'media_player_private.json', @@ -82,12 +86,14 @@ 'preferences_private.json', 'power.idl', 'push_messaging.idl', - 'recovery_private.idl', + 'image_writer_private.idl', 'rtc_private.idl', 'runtime.json', 'serial.idl', - 'session_restore.json', + 'sessions.json', + 'signed_in_devices.idl', 'socket.idl', + 'sockets_udp.idl', 'storage.json', 'sync_file_system.idl', 'system_indicator.idl', @@ -101,6 +107,8 @@ 'test.json', 'top_sites.json', 'usb.idl', + 'virtual_keyboard_private.json', + 'wallpaper.json', 'wallpaper_private.json', 'web_navigation.json', 'web_request.json', @@ -117,8 +125,43 @@ ], 'conditions': [ ['OS=="android"', { - 'schema_files!': [ - 'usb.idl', + 'sources!': [ + 'autotest_private.idl', + 'bookmark_manager_private.json', + 'browsing_data.json', + 'chromeos_info_private.json', + 'command_line_private.json', + 'developer_private.idl', + 'dial.idl', + 'downloads_internal.idl', + 'echo_private.json', + 'enterprise_platform_keys_private.json', + 'experimental_accessibility.json', + 'experimental_discovery.idl', + 'experimental_dns.idl', + 'experimental_history.json', + 'experimental_identity.idl', + 'experimental_idltest.idl', + 'extension.json', + 'file_browser_handler_internal.json', + 'font_settings.json', + 'i18n.json', + 'identity.idl', + 'identity_private.idl', + 'idle.json', + 'infobars.json', + 'input_ime.json', + 'media_player_private.json', + 'music_manager_private.idl', + 'networking_private.json', + 'power.idl', + 'rtc_private.idl', + 'system_indicator.idl', + 'system_private.json', + 'terminal_private.json', + 'test.json', + 'top_sites.json', + 'webview.json', ], }], ['OS!="chromeos"', { @@ -126,6 +169,9 @@ 'file_browser_handler_internal.json', 'log_private.idl', 'rtc_private.idl', + 'virtual_keyboard_private.json', + 'wallpaper.json', + 'wallpaper_private.json', ], }], ], diff --git a/chromium/chrome/installer/mini_installer.gyp b/chromium/chrome/installer/mini_installer.gyp index 619c70e7b81..385c93028ca 100644 --- a/chromium/chrome/installer/mini_installer.gyp +++ b/chromium/chrome/installer/mini_installer.gyp @@ -14,161 +14,114 @@ ], 'conditions': [ ['OS=="win"', { - 'target_defaults': { - 'dependencies': [ - '../chrome.gyp:app_host', - '../chrome.gyp:chrome', - '../chrome.gyp:chrome_nacl_win64', - '../chrome.gyp:chrome_dll', - '../chrome.gyp:default_extensions', - '../chrome.gyp:setup', - ], - 'include_dirs': [ - '../..', - '<(INTERMEDIATE_DIR)', - '<(SHARED_INTERMEDIATE_DIR)/chrome', - ], - 'sources': [ - 'mini_installer/appid.h', - 'mini_installer/configuration.cc', - 'mini_installer/configuration.h', - 'mini_installer/decompress.cc', - 'mini_installer/decompress.h', - 'mini_installer/mini_installer.cc', - 'mini_installer/mini_installer.h', - 'mini_installer/mini_installer.ico', - 'mini_installer/mini_installer.rc', - 'mini_installer/mini_installer_exe_version.rc.version', - 'mini_installer/mini_installer_resource.h', - 'mini_installer/mini_string.cc', - 'mini_installer/mini_string.h', - 'mini_installer/pe_resource.cc', - 'mini_installer/pe_resource.h', - '<(INTERMEDIATE_DIR)/packed_files.rc', - ], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnableIntrinsicFunctions': 'true', - 'BufferSecurityCheck': 'false', - 'BasicRuntimeChecks': '0', - 'ExceptionHandling': '0', - }, - 'VCLinkerTool': { - 'RandomizedBaseAddress': '1', - 'DataExecutionPrevention': '0', - 'AdditionalLibraryDirectories': [ - '<(PRODUCT_DIR)/lib' - ], - 'DelayLoadDLLs': [], - 'EntryPointSymbol': 'MainEntryPoint', - 'GenerateMapFile': 'true', - 'IgnoreAllDefaultLibraries': 'true', - 'OptimizeForWindows98': '1', - 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS - 'AdditionalDependencies': [ - 'shlwapi.lib', - 'setupapi.lib', - ], - }, - 'VCManifestTool': { - 'AdditionalManifestFiles': [ - '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest', - ], - }, - }, - 'configurations': { - 'Debug_Base': { - 'msvs_settings': { - 'VCCLCompilerTool': { - 'BasicRuntimeChecks': '0', - 'BufferSecurityCheck': 'false', - 'ExceptionHandling': '0', - }, - 'VCLinkerTool': { - 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS - 'AdditionalOptions': [ - '/safeseh:no', - '/dynamicbase:no', - '/ignore:4199', - '/ignore:4221', - '/nxcompat', - ], - }, + 'targets': [ + { + 'target_name': 'mini_installer', + 'type': 'executable', + + 'dependencies': [ + '../chrome.gyp:chrome', + '../chrome.gyp:chrome_nacl_win64', + '../chrome.gyp:chrome_dll', + '../chrome.gyp:default_extensions', + '../chrome.gyp:setup', + ], + 'include_dirs': [ + '../..', + '<(INTERMEDIATE_DIR)', + '<(SHARED_INTERMEDIATE_DIR)/chrome', + ], + 'sources': [ + 'mini_installer/appid.h', + 'mini_installer/chrome.release', + 'mini_installer/chrome_appid.cc', + 'mini_installer/configuration.cc', + 'mini_installer/configuration.h', + 'mini_installer/decompress.cc', + 'mini_installer/decompress.h', + 'mini_installer/mini_installer.cc', + 'mini_installer/mini_installer.h', + 'mini_installer/mini_installer.ico', + 'mini_installer/mini_installer.rc', + 'mini_installer/mini_installer_exe_version.rc.version', + 'mini_installer/mini_installer_resource.h', + 'mini_installer/mini_string.cc', + 'mini_installer/mini_string.h', + 'mini_installer/pe_resource.cc', + 'mini_installer/pe_resource.h', + '<(INTERMEDIATE_DIR)/packed_files.rc', + ], + 'msvs_settings': { + 'VCCLCompilerTool': { + 'EnableIntrinsicFunctions': 'true', + 'BufferSecurityCheck': 'false', + 'BasicRuntimeChecks': '0', + 'ExceptionHandling': '0', }, - }, - 'Release_Base': { - 'includes': ['../../build/internal/release_defaults.gypi'], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnableIntrinsicFunctions': 'true', - 'BasicRuntimeChecks': '0', - 'BufferSecurityCheck': 'false', - 'ExceptionHandling': '0', - }, - 'VCLinkerTool': { - 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS - 'Profile': 'false', # Conflicts with /FIXED - 'AdditionalOptions': [ - '/SAFESEH:NO', - '/NXCOMPAT', - '/DYNAMICBASE:NO', - '/FIXED', - ], - }, + 'VCLinkerTool': { + 'RandomizedBaseAddress': '1', + 'DataExecutionPrevention': '0', + 'AdditionalLibraryDirectories': [ + '<(PRODUCT_DIR)/lib' + ], + 'DelayLoadDLLs': [], + 'EntryPointSymbol': 'MainEntryPoint', + 'IgnoreAllDefaultLibraries': 'true', + 'OptimizeForWindows98': '1', + 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS + 'AdditionalDependencies': [ + 'shlwapi.lib', + 'setupapi.lib', + ], }, - }, - }, - 'rules': [ - { - 'rule_name': 'mini_installer_version', - 'extension': 'version', - 'variables': { - 'template_input_path': 'mini_installer/mini_installer_exe_version.rc.version', + 'VCManifestTool': { + 'AdditionalManifestFiles': [ + '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest', + ], }, - 'inputs': [ - '<(template_input_path)', - '<(version_path)', - '<(lastchange_path)', - '<(branding_dir)/BRANDING', - ], - 'outputs': [ - '<(PRODUCT_DIR)/mini_installer_exe_version.rc', - ], - 'action': [ - 'python', '<(version_py)', - '-f', '<(version_path)', - '-f', '<(lastchange_path)', - '-f', '<(branding_dir)/BRANDING', - '<(template_input_path)', - '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - 'message': 'Generating version information' }, - ], - # TODO(mark): <(branding_dir) should be defined by the - # global condition block at the bottom of the file, but - # this doesn't work due to the following issue: - # - # http://code.google.com/p/gyp/issues/detail?id=22 - # - # Remove this block once the above issue is fixed. - 'conditions': [ - [ 'branding == "Chrome"', { - 'variables': { - 'branding_dir': '../app/theme/google_chrome', + 'configurations': { + 'Debug_Base': { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'BasicRuntimeChecks': '0', + 'BufferSecurityCheck': 'false', + 'ExceptionHandling': '0', + }, + 'VCLinkerTool': { + 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS + 'AdditionalOptions': [ + '/safeseh:no', + '/dynamicbase:no', + '/ignore:4199', + '/ignore:4221', + '/nxcompat', + ], + }, + }, }, - }, { # else branding!="Chrome" - 'variables': { - 'branding_dir': '../app/theme/chromium', + 'Release_Base': { + 'includes': ['../../build/internal/release_defaults.gypi'], + 'msvs_settings': { + 'VCCLCompilerTool': { + 'EnableIntrinsicFunctions': 'true', + 'BasicRuntimeChecks': '0', + 'BufferSecurityCheck': 'false', + 'ExceptionHandling': '0', + }, + 'VCLinkerTool': { + 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS + 'Profile': 'false', # Conflicts with /FIXED + 'AdditionalOptions': [ + '/SAFESEH:NO', + '/NXCOMPAT', + '/DYNAMICBASE:NO', + '/FIXED', + ], + }, + }, }, - }], - ], - }, - 'targets': [ - { - 'target_name': 'mini_installer', - 'type': 'executable', + }, # Disable precompiled headers for this project, to avoid # linker errors when building with VS 2008. @@ -184,12 +137,34 @@ # TODO(yukawa): Enable the common compatibility manifest again. 'win_exe_compatibility_manifest': '', }, - 'sources': [ - 'mini_installer/chrome.release', - 'mini_installer/chrome_appid.cc', - ], 'rules': [ { + 'rule_name': 'mini_installer_version', + 'extension': 'version', + 'variables': { + 'template_input_path': 'mini_installer/mini_installer_exe_version.rc.version', + }, + 'inputs': [ + '<(template_input_path)', + '<(version_path)', + '<(lastchange_path)', + '<(branding_dir)/BRANDING', + ], + 'outputs': [ + '<(PRODUCT_DIR)/mini_installer_exe_version.rc', + ], + 'action': [ + 'python', '<(version_py)', + '-f', '<(version_path)', + '-f', '<(lastchange_path)', + '-f', '<(branding_dir)/BRANDING', + '<(template_input_path)', + '<@(_outputs)', + ], + 'process_outputs_as_sources': 1, + 'message': 'Generating version information' + }, + { 'rule_name': 'installer_archive', 'extension': 'release', 'variables': { @@ -251,7 +226,6 @@ ], 'inputs': [ '<(create_installer_archive_py_path)', - '<(PRODUCT_DIR)/app_host.exe', '<(PRODUCT_DIR)/chrome.exe', '<(PRODUCT_DIR)/chrome.dll', '<(PRODUCT_DIR)/nacl64.exe', @@ -292,8 +266,46 @@ 'msvs_cygwin_shell': 1, }, ], + # TODO(mark): <(branding_dir) should be defined by the + # global condition block at the bottom of the file, but + # this doesn't work due to the following issue: + # + # http://code.google.com/p/gyp/issues/detail?id=22 + # + # Remove this block once the above issue is fixed. + 'conditions': [ + [ 'branding == "Chrome"', { + 'variables': { + 'branding_dir': '../app/theme/google_chrome', + }, + }, { # else branding!="Chrome" + 'variables': { + 'branding_dir': '../app/theme/chromium', + }, + }], + ], }, ], + 'conditions': [ + ['test_isolation_mode != "noop"', { + 'targets': [ + { + 'target_name': 'mini_installer_tests_run', + 'type': 'none', + 'dependencies': [ + 'mini_installer', + ], + 'includes': [ + '../../build/isolate.gypi', + 'mini_installer_tests.isolate', + ], + 'sources': [ + 'mini_installer_tests.isolate', + ], + }, + ], + }], + ], }], [ 'branding == "Chrome"', { 'variables': { diff --git a/chromium/chrome/installer/mini_installer.gypi b/chromium/chrome/installer/mini_installer.gypi index ee9403cab19..5b1e9eb6918 100644 --- a/chromium/chrome/installer/mini_installer.gypi +++ b/chromium/chrome/installer/mini_installer.gypi @@ -4,7 +4,6 @@ { 'dependencies': [ '<@(chrome_dll_project)', - '../chrome.gyp:app_host', '../chrome.gyp:chrome', '../chrome.gyp:chrome_nacl_win64', '../chrome.gyp:default_extensions', @@ -48,7 +47,6 @@ }, 'VCLinkerTool': { 'OutputFile': '<(output_dir)/mini_installer.exe', - 'MapFileName': '<(output_dir)/mini_installer.map', 'RandomizedBaseAddress': '1', 'DataExecutionPrevention': '0', 'AdditionalLibraryDirectories': [ @@ -56,7 +54,6 @@ ], 'DelayLoadDLLs': [], 'EntryPointSymbol': 'MainEntryPoint', - 'GenerateMapFile': 'true', 'IgnoreAllDefaultLibraries': 'true', 'OptimizeForWindows98': '1', 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS @@ -191,7 +188,6 @@ ], 'inputs': [ '<(create_installer_archive_py_path)', - '<(PRODUCT_DIR)/app_host.exe', '<(PRODUCT_DIR)/chrome.exe', '<@(chrome_dll_path)', '<(PRODUCT_DIR)/nacl64.exe', diff --git a/chromium/chrome/js_unittest_vars.gypi b/chromium/chrome/js_unittest_vars.gypi index 8146ea2d5ab..b8ae1d49f6c 100644 --- a/chromium/chrome/js_unittest_vars.gypi +++ b/chromium/chrome/js_unittest_vars.gypi @@ -8,6 +8,6 @@ 'js2gtest': '<(DEPTH)/chrome/test/base/js2gtest.js', 'mock_js': '<(DEPTH)/chrome/third_party/mock4js/mock4js.js', 'test_api_js': '<(DEPTH)/chrome/test/data/webui/test_api.js', - 'accessibility_audit_js': '<(DEPTH)/third_party/accessibility-developer-tools/gen/axs_testing.js', + 'accessibility_audit_js': '<(DEPTH)/third_party/accessibility-audit/axs_testing.js', }, } diff --git a/chromium/chrome/test/data/nacl/nacl_test_data.gyp b/chromium/chrome/test/data/nacl/nacl_test_data.gyp index 4d8e4ecff20..5c1580b44c9 100644 --- a/chromium/chrome/test/data/nacl/nacl_test_data.gyp +++ b/chromium/chrome/test/data/nacl/nacl_test_data.gyp @@ -146,6 +146,7 @@ 'pnacl_error_handling/bad.pexe', 'pnacl_error_handling/pnacl_bad_pexe.nmf', 'pnacl_error_handling/pnacl_bad_doesnotexist.nmf', + 'pnacl_error_handling/pnacl_illformed_manifest.nmf', ], }, 'dependencies': [ @@ -253,7 +254,11 @@ '-lppapi_test_lib', '-lplatform', '-lgio', - '-lnacl_exception', + # The "_private" variant of the library calls the syscalls + # directly, which allows us to test the syscalls directly, + # even when the exception-handling IRT interface is also + # disabled under PNaCl. + '-lnacl_exception_private', ], 'sources': [ 'pnacl_exception_handling_disabled/pnacl_exception_handling_disabled.cc', @@ -265,7 +270,7 @@ 'dependencies': [ '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', - '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_exception_lib', + '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_exception_private_lib', '<(DEPTH)/native_client/tools.gyp:prep_toolchain', '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib', diff --git a/chromium/chrome/test/perf/perf_test.gyp b/chromium/chrome/test/perf/perf_test.gyp new file mode 100644 index 00000000000..b1271c18651 --- /dev/null +++ b/chromium/chrome/test/perf/perf_test.gyp @@ -0,0 +1,18 @@ +# Copyright 2013 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. +{ + 'targets': [ + { + 'target_name': 'chrome_perf_test', + 'type': 'static_library', + 'sources': [ + 'perf_test.cc', + ], + 'dependencies': [ + '../../../base/base.gyp:base', + '../../../testing/perf/perf_test.gyp:*', + ], + }, + ], +} |