diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-04 14:17:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-05 10:05:06 +0000 |
| commit | 39d357e3248f80abea0159765ff39554affb40db (patch) | |
| tree | aba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/ios | |
| parent | 87778abf5a1f89266f37d1321b92a21851d8244d (diff) | |
| download | qtwebengine-chromium-39d357e3248f80abea0159765ff39554affb40db.tar.gz | |
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2
Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/ios')
66 files changed, 829 insertions, 4581 deletions
diff --git a/chromium/ios/BUILD.gn b/chromium/ios/BUILD.gn index e6150df50c5..f6ea9e9583b 100644 --- a/chromium/ios/BUILD.gn +++ b/chromium/ios/BUILD.gn @@ -2,31 +2,47 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +assert(!is_component_build, "component build is unsupported on iOS") + +declare_args() { + # Control whether cronet is build (this is usually set by the script + # components/cronet/tools/cr_cronet.py as cronet requires specific + # gn args to build correctly). + is_cronet_build = false +} + # This list all targets that needs to be build as part of "gn_all" on iOS. # This list should generally only include executables, but since some code # has not yet been upstreamed it will sometimes also include targets that # are not used upstream to ensure they are not broken inadvertently. group("all") { testonly = true - deps = [ - "//ios/chrome:ios_chrome_unittests", - "//ios/chrome/app", - "//ios/chrome/browser", - "//ios/chrome/common", - "//ios/chrome/common/physical_web", - "//ios/chrome/share_extension:packed_resources", - "//ios/chrome/today_extension:packed_resources", - "//ios/net:ios_net_unittests", - "//ios/public/provider/chrome/browser", - "//ios/public/provider/web", - "//ios/testing:ocmock_support_unittest", - "//ios/third_party/earl_grey", - "//ios/web:ios_web_inttests", - "//ios/web:ios_web_unittests", - "//ios/web/shell:ios_web_shell", - ] - - if (!is_component_build) { - deps += [ "//components/cronet/ios:cronet_package" ] + if (is_cronet_build) { + deps = [ + "//components/cronet/ios:cronet_package", + "//ios/crnet:crnet_framework", + "//ios/crnet/crnet_consumer", + "//ios/crnet/test:crnet_test", + ] + } else { + deps = [ + "//ios/chrome:ios_chrome_unittests", + "//ios/chrome/app", + "//ios/chrome/browser", + "//ios/chrome/common", + "//ios/chrome/common/physical_web", + "//ios/chrome/share_extension:packed_resources", + "//ios/chrome/today_extension:packed_resources", + "//ios/net:ios_net_unittests", + "//ios/public/provider/chrome/browser", + "//ios/public/provider/web", + "//ios/testing:ocmock_support_unittest", + "//ios/third_party/earl_grey", + "//ios/web:earl_grey_test_support", + "//ios/web:ios_web_inttests", + "//ios/web:ios_web_unittests", + "//ios/web/shell:ios_web_shell", + "//ios/web/shell/test:ios_web_shell_test_host", + ] } } diff --git a/chromium/ios/chrome/BUILD.gn b/chromium/ios/chrome/BUILD.gn index 8b1238e2342..033376516fe 100644 --- a/chromium/ios/chrome/BUILD.gn +++ b/chromium/ios/chrome/BUILD.gn @@ -11,6 +11,12 @@ bundle_data("ios_chrome_unittests_bundle_data") { sources = [ "test/data/webdata/bookmarkimages/image.jpg", "test/data/webdata/bookmarkimages/index.html", + "test/data/webp_transcode/test.jpg", + "test/data/webp_transcode/test.webp", + "test/data/webp_transcode/test_alpha.png", + "test/data/webp_transcode/test_alpha.webp", + "test/data/webp_transcode/test_small.tiff", + "test/data/webp_transcode/test_small.webp", ] outputs = [ "{{bundle_resources_dir}}/{{source_root_relative_dir}}/" + @@ -26,7 +32,9 @@ bundle_data_xib("native_content_controller_test_xib") { test("ios_chrome_unittests") { sources = [ "app/application_delegate/memory_warning_helper_unittest.mm", + "app/deferred_initialization_runner_unittest.mm", "app/safe_mode_util_unittest.cc", + "browser/browsing_data/cache_counter_unittest.cc", "browser/chrome_url_util_unittest.mm", "browser/crash_loop_detection_util_unittest.mm", "browser/favicon/large_icon_cache_unittest.cc", @@ -35,6 +43,8 @@ test("ios_chrome_unittests") { "browser/geolocation/omnibox_geolocation_local_state_unittest.mm", "browser/install_time_util_unittest.mm", "browser/installation_notifier_unittest.mm", + "browser/ios_chrome_io_thread_unittest.mm", + "browser/itunes_links/itunes_links_observer_unittest.mm", "browser/metrics/ios_chrome_metrics_service_accessor_unittest.cc", "browser/metrics/ios_chrome_stability_metrics_provider_unittest.cc", "browser/metrics/mobile_session_shutdown_metrics_provider_unittest.mm", @@ -43,18 +53,28 @@ test("ios_chrome_unittests") { "browser/net/image_fetcher_unittest.mm", "browser/net/metrics_network_client_unittest.mm", "browser/net/retryable_url_fetcher_unittest.mm", + "browser/passwords/credential_manager_js_unittest.mm", + "browser/passwords/credential_manager_unittest.mm", + "browser/passwords/password_controller_js_unittest.mm", + "browser/passwords/password_controller_off_the_record_unittest.mm", "browser/passwords/password_controller_unittest.mm", + "browser/passwords/password_generation_agent_unittest.mm", "browser/reading_list/reading_list_entry_unittest.cc", + "browser/reading_list/reading_list_model_storage_unittest.mm", "browser/reading_list/reading_list_model_unittest.cc", - "browser/signin/chrome_identity_service_observer_bridge_unittest.mm", - "browser/signin/gaia_auth_fetcher_ios_unittest.mm", + "browser/reading_list/url_downloader_unittest.cc", "browser/snapshots/lru_cache_unittest.mm", "browser/snapshots/snapshot_cache_unittest.mm", "browser/snapshots/snapshots_util_unittest.mm", "browser/ssl/ios_ssl_error_handler_unittest.mm", "browser/translate/translate_service_ios_unittest.cc", + "browser/ui/alert_coordinator/action_sheet_coordinator_unittest.mm", + "browser/ui/alert_coordinator/alert_coordinator_unittest.mm", + "browser/ui/alert_coordinator/input_alert_coordinator_unittest.mm", "browser/ui/commands/set_up_for_testing_command_unittest.mm", "browser/ui/context_menu/context_menu_coordinator_unittest.mm", + "browser/ui/elements/selector_coordinator_unittest.mm", + "browser/ui/elements/selector_picker_view_controller_unittest.mm", "browser/ui/keyboard/UIKeyCommand+ChromeTest.mm", "browser/ui/keyboard/hardware_keyboard_watcher_unittest.mm", "browser/ui/native_content_controller_unittest.mm", @@ -62,6 +82,7 @@ test("ios_chrome_unittests") { "browser/ui/uikit_ui_util_unittest.mm", "browser/update_client/ios_chrome_update_query_params_delegate_unittest.cc", "browser/web_resource/web_resource_util_unittest.cc", + "browser/webp_transcode/webp_decoder_unittest.mm", "common/string_util_unittest.mm", "test/google_toolbox_unittest.mm", ] @@ -71,7 +92,10 @@ test("ios_chrome_unittests") { ":native_content_controller_test_xib", "//base", "//base/test:test_support", + "//components/autofill/core/common:common", + "//components/autofill/ios/browser:browser", "//components/bookmarks/test", + "//components/browsing_data/core", "//components/favicon_base", "//components/metrics", "//components/metrics:test_support", @@ -79,9 +103,11 @@ test("ios_chrome_unittests") { "//components/password_manager/core/browser:test_support", "//components/password_manager/core/common", "//components/prefs:test_support", + "//components/proxy_config:proxy_config", "//components/signin/core/browser:test_support", "//components/signin/ios/browser:test_support", - "//components/sync_driver:test_support", + "//components/ssl_config:ssl_config", + "//components/sync:test_support_sync_driver", "//components/syncable_prefs:test_support", "//components/update_client", "//components/version_info", @@ -89,11 +115,14 @@ test("ios_chrome_unittests") { "//ios/chrome/app/resources:packed_resources", "//ios/chrome/browser", "//ios/chrome/browser:test_support", + "//ios/chrome/browser/signin:unit_tests", "//ios/chrome/common", "//ios/chrome/test", "//ios/chrome/test:run_all_unittests", + "//ios/net", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser:test_support", + "//ios/testing:ocmock_support", "//ios/web", "//ios/web:test_support", "//net:test_support", @@ -102,7 +131,9 @@ test("ios_chrome_unittests") { "//testing/gtest", "//third_party/google_toolbox_for_mac", "//third_party/ocmock", + "//ui/base:base", "//ui/gfx:test_support", + "//ui/strings:ui_strings", ] assert_no_deps = ios_assert_no_deps diff --git a/chromium/ios/chrome/app/BUILD.gn b/chromium/ios/chrome/app/BUILD.gn index 9f281b90c4b..a94e27ff2e0 100644 --- a/chromium/ios/chrome/app/BUILD.gn +++ b/chromium/ios/chrome/app/BUILD.gn @@ -4,8 +4,6 @@ source_set("app") { sources = [ - "UIApplication+ExitsOnSuspend.h", - "UIApplication+ExitsOnSuspend.mm", "application_delegate/memory_warning_helper.h", "application_delegate/memory_warning_helper.mm", "deferred_initialization_runner.h", diff --git a/chromium/ios/chrome/app/resources/BUILD.gn b/chromium/ios/chrome/app/resources/BUILD.gn index fd4da5c45b4..ba5d8676445 100644 --- a/chromium/ios/chrome/app/resources/BUILD.gn +++ b/chromium/ios/chrome/app/resources/BUILD.gn @@ -39,7 +39,7 @@ ios_chrome_repack_all_scales("repack_scalable_resources") { ] } -ios_repack("repack_unscaled_resources") { +repack("repack_unscaled_resources") { visibility = [ ":packed_resources" ] sources = [ "$root_gen_dir/components/components_resources.pak", @@ -56,5 +56,5 @@ ios_repack("repack_unscaled_resources") { "//ui/resources", ] output = "$target_gen_dir/resources.pak" - bundle_output = "{{bundle_resources_dir}}/{{source_file_part}}" + copy_data_to_bundle = true } diff --git a/chromium/ios/chrome/app/resources/ios_chrome_repack.gni b/chromium/ios/chrome/app/resources/ios_chrome_repack.gni index 225a88ea6d1..52da371b2b8 100644 --- a/chromium/ios/chrome/app/resources/ios_chrome_repack.gni +++ b/chromium/ios/chrome/app/resources/ios_chrome_repack.gni @@ -5,93 +5,20 @@ import("//tools/grit/repack.gni") import("//build/config/chrome_build.gni") -# Template to repack resources and copy them to the application bundles. -# -# Arguments -# -# deps -# list of strings corresponding to target labels. -# -# sources -# list of strings corresponding to path to resources pak to pack. -# -# output -# string, path of the packed resources. -# -# bundle_output -# string, path of the packed resources in the bundle. -# -# Generates a bundle_data target for convenience. -template("ios_repack") { - assert(defined(invoker.deps), "deps must be defined for $target_name") - assert(defined(invoker.sources), "sources must be defined for $target_name") - assert(defined(invoker.output), "output must be defined for $target_name") - assert(defined(invoker.bundle_output), - "bundle_output must be defined for $target_name") - - _target_name = target_name - - repack("${_target_name}_pack") { - forward_variables_from(invoker, [ "testonly" ]) - - visibility = [ ":${_target_name}" ] - sources = invoker.sources - output = invoker.output - deps = invoker.deps - } - - bundle_data(_target_name) { - forward_variables_from(invoker, - [ - "testonly", - "visibility", - ]) - public_deps = [ - ":${_target_name}_pack", - ] - sources = [ - invoker.output, - ] - outputs = [ - invoker.bundle_output, - ] - } -} - -# Template to repack all resources for a given locale. -# -# Arguments -# -# input_locale -# string, name of the locale to pack. -# -# output_locale -# string, name of the locale (may be different from input_locale -# as iOS and Chrome not use the same convention for naming locales -# with country variant). -# -# Generates a bundle_data target for convenience. -template("_ios_chrome_repack_one_locale") { - assert(defined(invoker.input_locale), - "input_locale must be defined for ${target_name}") - assert(defined(invoker.output_locale), - "output_locale must be defined for ${target_name}") - - ios_repack(target_name) { - forward_variables_from(invoker, - [ - "testonly", - "visibility", - ]) - - sources = [ - "${root_gen_dir}/components/strings/components_${branding_path_component}_strings_${invoker.input_locale}.pak", - "${root_gen_dir}/components/strings/components_locale_settings_${invoker.input_locale}.pak", - "${root_gen_dir}/components/strings/components_strings_${invoker.input_locale}.pak", - "${root_gen_dir}/ios/chrome/ios_${branding_path_component}_strings_${invoker.input_locale}.pak", - "${root_gen_dir}/ios/chrome/ios_strings_${invoker.input_locale}.pak", - "${root_gen_dir}/ui/strings/app_locale_settings_${invoker.input_locale}.pak", - "${root_gen_dir}/ui/strings/ui_strings_${invoker.input_locale}.pak", +# Wraps repack_locales(), setting the source_patterns and deps required for +# Chrome. +# Generates a collection of bundle_data targets. +template("ios_chrome_repack_locales") { + repack_locales(target_name) { + forward_variables_from(invoker, "*") + source_patterns = [ + "${root_gen_dir}/components/strings/components_${branding_path_component}_strings_", + "${root_gen_dir}/components/strings/components_locale_settings_", + "${root_gen_dir}/components/strings/components_strings_", + "${root_gen_dir}/ios/chrome/ios_${branding_path_component}_strings_", + "${root_gen_dir}/ios/chrome/ios_strings_", + "${root_gen_dir}/ui/strings/app_locale_settings_", + "${root_gen_dir}/ui/strings/ui_strings_", ] deps = [ @@ -104,60 +31,7 @@ template("_ios_chrome_repack_one_locale") { "//ui/strings:ui_strings", ] - output = "${target_gen_dir}/${invoker.output_locale}.lproj/locale.pak" - bundle_output = "{{bundle_resources_dir}}/${invoker.output_locale}.lproj" + - "/{{source_file_part}}" - } -} - -# Template to repack all resources for all locales. -# -# Arguments -# -# input_locales -# list of strings corresponding to all locales to pack. -# -# output_locales -# list of strings corresponding to all locales to pack (may be -# different from input_locales as iOS and Chrome do not use the -# same convention for naming locales with country variant). -# -# Must be the same length as input_locales. -# -# Generates a collection of bundle_data targets for convenience. -template("ios_chrome_repack_locales") { - assert(defined(invoker.input_locales), - "input_locales must be defined for ${target_name}") - assert(defined(invoker.output_locales), - "output_locales must be defined for ${target_name}") - - _target_name = target_name - - _locale_targets = [] - _output_locales = invoker.output_locales - - _current_index = 0 - foreach(_input_locale, invoker.input_locales) { - _output_locale = _output_locales[_current_index] - _locale_targets += [ ":${_target_name}_${_input_locale}" ] - - _ios_chrome_repack_one_locale("${_target_name}_${_input_locale}") { - forward_variables_from(invoker, [ "testonly" ]) - visibility = [ ":${_target_name}" ] - input_locale = _input_locale - output_locale = _output_locale - } - - _current_index = _current_index + 1 - } - - group(_target_name) { - forward_variables_from(invoker, - [ - "testonly", - "visibility", - ]) - public_deps = _locale_targets + copy_data_to_bundle = true } } @@ -172,7 +46,7 @@ template("ios_chrome_repack_locales") { template("_ios_chrome_repack_one_scale") { assert(defined(invoker.scale), "scale must be defined for ${target_name}") - ios_repack(target_name) { + repack(target_name) { forward_variables_from(invoker, [ "testonly", @@ -191,7 +65,7 @@ template("_ios_chrome_repack_one_scale") { ] output = "$target_gen_dir/chrome_${invoker.scale}_percent.pak" - bundle_output = "{{bundle_resources_dir}}/{{source_file_part}}" + copy_data_to_bundle = true } } diff --git a/chromium/ios/chrome/browser/BUILD.gn b/chromium/ios/chrome/browser/BUILD.gn index 6e528c69027..564f9a3f889 100644 --- a/chromium/ios/chrome/browser/BUILD.gn +++ b/chromium/ios/chrome/browser/BUILD.gn @@ -62,6 +62,8 @@ source_set("browser") { "bookmarks/bookmarks_utils.h", "bookmarks/startup_task_runner_service_factory.cc", "bookmarks/startup_task_runner_service_factory.h", + "browser_about_rewriter.cc", + "browser_about_rewriter.h", "browser_state/bookmark_model_loaded_observer.cc", "browser_state/bookmark_model_loaded_observer.h", "browser_state/browser_state_info_cache.cc", @@ -91,12 +93,20 @@ source_set("browser") { "browser_state_metrics/browser_state_metrics.cc", "browser_state_metrics/browser_state_metrics.h", "browsing_data/browsing_data_change_listening.h", + "browsing_data/browsing_data_counter_wrapper.cc", + "browsing_data/browsing_data_counter_wrapper.h", "browsing_data/browsing_data_remover_helper.cc", "browsing_data/browsing_data_remover_helper.h", + "browsing_data/cache_counter.cc", + "browsing_data/cache_counter.h", + "browsing_data/ios_browsing_data_counter_factory.cc", + "browsing_data/ios_browsing_data_counter_factory.h", "browsing_data/ios_chrome_browsing_data_remover.h", "browsing_data/ios_chrome_browsing_data_remover.mm", "chrome_constants.cc", "chrome_constants.h", + "chrome_coordinator.h", + "chrome_coordinator.mm", "chrome_paths.h", "chrome_paths.mm", "chrome_paths_internal.h", @@ -132,6 +142,10 @@ source_set("browser") { "dom_distiller/dom_distiller_service_factory.h", "experimental_flags.h", "experimental_flags.mm", + "favicon/favicon_attributes.h", + "favicon/favicon_attributes.mm", + "favicon/favicon_attributes_provider.h", + "favicon/favicon_attributes_provider.mm", "favicon/favicon_client_impl.h", "favicon/favicon_client_impl.mm", "favicon/favicon_loader.h", @@ -190,6 +204,7 @@ source_set("browser") { "history/top_sites_factory.h", "history/web_history_service_factory.cc", "history/web_history_service_factory.h", + "infobars/confirm_infobar_controller+protected.h", "infobars/confirm_infobar_controller.h", "infobars/confirm_infobar_controller.mm", "infobars/infobar.h", @@ -222,6 +237,8 @@ source_set("browser") { "ios_chrome_io_thread.mm", "ios_chrome_main_parts.h", "ios_chrome_main_parts.mm", + "itunes_links/itunes_links_observer.h", + "itunes_links/itunes_links_observer.mm", "memory/memory_debugger.h", "memory/memory_debugger.mm", "memory/memory_debugger_manager.h", @@ -274,10 +291,16 @@ source_set("browser") { "net/retryable_url_fetcher.mm", "notification_promo.cc", "notification_promo.h", - "ntp_snippets/ios_chrome_ntp_snippets_service_factory.cc", - "ntp_snippets/ios_chrome_ntp_snippets_service_factory.h", + "ntp_snippets/ios_chrome_content_suggestions_service_factory.cc", + "ntp_snippets/ios_chrome_content_suggestions_service_factory.h", + "ntp_tiles/ios_most_visited_sites_factory.cc", + "ntp_tiles/ios_most_visited_sites_factory.h", + "ntp_tiles/ios_popular_sites_factory.cc", + "ntp_tiles/ios_popular_sites_factory.h", "open_from_clipboard/create_clipboard_recent_content.h", "open_from_clipboard/create_clipboard_recent_content.mm", + "open_url_util.h", + "open_url_util.mm", "passwords/credential_manager.h", "passwords/credential_manager.mm", "passwords/ios_chrome_password_manager_client.h", @@ -292,6 +315,8 @@ source_set("browser") { "passwords/ios_chrome_password_store_factory.h", "passwords/ios_chrome_save_password_infobar_delegate.h", "passwords/ios_chrome_save_password_infobar_delegate.mm", + "passwords/ios_chrome_update_password_infobar_delegate.h", + "passwords/ios_chrome_update_password_infobar_delegate.mm", "passwords/js_credential_manager.h", "passwords/js_credential_manager.mm", "passwords/js_password_manager.h", @@ -308,6 +333,13 @@ source_set("browser") { "passwords/password_generation_utils.h", "passwords/password_generation_utils.mm", "passwords/passwords_ui_delegate.h", + "passwords/update_password_infobar_controller.h", + "passwords/update_password_infobar_controller.mm", + "physical_web/create_physical_web_data_source.h", + "physical_web/create_physical_web_data_source.mm", + "physical_web/physical_web_constants.h", + "physical_web/start_physical_web_discovery.h", + "physical_web/start_physical_web_discovery.mm", "pref_names.cc", "pref_names.h", "prefs/browser_prefs.h", @@ -319,10 +351,16 @@ source_set("browser") { "prefs/pref_observer_bridge.h", "prefs/pref_observer_bridge.mm", "procedural_block_types.h", + "reading_list/reading_list_download_service.cc", + "reading_list/reading_list_download_service.h", + "reading_list/reading_list_download_service_factory.cc", + "reading_list/reading_list_download_service_factory.h", "reading_list/reading_list_entry.cc", "reading_list/reading_list_entry.h", "reading_list/reading_list_model.cc", "reading_list/reading_list_model.h", + "reading_list/reading_list_model_bridge_observer.h", + "reading_list/reading_list_model_bridge_observer.mm", "reading_list/reading_list_model_factory.cc", "reading_list/reading_list_model_factory.h", "reading_list/reading_list_model_impl.cc", @@ -332,8 +370,10 @@ source_set("browser") { "reading_list/reading_list_model_storage.h", "reading_list/reading_list_model_storage_defaults.h", "reading_list/reading_list_model_storage_defaults.mm", - "search/search_util.h", - "search/search_util.mm", + "reading_list/url_downloader.cc", + "reading_list/url_downloader.h", + "root_coordinator.h", + "root_coordinator.mm", "search_engines/search_engines_util.cc", "search_engines/search_engines_util.h", "search_engines/template_url_service_client_impl.cc", @@ -356,42 +396,6 @@ source_set("browser") { "share_extension/share_extension_service.mm", "share_extension/share_extension_service_factory.cc", "share_extension/share_extension_service_factory.h", - "signin/about_signin_internals_factory.cc", - "signin/about_signin_internals_factory.h", - "signin/account_consistency_service_factory.h", - "signin/account_consistency_service_factory.mm", - "signin/account_fetcher_service_factory.cc", - "signin/account_fetcher_service_factory.h", - "signin/account_reconcilor_factory.cc", - "signin/account_reconcilor_factory.h", - "signin/account_tracker_service_factory.cc", - "signin/account_tracker_service_factory.h", - "signin/browser_state_data_remover.h", - "signin/browser_state_data_remover.mm", - "signin/chrome_identity_service_observer_bridge.h", - "signin/chrome_identity_service_observer_bridge.mm", - "signin/constants.h", - "signin/constants.mm", - "signin/gaia_auth_fetcher_ios.h", - "signin/gaia_auth_fetcher_ios.mm", - "signin/gaia_auth_fetcher_ios_private.h", - "signin/gaia_cookie_manager_service_factory.cc", - "signin/gaia_cookie_manager_service_factory.h", - "signin/ios_chrome_signin_status_metrics_provider_delegate.cc", - "signin/ios_chrome_signin_status_metrics_provider_delegate.h", - "signin/oauth2_token_service_factory.h", - "signin/oauth2_token_service_factory.mm", - "signin/signin_client_factory.cc", - "signin/signin_client_factory.h", - "signin/signin_client_impl.h", - "signin/signin_client_impl.mm", - "signin/signin_error_controller_factory.cc", - "signin/signin_error_controller_factory.h", - "signin/signin_manager_factory.cc", - "signin/signin_manager_factory.h", - "signin/signin_manager_factory_observer.h", - "signin/signin_util.h", - "signin/signin_util.mm", "snapshots/lru_cache.h", "snapshots/lru_cache.mm", "snapshots/snapshot_cache.h", @@ -408,6 +412,7 @@ source_set("browser") { "ssl/ios_ssl_blocking_page.mm", "ssl/ios_ssl_error_handler.h", "ssl/ios_ssl_error_handler.mm", + "storekit_launcher.h", "suggestions/image_fetcher_impl.h", "suggestions/image_fetcher_impl.mm", "suggestions/ios_image_decoder_impl.h", @@ -449,6 +454,12 @@ source_set("browser") { "translate/translate_service_ios.h", "ui/UIView+SizeClassSupport.h", "ui/UIView+SizeClassSupport.mm", + "ui/alert_coordinator/action_sheet_coordinator.h", + "ui/alert_coordinator/action_sheet_coordinator.mm", + "ui/alert_coordinator/alert_coordinator.h", + "ui/alert_coordinator/alert_coordinator.mm", + "ui/alert_coordinator/input_alert_coordinator.h", + "ui/alert_coordinator/input_alert_coordinator.mm", "ui/animation_util.h", "ui/animation_util.mm", "ui/autofill/autofill_client_ios.h", @@ -477,6 +488,15 @@ source_set("browser") { "ui/commands/show_signin_command.mm", "ui/context_menu/context_menu_coordinator.h", "ui/context_menu/context_menu_coordinator.mm", + "ui/elements/selector_coordinator.h", + "ui/elements/selector_coordinator.mm", + "ui/elements/selector_picker_presentation_controller.h", + "ui/elements/selector_picker_presentation_controller.mm", + "ui/elements/selector_picker_view_controller.h", + "ui/elements/selector_picker_view_controller.mm", + "ui/elements/selector_view_controller_delegate.h", + "ui/favicon_view.h", + "ui/favicon_view.mm", "ui/file_locations.h", "ui/file_locations.mm", "ui/image_util.h", @@ -502,8 +522,6 @@ source_set("browser") { "ui/show_privacy_settings_util.mm", "ui/side_swipe_gesture_recognizer.h", "ui/side_swipe_gesture_recognizer.mm", - "ui/size_class_support_util.h", - "ui/size_class_support_util.mm", "ui/ui_util.h", "ui/ui_util.mm", "ui/uikit_ui_util.h", @@ -528,6 +546,8 @@ source_set("browser") { "ui/webui/mojo_web_ui_ios_controller.h", "ui/webui/net_export/net_export_ui.cc", "ui/webui/net_export/net_export_ui.h", + "ui/webui/physical_web_ui.cc", + "ui/webui/physical_web_ui.h", "ui/webui/sync_internals/sync_internals_message_handler.cc", "ui/webui/sync_internals/sync_internals_message_handler.h", "ui/webui/sync_internals/sync_internals_ui.cc", @@ -556,6 +576,8 @@ source_set("browser") { "web_data_service_factory.h", "web_resource/web_resource_util.cc", "web_resource/web_resource_util.h", + "webp_transcode/webp_decoder.h", + "webp_transcode/webp_decoder.mm", "xcallback_parameters.h", "xcallback_parameters.mm", ] @@ -571,17 +593,14 @@ source_set("browser") { "//components/autofill/core/common", "//components/autofill/ios/browser", "//components/bookmarks/browser", - "//components/browser_sync/browser", - "//components/browser_sync/common", - "//components/browsing_data_ui", - "//components/certificate_reporting", + "//components/browser_sync", + "//components/browsing_data/core", "//components/component_updater", "//components/content_settings/core/browser", "//components/content_settings/core/common", "//components/cookie_config", "//components/crash/core/browser", "//components/crash/core/common", - "//components/data_reduction_proxy/core/common", "//components/dom_distiller/core", "//components/dom_distiller/ios", "//components/favicon/core", @@ -610,12 +629,15 @@ source_set("browser") { "//components/network_session_configurator", "//components/network_time", "//components/ntp_snippets", + "//components/ntp_tiles", "//components/omnibox/browser", "//components/open_from_clipboard", "//components/password_manager/core/browser", "//components/password_manager/core/common", "//components/password_manager/sync/browser", - "//components/policy:policy_component_common", + "//components/physical_web/data_source", + "//components/physical_web/webui", + "//components/policy/core/common", "//components/pref_registry", "//components/prefs", "//components/profile_metrics", @@ -633,7 +655,7 @@ source_set("browser") { "//components/ssl_config", "//components/strings", "//components/suggestions", - "//components/sync_driver", + "//components/sync", "//components/sync_sessions", "//components/syncable_prefs", "//components/translate/core/browser", @@ -650,11 +672,12 @@ source_set("browser") { "//components/version_ui", "//components/web_resource", "//components/webdata_services", - "//components/webp_transcode", "//google_apis", + "//ios/chrome/browser/signin", "//ios/chrome/browser/variations:ios_chrome_ui_string_overrider_factory", "//ios/chrome/common", "//ios/chrome/common/app_group", + "//ios/chrome/common/physical_web", "//ios/net", "//ios/public/provider/chrome/browser", "//ios/public/provider/web", @@ -665,9 +688,9 @@ source_set("browser") { "//net:extras", "//services/shell/public/cpp", "//skia", - "//sync", "//third_party/brotli", "//third_party/google_toolbox_for_mac", + "//third_party/libwebp:libwebp_dec", "//ui/base", "//ui/gfx", "//ui/resources", @@ -681,7 +704,10 @@ source_set("browser") { "//ios/chrome/app/theme", ] - allow_circular_includes_from = [ ":about_flags" ] + allow_circular_includes_from = [ + ":about_flags", + "//ios/chrome/browser/signin", + ] libs = [ "Accelerate.framework", @@ -723,7 +749,7 @@ source_set("about_flags") { "//components/flags_ui", "//components/flags_ui:switches", "//components/strings", - "//components/sync_driver", + "//components/sync", "//components/variations", "//google_apis", "//ios/chrome/app/strings", @@ -743,20 +769,6 @@ source_set("about_flags") { ] } -# Temporary target while moving coordinator classes upstream. -source_set("chrome_coordinators") { - sources = [ - "chrome_coordinator.h", - "chrome_coordinator.mm", - "root_coordinator.h", - "root_coordinator.mm", - ] - - deps = [ - "//base", - ] -} - # TODO(crbug.com/487804): use js_compile_checked instead once the errors have # been fixed. js_compile_unchecked("injected_js") { @@ -781,10 +793,6 @@ source_set("test_support") { "geolocation/test_location_manager.mm", "net/mock_image_fetcher.h", "net/mock_image_fetcher.mm", - "signin/fake_oauth2_token_service_builder.h", - "signin/fake_oauth2_token_service_builder.mm", - "signin/fake_signin_manager_builder.cc", - "signin/fake_signin_manager_builder.h", "sync/fake_sync_service_factory.cc", "sync/fake_sync_service_factory.h", "sync/ios_chrome_profile_sync_test_util.cc", @@ -797,8 +805,8 @@ source_set("test_support") { ":browser", "//base", "//components/bookmarks/browser", - "//components/browser_sync/browser", - "//components/browser_sync/browser:test_support", + "//components/browser_sync", + "//components/browser_sync:test_support", "//components/history/core/browser", "//components/history/ios/browser", "//components/keyed_service/core", @@ -809,20 +817,20 @@ source_set("test_support") { "//components/signin/core/browser:test_support", "//components/signin/ios/browser", "//components/signin/ios/browser:test_support", - "//components/sync_driver", - "//components/sync_driver:test_support", + "//components/sync", + "//components/sync:test_support_sync_driver", "//components/syncable_prefs", "//components/syncable_prefs:test_support", "//components/user_prefs", "//components/webdata_services", "//ios/chrome/browser", + "//ios/chrome/browser/signin", "//ios/chrome/common", "//ios/chrome/test", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser:test_support", "//ios/web", "//net:test_support", - "//sync", "//testing/gmock", "//testing/gtest", "//ui/base", diff --git a/chromium/ios/chrome/browser/signin/BUILD.gn b/chromium/ios/chrome/browser/signin/BUILD.gn new file mode 100644 index 00000000000..c86072cb842 --- /dev/null +++ b/chromium/ios/chrome/browser/signin/BUILD.gn @@ -0,0 +1,166 @@ +# Copyright 2016 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. + +source_set("signin") { + sources = [ + "about_signin_internals_factory.cc", + "about_signin_internals_factory.h", + "account_consistency_service_factory.h", + "account_consistency_service_factory.mm", + "account_fetcher_service_factory.cc", + "account_fetcher_service_factory.h", + "account_reconcilor_factory.cc", + "account_reconcilor_factory.h", + "account_tracker_service_factory.cc", + "account_tracker_service_factory.h", + "browser_state_data_remover.h", + "browser_state_data_remover.mm", + "chrome_identity_service_observer_bridge.h", + "chrome_identity_service_observer_bridge.mm", + "constants.h", + "constants.mm", + "gaia_auth_fetcher_ios.h", + "gaia_auth_fetcher_ios.mm", + "gaia_auth_fetcher_ios_private.h", + "gaia_cookie_manager_service_factory.cc", + "gaia_cookie_manager_service_factory.h", + "ios_chrome_signin_status_metrics_provider_delegate.cc", + "ios_chrome_signin_status_metrics_provider_delegate.h", + "oauth2_token_service_factory.h", + "oauth2_token_service_factory.mm", + "profile_oauth2_token_service_ios_provider_impl.h", + "profile_oauth2_token_service_ios_provider_impl.mm", + "signin_client_factory.cc", + "signin_client_factory.h", + "signin_client_impl.h", + "signin_client_impl.mm", + "signin_error_controller_factory.cc", + "signin_error_controller_factory.h", + "signin_manager_factory.cc", + "signin_manager_factory.h", + "signin_manager_factory_observer.h", + "signin_util.h", + "signin_util.mm", + ] + deps = [ + "//components/pref_registry", + "//components/prefs", + "//ios/web", + "//url", + ] + public_deps = [ + "//base", + "//components/content_settings/core/browser", + "//components/keyed_service/ios", + "//components/metrics", + "//components/prefs", + "//components/signin/core/browser", + "//components/signin/ios/browser", + "//google_apis", + "//ios/chrome/common", + "//ios/public/provider/chrome/browser", + "//net", + ] +} + +# Temporary target to allow upstreaming authentication_service*.{cc,h} +# without breaking downstream repository when rolling the CL. Will be +# removed once downstream code no longer use it. +source_set("authentication_service") { + sources = [ + "authentication_service.h", + "authentication_service.mm", + "authentication_service_factory.h", + "authentication_service_factory.mm", + ] + deps = [ + ":signin", + "//components/browser_sync", + "//components/prefs", + "//components/signin/ios/browser", + "//components/sync", + "//ios/chrome/browser", + ] + public_deps = [ + "//base", + "//components/keyed_service/core", + "//components/keyed_service/ios", + "//components/pref_registry", + "//components/signin/core/browser", + "//google_apis", + "//ios/public/provider/chrome/browser", + ] +} + +source_set("test_support") { + testonly = true + sources = [ + "fake_oauth2_token_service_builder.h", + "fake_oauth2_token_service_builder.mm", + "fake_signin_manager_builder.cc", + "fake_signin_manager_builder.h", + ] + deps = [ + ":signin", + "//base", + "//components/signin/core/browser:test_support", + "//components/signin/ios/browser", + "//ios/chrome/browser", + ] +} + +# Temporary target to allow upstreaming authentication_service*.{cc,h} +# without breaking downstream repository when rolling the CL. Will be +# removed once downstream code no longer use it. +source_set("authentication_service_test_support") { + testonly = true + sources = [ + "authentication_service_fake.h", + "authentication_service_fake.mm", + ] + deps = [ + "//ios/chrome/browser", + ] + public_deps = [ + ":authentication_service", + ":signin", + "//base", + "//ios/public/provider/chrome/browser", + ] +} + +source_set("unit_tests") { + testonly = true + sources = [ + "authentication_service_unittest.mm", + "chrome_identity_service_observer_bridge_unittest.mm", + "gaia_auth_fetcher_ios_unittest.mm", + ] + deps = [ + ":authentication_service", + ":signin", + ":test_support", + "//base", + "//components/browser_sync:test_support", + "//components/pref_registry", + "//components/prefs", + "//components/signin/core/browser", + "//components/signin/core/browser:test_support", + "//components/signin/core/common", + "//components/signin/ios/browser", + "//components/syncable_prefs", + "//components/syncable_prefs:test_support", + "//google_apis", + "//ios/chrome/browser", + "//ios/chrome/browser:test_support", + "//ios/chrome/test", + "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser:test_support", + "//ios/web:test_support", + "//net:test_support", + "//testing/gmock", + "//testing/gtest", + "//third_party/ocmock", + ] +} diff --git a/chromium/ios/chrome/common/BUILD.gn b/chromium/ios/chrome/common/BUILD.gn index 126dea6c04c..688f7fd21fd 100644 --- a/chromium/ios/chrome/common/BUILD.gn +++ b/chromium/ios/chrome/common/BUILD.gn @@ -16,6 +16,7 @@ source_set("common") { "//base", "//components/version_info", "//ios/chrome/common/app_group:main_app", + "//ios/chrome/common/physical_web:physical_web", ] libs = [ diff --git a/chromium/ios/chrome/common/physical_web/BUILD.gn b/chromium/ios/chrome/common/physical_web/BUILD.gn index 52cec635053..f56f06b2add 100644 --- a/chromium/ios/chrome/common/physical_web/BUILD.gn +++ b/chromium/ios/chrome/common/physical_web/BUILD.gn @@ -4,6 +4,8 @@ source_set("physical_web") { sources = [ + "ios_chrome_physical_web_data_source.h", + "ios_chrome_physical_web_data_source.mm", "physical_web_device.h", "physical_web_device.mm", "physical_web_request.h", @@ -16,6 +18,7 @@ source_set("physical_web") { deps = [ "//base", + "//components/physical_web/data_source", "//components/version_info", "//device/bluetooth/uribeacon", "//google_apis", diff --git a/chromium/ios/chrome/common/physical_web/physical_web.gyp b/chromium/ios/chrome/common/physical_web/physical_web.gyp deleted file mode 100644 index 887c0af7f3e..00000000000 --- a/chromium/ios/chrome/common/physical_web/physical_web.gyp +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2015 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':[ - { - # GN version: //ios/chrome/common/physical_web - 'target_name': 'physical_web', - 'type': 'static_library', - 'sources': [ - 'physical_web_device.h', - 'physical_web_device.mm', - 'physical_web_request.h', - 'physical_web_request.mm', - 'physical_web_scanner.h', - 'physical_web_scanner.mm', - 'physical_web_types.h', - 'physical_web_types.mm', - ], - 'dependencies': [ - '../../../../base/base.gyp:base', - '../../../../components/components.gyp:version_info', - '../../../../device/bluetooth/bluetooth.gyp:uribeacon', - '../../../../google_apis/google_apis.gyp:google_apis', - '../../../../ios/web/ios_web.gyp:user_agent', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/CoreBluetooth.framework', - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - ], - }, - } - ] -} diff --git a/chromium/ios/chrome/extension_repack.gni b/chromium/ios/chrome/extension_repack.gni index aa71bcdaa50..50b118ba97d 100644 --- a/chromium/ios/chrome/extension_repack.gni +++ b/chromium/ios/chrome/extension_repack.gni @@ -4,100 +4,24 @@ import("//tools/grit/repack.gni") -# Pack all resources for an application extension for a given locale. +# Pack all resources for an application extension for all locales. # -# Arguments: +# Arguments (in addition to those from repack_locales): # # extension [required] # name of the application extension. # -# input_locale [required] -# name of the locale to pack. -# -# output_locale [required] -# name of the locale (may be different from input_locale as iOS -# and Chrome does not use the same convention for naming locales -# with country variants). -# -# visibility [optional] -# usual meaning. -# -template("_extension_repack_one_locale") { - assert(defined(invoker.extension), "Need extension for $target_name") - assert(defined(invoker.input_locale), "Need input_locale for $target_name") - assert(defined(invoker.output_locale), "Need output_locale for $target_name") +template("extension_repack_all_locales") { + # Wraps repack_locales(), setting the source_patterns and deps required for + # Chrome. + # Generates a collection of bundle_data targets. + repack_locales(target_name) { + forward_variables_from(invoker, "*", [ "extension" ]) - repack_and_bundle(target_name) { - forward_variables_from(invoker, [ "visibility" ]) + source_patterns = [ "$root_gen_dir/ios/${invoker.extension}/ios_${invoker.extension}_strings_" ] deps = [ "//ios/chrome/${invoker.extension}/strings", ] - - sources = [ - "$root_gen_dir/ios/${invoker.extension}/" + - "ios_${invoker.extension}_strings_${invoker.input_locale}.pak", - ] - - output = "$target_gen_dir/${invoker.output_locale}.lproj/locale.pak" - bundle_output = "{{bundle_resources_dir}}/" + - "${invoker.output_locale}.lproj/locale.pak" - } -} - -# Pack all resoruces for an application extension for all locales. -# -# Arguments: -# -# extension [required] -# name of the application extension. -# -# input_locales [required] -# list of all locales to pack. -# -# output_locales [required] -# list of all locales in application bundle (may differ from input -# locales as iOS and Chrome does not use the same convention for -# naming locales with country variants). -# -# Must be the same length as input_locales. -# -# visibility [optional] -# usual meaning. -# -template("extension_repack_all_locales") { - assert(defined(invoker.extension), "Need extension for $target_name") - assert(defined(invoker.input_locales), "Need input_locales for $target_name") - assert(defined(invoker.output_locales), - "Need output_locales for $target_name") - - _target_name = target_name - - # TODO(614747): GN parser does not grok invoker.output_locales[foo]. Use a - # local variables to workaround this issue until the issue is fixed. - _current_locale = 0 - _output_locales = invoker.output_locales - - # Collect all locale targets to avoid looping twice over the locales. - _locale_targets = [] - - foreach(_input_locale, invoker.input_locales) { - _output_locale = _output_locales[_current_locale] - - _locale_target = _target_name + "_$_input_locale" - _extension_repack_one_locale(_locale_target) { - visibility = [ ":$_target_name" ] - input_locale = _input_locale - output_locale = _output_locale - extension = invoker.extension - } - - _locale_targets += [ ":$_locale_target" ] - _current_locale = _current_locale + 1 - } - - group(_target_name) { - forward_variables_from(invoker, [ "visibility" ]) - public_deps = _locale_targets } } diff --git a/chromium/ios/chrome/ios_chrome.gyp b/chromium/ios/chrome/ios_chrome.gyp deleted file mode 100644 index 1e76d3a6d75..00000000000 --- a/chromium/ios/chrome/ios_chrome.gyp +++ /dev/null @@ -1,893 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - # GN version: //ios/chrome/app - 'target_name': 'ios_chrome_app', - 'type': 'static_library', - 'include_dirs': [ - '../..', - ], - 'dependencies': [ - '../../base/base.gyp:base', - 'ios_chrome_browser', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', - ], - }, - 'sources': [ - 'app/application_delegate/memory_warning_helper.h', - 'app/application_delegate/memory_warning_helper.mm', - 'app/UIApplication+ExitsOnSuspend.h', - 'app/UIApplication+ExitsOnSuspend.mm', - 'app/deferred_initialization_runner.h', - 'app/deferred_initialization_runner.mm', - 'app/safe_mode_crashing_modules_config.h', - 'app/safe_mode_crashing_modules_config.mm', - 'app/safe_mode_util.cc', - 'app/safe_mode_util.h', - ], - }, - { - # GN version: //ios/chrome/browser - 'target_name': 'ios_chrome_browser', - 'type': 'static_library', - 'include_dirs': [ - '../..', - ], - 'dependencies': [ - '../../base/base.gyp:base', - '../../breakpad/breakpad.gyp:breakpad_client', - '../../components/components.gyp:about_handler', - '../../components/components.gyp:autofill_core_browser', - '../../components/components.gyp:autofill_core_common', - '../../components/components.gyp:autofill_ios_browser', - '../../components/components.gyp:bookmarks_browser', - '../../components/components.gyp:browser_sync_browser', - '../../components/components.gyp:browser_sync_common', - '../../components/components.gyp:certificate_reporting', - '../../components/components.gyp:component_updater', - '../../components/components.gyp:content_settings_core_browser', - '../../components/components.gyp:cookie_config', - '../../components/components.gyp:crash_core_browser', - '../../components/components.gyp:crash_core_common', - '../../components/components.gyp:dom_distiller_core', - '../../components/components.gyp:dom_distiller_ios', - '../../components/components.gyp:favicon_base', - '../../components/components.gyp:favicon_core', - '../../components/components.gyp:gcm_driver', - '../../components/components.gyp:google_core_browser', - '../../components/components.gyp:history_core_browser', - '../../components/components.gyp:history_ios_browser', - '../../components/components.gyp:image_fetcher', - '../../components/components.gyp:infobars_core', - '../../components/components.gyp:invalidation_impl', - '../../components/components.gyp:invalidation_public', - '../../components/components.gyp:keyed_service_core', - '../../components/components.gyp:keyed_service_ios', - '../../components/components.gyp:language_usage_metrics', - '../../components/components.gyp:leveldb_proto', - '../../components/components.gyp:metrics', - '../../components/components.gyp:metrics_net', - '../../components/components.gyp:metrics_profiler', - '../../components/components.gyp:metrics_profiler_ios', - '../../components/components.gyp:metrics_services_manager', - '../../components/components.gyp:metrics_ui', - '../../components/components.gyp:navigation_metrics', - '../../components/components.gyp:net_log', - '../../components/components.gyp:network_session_configurator', - '../../components/components.gyp:network_time', - '../../components/components.gyp:ntp_snippets', - '../../components/components.gyp:omnibox_browser', - '../../components/components.gyp:open_from_clipboard', - '../../components/components.gyp:password_manager_core_browser', - '../../components/components.gyp:password_manager_sync_browser', - '../../components/components.gyp:pref_registry', - '../../components/components.gyp:profile_metrics', - '../../components/components.gyp:proxy_config', - '../../components/components.gyp:rappor', - '../../components/components.gyp:search', - '../../components/components.gyp:search_engines', - '../../components/components.gyp:security_interstitials_core', - '../../components/components.gyp:security_state', - '../../components/components.gyp:sessions_ios', - '../../components/components.gyp:signin_core_browser', - '../../components/components.gyp:signin_core_common', - '../../components/components.gyp:signin_ios_browser', - '../../components/components.gyp:ssl_config', - '../../components/components.gyp:suggestions', - '../../components/components.gyp:sync_driver', - '../../components/components.gyp:syncable_prefs', - '../../components/components.gyp:translate_core_browser', - '../../components/components.gyp:translate_ios_browser', - '../../components/components.gyp:undo_component', - '../../components/components.gyp:update_client', - '../../components/components.gyp:upload_list', - '../../components/components.gyp:user_prefs', - '../../components/components.gyp:variations', - '../../components/components.gyp:variations_service', - '../../components/components.gyp:version_info', - '../../components/components.gyp:version_ui', - '../../components/components.gyp:web_resource', - '../../components/components.gyp:webdata_services', - '../../components/components.gyp:webp_transcode', - '../../components/components_resources.gyp:components_resources', - '../../components/components_strings.gyp:components_strings', - '../../components/prefs/prefs.gyp:prefs', - '../../components/url_formatter/url_formatter.gyp:url_formatter', - '../../google_apis/google_apis.gyp:google_apis', - '../../net/net.gyp:net', - '../../net/net.gyp:net_extras', - '../../services/shell/shell_public.gyp:shell_public', - '../../skia/skia.gyp:skia', - '../../sync/sync.gyp:sync', - '../../third_party/brotli/brotli.gyp:brotli', - '../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', - '../../ui/base/ui_base.gyp:ui_base', - '../../ui/gfx/gfx.gyp:gfx', - '../../url/url.gyp:url_lib', - '../provider/ios_provider_chrome.gyp:ios_provider_chrome_browser', - '../web/ios_web.gyp:ios_web', - 'injected_js', - 'ios_chrome_browser_about_flags', - 'ios_chrome_common', - 'ios_chrome_resources.gyp:ios_chrome_resources', - 'ios_chrome_resources.gyp:ios_chrome_ui_string_overrider_factory', - 'ios_chrome_resources.gyp:ios_chrome_ui_string_overrider_factory_gen', - ], - 'export_dependent_settings': [ - '../../components/components.gyp:dom_distiller_core', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework', - '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', - '$(SDKROOT)/System/Library/Frameworks/CoreLocation.framework', - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/Photos.framework', - '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', - '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', - ], - }, - 'sources': [ - 'browser/app_startup_parameters.h', - 'browser/app_startup_parameters.mm', - 'browser/application_context.cc', - 'browser/application_context.h', - 'browser/application_context_impl.cc', - 'browser/application_context_impl.h', - 'browser/arch_util.cc', - 'browser/arch_util.h', - 'browser/autocomplete/autocomplete_classifier_factory.cc', - 'browser/autocomplete/autocomplete_classifier_factory.h', - 'browser/autocomplete/autocomplete_provider_client_impl.cc', - 'browser/autocomplete/autocomplete_provider_client_impl.h', - 'browser/autocomplete/autocomplete_scheme_classifier_impl.h', - 'browser/autocomplete/autocomplete_scheme_classifier_impl.mm', - 'browser/autocomplete/in_memory_url_index_factory.cc', - 'browser/autocomplete/in_memory_url_index_factory.h', - 'browser/autocomplete/shortcuts_backend_factory.h', - 'browser/autocomplete/shortcuts_backend_factory.mm', - 'browser/autofill/form_input_accessory_view.h', - 'browser/autofill/form_input_accessory_view.mm', - 'browser/autofill/form_input_accessory_view_controller.h', - 'browser/autofill/form_input_accessory_view_controller.mm', - 'browser/autofill/form_input_accessory_view_delegate.h', - 'browser/autofill/form_suggestion_controller.h', - 'browser/autofill/form_suggestion_controller.mm', - 'browser/autofill/form_suggestion_label.h', - 'browser/autofill/form_suggestion_label.mm', - 'browser/autofill/form_suggestion_provider.h', - 'browser/autofill/form_suggestion_view.h', - 'browser/autofill/form_suggestion_view.mm', - 'browser/autofill/form_suggestion_view_client.h', - 'browser/autofill/personal_data_manager_factory.cc', - 'browser/autofill/personal_data_manager_factory.h', - 'browser/bookmarks/bookmark_client_impl.cc', - 'browser/bookmarks/bookmark_client_impl.h', - 'browser/bookmarks/bookmark_model_factory.cc', - 'browser/bookmarks/bookmark_model_factory.h', - 'browser/bookmarks/bookmarks_utils.cc', - 'browser/bookmarks/bookmarks_utils.h', - 'browser/bookmarks/startup_task_runner_service_factory.cc', - 'browser/bookmarks/startup_task_runner_service_factory.h', - 'browser/browser_state/bookmark_model_loaded_observer.cc', - 'browser/browser_state/bookmark_model_loaded_observer.h', - 'browser/browser_state/browser_state_info_cache.cc', - 'browser/browser_state/browser_state_info_cache.h', - 'browser/browser_state/browser_state_info_cache_observer.h', - 'browser/browser_state/browser_state_keyed_service_factories.h', - 'browser/browser_state/browser_state_keyed_service_factories.mm', - 'browser/browser_state/browser_state_otr_helper.cc', - 'browser/browser_state/browser_state_otr_helper.h', - 'browser/browser_state/chrome_browser_state.h', - 'browser/browser_state/chrome_browser_state.mm', - 'browser/browser_state/chrome_browser_state_impl.cc', - 'browser/browser_state/chrome_browser_state_impl.h', - 'browser/browser_state/chrome_browser_state_impl_io_data.h', - 'browser/browser_state/chrome_browser_state_impl_io_data.mm', - 'browser/browser_state/chrome_browser_state_io_data.cc', - 'browser/browser_state/chrome_browser_state_io_data.h', - 'browser/browser_state/chrome_browser_state_manager.h', - 'browser/browser_state/chrome_browser_state_manager_impl.cc', - 'browser/browser_state/chrome_browser_state_manager_impl.h', - 'browser/browser_state/chrome_browser_state_removal_controller.h', - 'browser/browser_state/chrome_browser_state_removal_controller.mm', - 'browser/browser_state/off_the_record_chrome_browser_state_impl.cc', - 'browser/browser_state/off_the_record_chrome_browser_state_impl.h', - 'browser/browser_state/off_the_record_chrome_browser_state_io_data.h', - 'browser/browser_state/off_the_record_chrome_browser_state_io_data.mm', - 'browser/browser_state_metrics/browser_state_metrics.cc', - 'browser/browser_state_metrics/browser_state_metrics.h', - 'browser/browsing_data/browsing_data_change_listening.h', - 'browser/browsing_data/browsing_data_remover_helper.cc', - 'browser/browsing_data/browsing_data_remover_helper.h', - 'browser/browsing_data/ios_chrome_browsing_data_remover.h', - 'browser/browsing_data/ios_chrome_browsing_data_remover.mm', - 'browser/chrome_constants.cc', - 'browser/chrome_constants.h', - 'browser/chrome_paths.h', - 'browser/chrome_paths.mm', - 'browser/chrome_paths_internal.h', - 'browser/chrome_switches.cc', - 'browser/chrome_switches.h', - 'browser/chrome_url_constants.cc', - 'browser/chrome_url_constants.h', - 'browser/chrome_url_util.h', - 'browser/chrome_url_util.mm', - 'browser/component_updater/ios_component_updater_configurator.cc', - 'browser/component_updater/ios_component_updater_configurator.h', - 'browser/content_settings/cookie_settings_factory.cc', - 'browser/content_settings/cookie_settings_factory.h', - 'browser/content_settings/host_content_settings_map_factory.cc', - 'browser/content_settings/host_content_settings_map_factory.h', - 'browser/crash_loop_detection_util.h', - 'browser/crash_loop_detection_util.mm', - 'browser/crash_report/breakpad_helper.h', - 'browser/crash_report/breakpad_helper.mm', - 'browser/crash_report/crash_keys.cc', - 'browser/crash_report/crash_keys.h', - 'browser/crash_report/crash_report_background_uploader.h', - 'browser/crash_report/crash_report_background_uploader.mm', - 'browser/crash_report/crash_report_multi_parameter.h', - 'browser/crash_report/crash_report_multi_parameter.mm', - 'browser/crash_report/crash_report_user_application_state.h', - 'browser/crash_report/crash_report_user_application_state.mm', - 'browser/crash_report/crash_upload_list.cc', - 'browser/crash_report/crash_upload_list.h', - 'browser/dom_distiller/distiller_viewer.cc', - 'browser/dom_distiller/distiller_viewer.h', - 'browser/dom_distiller/dom_distiller_service_factory.cc', - 'browser/dom_distiller/dom_distiller_service_factory.h', - 'browser/experimental_flags.h', - 'browser/experimental_flags.mm', - 'browser/favicon/favicon_client_impl.h', - 'browser/favicon/favicon_client_impl.mm', - 'browser/favicon/favicon_loader.h', - 'browser/favicon/favicon_loader.mm', - 'browser/favicon/favicon_service_factory.cc', - 'browser/favicon/favicon_service_factory.h', - 'browser/favicon/ios_chrome_favicon_loader_factory.h', - 'browser/favicon/ios_chrome_favicon_loader_factory.mm', - 'browser/favicon/ios_chrome_large_icon_cache_factory.cc', - 'browser/favicon/ios_chrome_large_icon_cache_factory.h', - 'browser/favicon/ios_chrome_large_icon_service_factory.cc', - 'browser/favicon/ios_chrome_large_icon_service_factory.h', - 'browser/favicon/large_icon_cache.cc', - 'browser/favicon/large_icon_cache.h', - 'browser/file_metadata_util.h', - 'browser/file_metadata_util.mm', - 'browser/find_in_page/find_in_page_controller.h', - 'browser/find_in_page/find_in_page_controller.mm', - 'browser/find_in_page/find_in_page_model.h', - 'browser/find_in_page/find_in_page_model.mm', - 'browser/find_in_page/js_findinpage_manager.h', - 'browser/find_in_page/js_findinpage_manager.mm', - 'browser/first_run/first_run.h', - 'browser/first_run/first_run.mm', - 'browser/first_run/first_run_configuration.h', - 'browser/first_run/first_run_configuration.mm', - 'browser/first_run/first_run_metrics.h', - 'browser/geolocation/CLLocation+OmniboxGeolocation.h', - 'browser/geolocation/CLLocation+OmniboxGeolocation.mm', - 'browser/geolocation/CLLocation+XGeoHeader.h', - 'browser/geolocation/CLLocation+XGeoHeader.mm', - 'browser/geolocation/location_manager.h', - 'browser/geolocation/location_manager.mm', - 'browser/geolocation/omnibox_geolocation_authorization_alert.h', - 'browser/geolocation/omnibox_geolocation_authorization_alert.mm', - 'browser/geolocation/omnibox_geolocation_config.h', - 'browser/geolocation/omnibox_geolocation_config.mm', - 'browser/geolocation/omnibox_geolocation_local_state.h', - 'browser/geolocation/omnibox_geolocation_local_state.mm', - 'browser/google/google_brand.h', - 'browser/google/google_brand.mm', - 'browser/google/google_url_tracker_client_impl.cc', - 'browser/google/google_url_tracker_client_impl.h', - 'browser/google/google_url_tracker_factory.cc', - 'browser/google/google_url_tracker_factory.h', - 'browser/history/history_backend_client_impl.cc', - 'browser/history/history_backend_client_impl.h', - 'browser/history/history_client_impl.cc', - 'browser/history/history_client_impl.h', - 'browser/history/history_service_factory.cc', - 'browser/history/history_service_factory.h', - 'browser/history/history_utils.cc', - 'browser/history/history_utils.h', - 'browser/history/top_sites_factory.cc', - 'browser/history/top_sites_factory.h', - 'browser/history/web_history_service_factory.cc', - 'browser/history/web_history_service_factory.h', - 'browser/infobars/confirm_infobar_controller.h', - 'browser/infobars/confirm_infobar_controller.mm', - 'browser/infobars/infobar.h', - 'browser/infobars/infobar.mm', - 'browser/infobars/infobar_container_ios.h', - 'browser/infobars/infobar_container_ios.mm', - 'browser/infobars/infobar_container_view.h', - 'browser/infobars/infobar_container_view.mm', - 'browser/infobars/infobar_controller.h', - 'browser/infobars/infobar_controller.mm', - 'browser/infobars/infobar_manager_impl.h', - 'browser/infobars/infobar_manager_impl.mm', - 'browser/infobars/infobar_utils.h', - 'browser/infobars/infobar_utils.mm', - 'browser/install_time_util.h', - 'browser/install_time_util.mm', - 'browser/installation_notifier.h', - 'browser/installation_notifier.mm', - 'browser/interstitials/ios_chrome_controller_client.h', - 'browser/interstitials/ios_chrome_controller_client.mm', - 'browser/interstitials/ios_chrome_metrics_helper.h', - 'browser/interstitials/ios_chrome_metrics_helper.mm', - 'browser/interstitials/ios_security_interstitial_page.h', - 'browser/interstitials/ios_security_interstitial_page.mm', - 'browser/invalidation/ios_chrome_profile_invalidation_provider_factory.h', - 'browser/invalidation/ios_chrome_profile_invalidation_provider_factory.mm', - 'browser/ios_chrome_field_trials.cc', - 'browser/ios_chrome_field_trials.h', - 'browser/ios_chrome_io_thread.h', - 'browser/ios_chrome_io_thread.mm', - 'browser/ios_chrome_main_parts.h', - 'browser/ios_chrome_main_parts.mm', - 'browser/memory/memory_debugger.h', - 'browser/memory/memory_debugger.mm', - 'browser/memory/memory_debugger_manager.h', - 'browser/memory/memory_debugger_manager.mm', - 'browser/memory/memory_metrics.cc', - 'browser/memory/memory_metrics.h', - 'browser/metrics/field_trial_synchronizer.cc', - 'browser/metrics/field_trial_synchronizer.h', - 'browser/metrics/ios_chrome_metrics_service_accessor.cc', - 'browser/metrics/ios_chrome_metrics_service_accessor.h', - 'browser/metrics/ios_chrome_metrics_service_client.cc', - 'browser/metrics/ios_chrome_metrics_service_client.h', - 'browser/metrics/ios_chrome_metrics_services_manager_client.h', - 'browser/metrics/ios_chrome_metrics_services_manager_client.mm', - 'browser/metrics/ios_chrome_origins_seen_service_factory.cc', - 'browser/metrics/ios_chrome_origins_seen_service_factory.h', - 'browser/metrics/ios_chrome_stability_metrics_provider.cc', - 'browser/metrics/ios_chrome_stability_metrics_provider.h', - 'browser/metrics/mobile_session_shutdown_metrics_provider.h', - 'browser/metrics/mobile_session_shutdown_metrics_provider.mm', - 'browser/metrics/previous_session_info.h', - 'browser/metrics/previous_session_info.mm', - 'browser/metrics/previous_session_info_private.h', - 'browser/net/chrome_cookie_store_ios_client.h', - 'browser/net/chrome_cookie_store_ios_client.mm', - 'browser/net/connection_type_observer_bridge.h', - 'browser/net/connection_type_observer_bridge.mm', - 'browser/net/cookie_util.h', - 'browser/net/cookie_util.mm', - 'browser/net/crl_set_fetcher.cc', - 'browser/net/crl_set_fetcher.h', - 'browser/net/http_server_properties_manager_factory.cc', - 'browser/net/http_server_properties_manager_factory.h', - 'browser/net/image_fetcher.h', - 'browser/net/image_fetcher.mm', - 'browser/net/ios_chrome_http_user_agent_settings.h', - 'browser/net/ios_chrome_http_user_agent_settings.mm', - 'browser/net/ios_chrome_network_delegate.cc', - 'browser/net/ios_chrome_network_delegate.h', - 'browser/net/ios_chrome_url_request_context_getter.cc', - 'browser/net/ios_chrome_url_request_context_getter.h', - 'browser/net/metrics_network_client.h', - 'browser/net/metrics_network_client.mm', - 'browser/net/metrics_network_client_manager.h', - 'browser/net/metrics_network_client_manager.mm', - 'browser/net/net_types.h', - 'browser/net/proxy_service_factory.cc', - 'browser/net/proxy_service_factory.h', - 'browser/net/retryable_url_fetcher.h', - 'browser/net/retryable_url_fetcher.mm', - 'browser/notification_promo.h', - 'browser/notification_promo.cc', - 'browser/ntp_snippets/ios_chrome_ntp_snippets_service_factory.cc', - 'browser/ntp_snippets/ios_chrome_ntp_snippets_service_factory.h', - 'browser/open_from_clipboard/create_clipboard_recent_content.h', - 'browser/open_from_clipboard/create_clipboard_recent_content.mm', - 'browser/passwords/credential_manager.h', - 'browser/passwords/credential_manager.mm', - 'browser/passwords/ios_chrome_password_manager_client.h', - 'browser/passwords/ios_chrome_password_manager_client.mm', - 'browser/passwords/ios_chrome_password_manager_driver.h', - 'browser/passwords/ios_chrome_password_manager_driver.mm', - 'browser/passwords/ios_chrome_password_manager_infobar_delegate.h', - 'browser/passwords/ios_chrome_password_manager_infobar_delegate.mm', - 'browser/passwords/ios_chrome_password_manager_setting_migrator_service_factory.cc', - 'browser/passwords/ios_chrome_password_manager_setting_migrator_service_factory.h', - 'browser/passwords/ios_chrome_password_store_factory.cc', - 'browser/passwords/ios_chrome_password_store_factory.h', - 'browser/passwords/ios_chrome_save_password_infobar_delegate.h', - 'browser/passwords/ios_chrome_save_password_infobar_delegate.mm', - 'browser/passwords/js_credential_manager.h', - 'browser/passwords/js_credential_manager.mm', - 'browser/passwords/js_password_manager.h', - 'browser/passwords/js_password_manager.mm', - 'browser/passwords/password_controller.h', - 'browser/passwords/password_controller.mm', - 'browser/passwords/password_generation_agent.h', - 'browser/passwords/password_generation_agent.mm', - 'browser/passwords/password_generation_edit_view.h', - 'browser/passwords/password_generation_edit_view.mm', - 'browser/passwords/password_generation_offer_view.h', - 'browser/passwords/password_generation_offer_view.mm', - 'browser/passwords/password_generation_prompt_delegate.h', - 'browser/passwords/password_generation_utils.h', - 'browser/passwords/password_generation_utils.mm', - 'browser/passwords/passwords_ui_delegate.h', - 'browser/pref_names.cc', - 'browser/pref_names.h', - 'browser/prefs/browser_prefs.h', - 'browser/prefs/browser_prefs.mm', - 'browser/prefs/ios_chrome_pref_model_associator_client.cc', - 'browser/prefs/ios_chrome_pref_model_associator_client.h', - 'browser/prefs/ios_chrome_pref_service_factory.cc', - 'browser/prefs/ios_chrome_pref_service_factory.h', - 'browser/prefs/pref_observer_bridge.h', - 'browser/prefs/pref_observer_bridge.mm', - 'browser/procedural_block_types.h', - 'browser/reading_list/reading_list_entry.cc', - 'browser/reading_list/reading_list_entry.h', - 'browser/reading_list/reading_list_model.cc', - 'browser/reading_list/reading_list_model.h', - 'browser/reading_list/reading_list_model_impl.cc', - 'browser/reading_list/reading_list_model_impl.h', - 'browser/reading_list/reading_list_model_observer.h', - 'browser/reading_list/reading_list_model_factory.cc', - 'browser/reading_list/reading_list_model_factory.h', - 'browser/reading_list/reading_list_model_observer.h', - 'browser/reading_list/reading_list_model_storage.h', - 'browser/reading_list/reading_list_model_storage_defaults.h', - 'browser/reading_list/reading_list_model_storage_defaults.mm', - 'browser/search/search_util.h', - 'browser/search/search_util.mm', - 'browser/search_engines/search_engines_util.cc', - 'browser/search_engines/search_engines_util.h', - 'browser/search_engines/template_url_service_client_impl.cc', - 'browser/search_engines/template_url_service_client_impl.h', - 'browser/search_engines/template_url_service_factory.cc', - 'browser/search_engines/template_url_service_factory.h', - 'browser/search_engines/ui_thread_search_terms_data.cc', - 'browser/search_engines/ui_thread_search_terms_data.h', - 'browser/services/gcm/ios_chrome_gcm_profile_service_factory.cc', - 'browser/services/gcm/ios_chrome_gcm_profile_service_factory.h', - 'browser/sessions/ios_chrome_session_tab_helper.h', - 'browser/sessions/ios_chrome_session_tab_helper.mm', - 'browser/sessions/ios_chrome_tab_restore_service_client.h', - 'browser/sessions/ios_chrome_tab_restore_service_client.mm', - 'browser/sessions/ios_chrome_tab_restore_service_factory.cc', - 'browser/sessions/ios_chrome_tab_restore_service_factory.h', - 'browser/share_extension/share_extension_item_receiver.h', - 'browser/share_extension/share_extension_item_receiver.mm', - 'browser/share_extension/share_extension_service.h', - 'browser/share_extension/share_extension_service.mm', - 'browser/share_extension/share_extension_service_factory.cc', - 'browser/share_extension/share_extension_service_factory.h', - 'browser/signin/about_signin_internals_factory.cc', - 'browser/signin/about_signin_internals_factory.h', - 'browser/signin/account_consistency_service_factory.h', - 'browser/signin/account_consistency_service_factory.mm', - 'browser/signin/account_fetcher_service_factory.cc', - 'browser/signin/account_fetcher_service_factory.h', - 'browser/signin/account_reconcilor_factory.cc', - 'browser/signin/account_reconcilor_factory.h', - 'browser/signin/account_tracker_service_factory.cc', - 'browser/signin/account_tracker_service_factory.h', - 'browser/signin/browser_state_data_remover.h', - 'browser/signin/browser_state_data_remover.mm', - 'browser/signin/chrome_identity_service_observer_bridge.h', - 'browser/signin/chrome_identity_service_observer_bridge.mm', - 'browser/signin/constants.h', - 'browser/signin/constants.mm', - 'browser/signin/gaia_auth_fetcher_ios.h', - 'browser/signin/gaia_auth_fetcher_ios.mm', - 'browser/signin/gaia_auth_fetcher_ios_private.h', - 'browser/signin/gaia_cookie_manager_service_factory.cc', - 'browser/signin/gaia_cookie_manager_service_factory.h', - 'browser/signin/ios_chrome_signin_status_metrics_provider_delegate.cc', - 'browser/signin/ios_chrome_signin_status_metrics_provider_delegate.h', - 'browser/signin/oauth2_token_service_factory.h', - 'browser/signin/oauth2_token_service_factory.mm', - 'browser/signin/signin_client_factory.cc', - 'browser/signin/signin_client_factory.h', - 'browser/signin/signin_client_impl.h', - 'browser/signin/signin_client_impl.mm', - 'browser/signin/signin_error_controller_factory.cc', - 'browser/signin/signin_error_controller_factory.h', - 'browser/signin/signin_manager_factory.cc', - 'browser/signin/signin_manager_factory.h', - 'browser/signin/signin_manager_factory_observer.h', - 'browser/signin/signin_util.h', - 'browser/signin/signin_util.mm', - 'browser/snapshots/lru_cache.h', - 'browser/snapshots/lru_cache.mm', - 'browser/snapshots/snapshot_cache.h', - 'browser/snapshots/snapshot_cache.mm', - 'browser/snapshots/snapshot_manager.h', - 'browser/snapshots/snapshot_manager.mm', - 'browser/snapshots/snapshot_overlay.h', - 'browser/snapshots/snapshot_overlay.mm', - 'browser/snapshots/snapshots_util.h', - 'browser/snapshots/snapshots_util.mm', - 'browser/ssl/ios_chrome_security_state_model_client.h', - 'browser/ssl/ios_chrome_security_state_model_client.mm', - 'browser/ssl/ios_ssl_blocking_page.h', - 'browser/ssl/ios_ssl_blocking_page.mm', - 'browser/ssl/ios_ssl_error_handler.h', - 'browser/ssl/ios_ssl_error_handler.mm', - 'browser/suggestions/image_fetcher_impl.h', - 'browser/suggestions/image_fetcher_impl.mm', - 'browser/suggestions/ios_image_decoder_impl.h', - 'browser/suggestions/ios_image_decoder_impl.mm', - 'browser/suggestions/suggestions_service_factory.h', - 'browser/suggestions/suggestions_service_factory.mm', - 'browser/sync/glue/sync_start_util.cc', - 'browser/sync/glue/sync_start_util.h', - 'browser/sync/ios_chrome_profile_sync_service_factory.cc', - 'browser/sync/ios_chrome_profile_sync_service_factory.h', - 'browser/sync/ios_chrome_sync_client.h', - 'browser/sync/ios_chrome_sync_client.mm', - 'browser/sync/ios_chrome_synced_tab_delegate.h', - 'browser/sync/ios_chrome_synced_tab_delegate.mm', - 'browser/sync/sessions/ios_chrome_local_session_event_router.h', - 'browser/sync/sessions/ios_chrome_local_session_event_router.mm', - 'browser/sync/sync_observer_bridge.h', - 'browser/sync/sync_observer_bridge.mm', - 'browser/sync/sync_setup_service.cc', - 'browser/sync/sync_setup_service.h', - 'browser/sync/sync_setup_service_factory.cc', - 'browser/sync/sync_setup_service_factory.h', - 'browser/tab_parenting_global_observer.cc', - 'browser/tab_parenting_global_observer.h', - 'browser/translate/after_translate_infobar_controller.h', - 'browser/translate/after_translate_infobar_controller.mm', - 'browser/translate/before_translate_infobar_controller.h', - 'browser/translate/before_translate_infobar_controller.mm', - 'browser/translate/chrome_ios_translate_client.h', - 'browser/translate/chrome_ios_translate_client.mm', - 'browser/translate/never_translate_infobar_controller.h', - 'browser/translate/never_translate_infobar_controller.mm', - 'browser/translate/translate_accept_languages_factory.cc', - 'browser/translate/translate_accept_languages_factory.h', - 'browser/translate/translate_infobar_tags.h', - 'browser/translate/translate_message_infobar_controller.h', - 'browser/translate/translate_message_infobar_controller.mm', - 'browser/translate/translate_service_ios.cc', - 'browser/translate/translate_service_ios.h', - 'browser/ui/UIView+SizeClassSupport.h', - 'browser/ui/UIView+SizeClassSupport.mm', - 'browser/ui/animation_util.h', - 'browser/ui/animation_util.mm', - 'browser/ui/autofill/autofill_client_ios.h', - 'browser/ui/autofill/autofill_client_ios.mm', - 'browser/ui/autofill/autofill_save_card_infobar.mm', - 'browser/ui/background_generator.h', - 'browser/ui/background_generator.mm', - 'browser/ui/browser_otr_state.h', - 'browser/ui/browser_otr_state.mm', - 'browser/ui/commands/UIKit+ChromeExecuteCommand.h', - 'browser/ui/commands/UIKit+ChromeExecuteCommand.mm', - 'browser/ui/commands/clear_browsing_data_command.h', - 'browser/ui/commands/clear_browsing_data_command.mm', - 'browser/ui/commands/generic_chrome_command.h', - 'browser/ui/commands/generic_chrome_command.mm', - 'browser/ui/commands/ios_command_ids.h', - 'browser/ui/commands/open_url_command.h', - 'browser/ui/commands/open_url_command.mm', - 'browser/ui/commands/reading_list_add_command.h', - 'browser/ui/commands/reading_list_add_command.mm', - 'browser/ui/commands/set_up_for_testing_command.h', - 'browser/ui/commands/set_up_for_testing_command.mm', - 'browser/ui/commands/show_mail_composer_command.h', - 'browser/ui/commands/show_mail_composer_command.mm', - 'browser/ui/commands/show_signin_command.h', - 'browser/ui/commands/show_signin_command.mm', - 'browser/ui/context_menu/context_menu_coordinator.h', - 'browser/ui/context_menu/context_menu_coordinator.mm', - 'browser/ui/file_locations.h', - 'browser/ui/file_locations.mm', - 'browser/ui/image_util.h', - 'browser/ui/image_util.mm', - 'browser/ui/keyboard/UIKeyCommand+Chrome.h', - 'browser/ui/keyboard/UIKeyCommand+Chrome.mm', - 'browser/ui/keyboard/hardware_keyboard_watcher.h', - 'browser/ui/keyboard/hardware_keyboard_watcher.mm', - 'browser/ui/native_content_controller.h', - 'browser/ui/native_content_controller.mm', - 'browser/ui/omnibox/web_omnibox_edit_controller.cc', - 'browser/ui/omnibox/web_omnibox_edit_controller.h', - 'browser/ui/orientation_limiting_navigation_controller.h', - 'browser/ui/orientation_limiting_navigation_controller.mm', - 'browser/ui/prerender_final_status.h', - 'browser/ui/reversed_animation.h', - 'browser/ui/reversed_animation.mm', - 'browser/ui/rtl_geometry.h', - 'browser/ui/rtl_geometry.mm', - 'browser/ui/show_mail_composer_util.h', - 'browser/ui/show_mail_composer_util.mm', - 'browser/ui/show_privacy_settings_util.h', - 'browser/ui/show_privacy_settings_util.mm', - 'browser/ui/side_swipe_gesture_recognizer.h', - 'browser/ui/side_swipe_gesture_recognizer.mm', - 'browser/ui/size_class_support_util.h', - 'browser/ui/size_class_support_util.mm', - 'browser/ui/ui_util.h', - 'browser/ui/ui_util.mm', - 'browser/ui/uikit_ui_util.h', - 'browser/ui/uikit_ui_util.mm', - 'browser/ui/url_loader.h', - 'browser/ui/webui/about_ui.cc', - 'browser/ui/webui/about_ui.h', - 'browser/ui/webui/crashes_ui.cc', - 'browser/ui/webui/crashes_ui.h', - 'browser/ui/webui/flags_ui.cc', - 'browser/ui/webui/flags_ui.h', - 'browser/ui/webui/gcm/gcm_internals_ui.cc', - 'browser/ui/webui/gcm/gcm_internals_ui.h', - 'browser/ui/webui/history/browsing_history_handler.cc', - 'browser/ui/webui/history/browsing_history_handler.h', - 'browser/ui/webui/history/favicon_source.cc', - 'browser/ui/webui/history/favicon_source.h', - 'browser/ui/webui/history/history_ui.h', - 'browser/ui/webui/history/history_ui.mm', - 'browser/ui/webui/history/metrics_handler.cc', - 'browser/ui/webui/history/metrics_handler.h', - 'browser/ui/webui/mojo_web_ui_ios_controller.h', - 'browser/ui/webui/net_export/net_export_ui.cc', - 'browser/ui/webui/net_export/net_export_ui.h', - 'browser/ui/webui/sync_internals/sync_internals_message_handler.cc', - 'browser/ui/webui/sync_internals/sync_internals_message_handler.h', - 'browser/ui/webui/sync_internals/sync_internals_ui.cc', - 'browser/ui/webui/sync_internals/sync_internals_ui.h', - 'browser/ui/webui/version_handler.cc', - 'browser/ui/webui/version_handler.h', - 'browser/ui/webui/version_ui.h', - 'browser/ui/webui/version_ui.mm', - 'browser/undo/bookmark_undo_service_factory.cc', - 'browser/undo/bookmark_undo_service_factory.h', - 'browser/updatable_config/updatable_array.h', - 'browser/updatable_config/updatable_array.mm', - 'browser/updatable_config/updatable_config_base.h', - 'browser/updatable_config/updatable_config_base.mm', - 'browser/updatable_config/updatable_dictionary.h', - 'browser/updatable_config/updatable_dictionary.mm', - 'browser/update_client/ios_chrome_update_query_params_delegate.cc', - 'browser/update_client/ios_chrome_update_query_params_delegate.h', - 'browser/variations/ios_chrome_variations_service_client.cc', - 'browser/variations/ios_chrome_variations_service_client.h', - 'browser/web/dom_altering_lock.h', - 'browser/web/dom_altering_lock.mm', - 'browser/web/resubmit_data_controller.h', - 'browser/web/resubmit_data_controller.mm', - 'browser/web_data_service_factory.cc', - 'browser/web_data_service_factory.h', - 'browser/web_resource/web_resource_util.cc', - 'browser/web_resource/web_resource_util.h', - 'browser/xcallback_parameters.h', - 'browser/xcallback_parameters.mm', - ], - 'conditions': [ - ['enable_rlz==1', { - 'dependencies': [ - '../../components/components.gyp:rlz', - 'ios_chrome_browser_rlz', - ], - }], - ], - }, - { - # GN version: //ios/chrome/browser:about_flags - # This is a separate target so that the 'defines' does not leak to the - # other files (which would increase the compilation time when changing - # the value). - 'target_name': 'ios_chrome_browser_about_flags', - 'type': 'static_library', - 'include_dirs': [ - '../..', - ], - 'dependencies': [ - '../../base/base.gyp:base', - '../../components/components.gyp:autofill_core_common', - '../../components/components.gyp:dom_distiller_core', - '../../components/components.gyp:flags_ui', - '../../components/components.gyp:sync_driver', - '../../components/components_strings.gyp:components_strings', - '../../google_apis/google_apis.gyp:google_apis', - '../web/ios_web.gyp:ios_web', - 'ios_chrome_resources.gyp:ios_strings_gen', - ], - 'sources': [ - 'browser/about_flags.h', - 'browser/about_flags.mm', - ], - 'defines': [ - 'GOOGLE_STAGING_API_URL="<(google_staging_api_url)"', - 'GOOGLE_STAGING_LSO_URL="<(google_staging_lso_url)"', - 'GOOGLE_TEST_API_URL="<(google_test_api_url)"', - 'GOOGLE_TEST_LSO_URL="<(google_test_lso_url)"', - 'GOOGLE_TEST_OAUTH_CLIENT_ID="<(google_test_oauth_client_id)"', - 'GOOGLE_TEST_OAUTH_CLIENT_SECRET="<(google_test_oauth_client_secret)"', - 'GOOGLE_TEST_OAUTH_URL="<(google_test_oauth_url)"', - 'GOOGLE_TEST_SYNC_URL="<(google_test_sync_url)"', - ], - 'variables': { - 'google_staging_api_url%': '', - 'google_staging_lso_url%': '', - 'google_test_api_url%': '', - 'google_test_lso_url%': '', - 'google_test_oauth_client_id%': '', - 'google_test_oauth_client_secret%': '', - 'google_test_oauth_url%': '', - 'google_test_sync_url%': '', - }, - }, - { - # GN version: //ios/chrome/browser:chrome_coordinators - 'target_name': 'ios_chrome_browser_chrome_coordinators', - 'type': 'static_library', - 'include_dirs': [ - '../..', - ], - 'dependencies': [ - '../../base/base.gyp:base', - ], - 'sources': [ - 'browser/chrome_coordinator.h', - 'browser/chrome_coordinator.mm', - 'browser/root_coordinator.h', - 'browser/root_coordinator.mm', - ] - }, - { - # GN version: //ios/chrome/common - 'target_name': 'ios_chrome_common', - 'type': 'static_library', - 'include_dirs': [ - '../..', - ], - 'dependencies': [ - '../../base/base.gyp:base', - '../../components/components.gyp:version_info', - 'app_group_mainapp', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', - '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', - ], - }, - 'sources': [ - 'common/channel_info.h', - 'common/channel_info.mm', - 'common/material_timing.h', - 'common/material_timing.mm', - 'common/string_util.h', - 'common/string_util.mm', - ], - }, - { - # GN version: //ios/chrome/browser:injected_js - 'target_name': 'injected_js', - 'type': 'none', - 'sources': [ - 'browser/find_in_page/resources/find_in_page.js', - 'browser/passwords/resources/credential_manager.js', - 'browser/passwords/resources/password_controller.js', - ], - 'includes': [ '../../ios/web/js_compile.gypi' ], - 'link_settings': { - 'mac_bundle_resources': [ - '<(SHARED_INTERMEDIATE_DIR)/credential_manager.js', - '<(SHARED_INTERMEDIATE_DIR)/find_in_page.js', - '<(SHARED_INTERMEDIATE_DIR)/password_controller.js', - ], - }, - }, - { - # GN version: //ios/chrome/common/app_group - 'target_name': 'app_group_common', - 'type': 'static_library', - 'sources': [ - 'common/app_group/app_group_constants.h', - 'common/app_group/app_group_constants.mm', - 'common/app_group/app_group_metrics.h', - 'common/app_group/app_group_metrics.mm', - ], - 'dependencies': [ - # This target will be included into application extensions and the list - # of its dependencies must be kept as short as possible. - '../../base/base.gyp:base', - '../../components/components.gyp:version_info', - ], - 'include_dirs': [ - '../..', - ], - }, - { - # GN version: //ios/chrome/common/app_group:client - 'target_name': 'app_group_client', - 'type': 'static_library', - 'sources': [ - 'common/app_group/app_group_metrics_client.h', - 'common/app_group/app_group_metrics_client.mm', - ], - 'dependencies': [ - # This target will be included into application extensions and the list - # of its dependencies must be kept as short as possible. - 'app_group_common', - ], - 'include_dirs': [ - '../..', - ], - }, - { - # GN version: //ios/chrome/common/app_group:main_app - 'target_name': 'app_group_mainapp', - 'type': 'static_library', - 'sources': [ - 'common/app_group/app_group_metrics_mainapp.h', - 'common/app_group/app_group_metrics_mainapp.mm', - ], - 'dependencies': [ - 'app_group_common', - ], - 'include_dirs': [ - '../..', - ], - }, - ], - 'conditions': [ - ['enable_rlz_support==1', { - 'targets': [ - { - # GN version: //ios/chrome/browser/rlz - 'target_name': 'ios_chrome_browser_rlz', - 'type': 'static_library', - 'sources': [ - 'browser/rlz/rlz_tracker_delegate_impl.cc', - 'browser/rlz/rlz_tracker_delegate_impl.h', - ], - 'dependencies': [ - '../../components/components.gyp:google_core_browser', - '../../components/components.gyp:omnibox_browser', - '../../components/components.gyp:rlz', - '../../components/components.gyp:search_engines', - '../../rlz/rlz.gyp:rlz_lib', - ], - }, - ], - }], - ], -} diff --git a/chromium/ios/chrome/ios_chrome_resources.gyp b/chromium/ios/chrome/ios_chrome_resources.gyp deleted file mode 100644 index b2116430d47..00000000000 --- a/chromium/ios/chrome/ios_chrome_resources.gyp +++ /dev/null @@ -1,266 +0,0 @@ -# Copyright 2012 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. - -{ - 'variables': { - 'chromium_code': 1, - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ios/chrome', - 'ui_string_overrider_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_locale_settings.h', - '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_strings.h', - '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/grit/ios_strings.h', - ], - 'ui_string_overrider_output_basename': - 'ios/chrome/browser/variations/ios_ui_string_overrider_factory', - 'ui_string_overrider_script_name': - '../../components/variations/service/generate_ui_string_overrider.py', - 'conditions': [ - ['branding=="Chromium"', { - 'ui_string_overrider_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_chromium_strings.h', - '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/grit/ios_chromium_strings.h', - ], - }], - ['branding=="Chrome"', { - 'ui_string_overrider_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/components/strings/grit/components_google_chrome_strings.h', - '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/grit/ios_google_chrome_strings.h', - ], - }], - ], - }, - 'targets': [ - { - 'target_name': 'ios_chrome_resources', - 'type': 'none', - 'dependencies': [ - 'ios_resources_gen', - 'ios_strings_gen', - 'ios_theme_resources_gen', - ], - }, - { - # GN version: //ios/chrome/app/strings - 'target_name': 'ios_strings_gen', - 'type': 'none', - 'hard_dependency': 1, - 'actions': [ - { - # GN version: //ios/chrome/app/strings:ios_strings - 'action_name': 'generate_ios_strings', - 'variables': { - 'grit_grd_file': 'app/strings/ios_strings.grd', - }, - 'includes': [ '../../build/grit_action.gypi' ], - }, - { - # GN version: //ios/chrome/app/strings:ios_chromium_strings - 'action_name': 'generate_ios_chromium_strings', - 'variables': { - 'grit_grd_file': 'app/strings/ios_chromium_strings.grd', - }, - 'includes': [ '../../build/grit_action.gypi' ], - }, - { - # GN version: //ios/chrome/app/strings:ios_google_chrome_strings - 'action_name': 'generate_ios_google_chrome_strings', - 'variables': { - 'grit_grd_file': 'app/strings/ios_google_chrome_strings.grd', - }, - 'includes': [ '../../build/grit_action.gypi' ], - }, - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - }, - }, - { - # GN version: //ios/chrome/app/resources - 'target_name': 'ios_resources_gen', - 'type': 'none', - 'hard_dependency': 1, - 'actions': [ - { - 'action_name': 'ios_resources', - 'variables': { - 'grit_grd_file': 'app/resources/ios_resources.grd', - }, - 'includes': [ '../../build/grit_action.gypi' ], - }, - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - }, - }, - { - # GN version: //ios/chrome/app/theme - 'target_name': 'ios_theme_resources_gen', - 'type': 'none', - 'hard_dependency': 1, - 'actions': [ - { - 'action_name': 'ios_theme_resources', - 'variables': { - 'grit_grd_file': 'app/theme/ios_theme_resources.grd', - }, - 'includes': [ '../../build/grit_action.gypi' ], - }, - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - }, - }, - { - # GN version: //ios/chrome/app/resources:packed_resources - 'target_name': 'ios_packed_resources', - 'type': 'none', - 'dependencies': [ - '../../components/components_strings.gyp:components_strings', - '../../net/net.gyp:net_resources', - '../../ui/resources/ui_resources.gyp:ui_resources', - '../../ui/strings/ui_strings.gyp:ui_strings', - 'ios_chrome_resources', - ], - 'actions': [ - { - # GN version: //ios/chrome/app/resources:repack_locales - 'action_name': 'repack_ios_locales', - 'variables': { - 'repack_locales_path': 'tools/build/ios_repack_locales.py', - }, - 'inputs': [ - '<(repack_locales_path)', - '<!@pymod_do_main(ios_repack_locales -i ' - '-s <(SHARED_INTERMEDIATE_DIR) ' - '-x <(SHARED_INTERMEDIATE_DIR)/repack_ios ' - '-b <(branding_path_component) ' - '<(locales))' - ], - 'outputs': [ - '<!@pymod_do_main(ios_repack_locales -o ' - '-s <(SHARED_INTERMEDIATE_DIR) ' - '-x <(SHARED_INTERMEDIATE_DIR)/repack_ios ' - '<(locales))' - ], - 'action': [ - 'python', - '<(repack_locales_path)', - '-x', '<(SHARED_INTERMEDIATE_DIR)/repack_ios', - '-s', '<(SHARED_INTERMEDIATE_DIR)', - '-b', '<(branding_path_component)', - '<@(locales)', - ], - }, - { - # GN version: //ios/chrome/app/resources:repack_scalable_resources - 'action_name': 'repack_ios_resources_100_percent', - 'variables': { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/components/components_resources_100_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/ios_theme_resources_100_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak', - ], - 'pak_output': '<(SHARED_INTERMEDIATE_DIR)/repack_ios/chrome_100_percent.pak', - }, - 'includes': [ '../../build/repack_action.gypi' ], - }, - { - # GN version: //ios/chrome/app/resources:repack_scalable_resources - 'action_name': 'repack_ios_resources_200_percent', - 'variables': { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/components/components_resources_200_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/ios_theme_resources_200_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_200_percent.pak', - ], - 'pak_output': '<(SHARED_INTERMEDIATE_DIR)/repack_ios/chrome_200_percent.pak', - }, - 'includes': [ '../../build/repack_action.gypi' ], - }, - { - # GN version: //ios/chrome/app/resources:repack_scalable_resources - 'action_name': 'repack_ios_resources_300_percent', - 'variables': { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/components/components_resources_300_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/ios_theme_resources_300_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_300_percent.pak', - ], - 'pak_output': '<(SHARED_INTERMEDIATE_DIR)/repack_ios/chrome_300_percent.pak', - }, - 'includes': [ '../../build/repack_action.gypi' ], - }, - { - # GN version: //ios/chrome/app/resources:repack_unscaled_resources - 'action_name': 'repack_ios_resources', - 'variables': { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/ios_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak', - ], - 'pak_output': '<(SHARED_INTERMEDIATE_DIR)/repack_ios/resources.pak', - }, - 'includes': [ '../../build/repack_action.gypi' ], - }, - ], - }, - { - # GN version: //ios/chrome/browser/variations:ios_chrome_ui_string_overrider_factory - 'target_name': 'ios_chrome_ui_string_overrider_factory_gen', - 'type': 'none', - 'hard_dependency': 1, - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - }, - 'dependencies': [ - '../../components/components_strings.gyp:components_strings', - 'ios_strings_gen', - ], - 'actions': [ - { - 'action_name': 'generate_ios_ui_string_overrider', - 'inputs': [ - '<(ui_string_overrider_script_name)', - '<@(ui_string_overrider_inputs)', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/<(ui_string_overrider_output_basename).cc', - '<(SHARED_INTERMEDIATE_DIR)/<(ui_string_overrider_output_basename).h', - ], - 'action': [ - 'python', - '<(ui_string_overrider_script_name)', - '-o', '<(SHARED_INTERMEDIATE_DIR)', - '-S', '<(ui_string_overrider_output_basename).cc', - '-H', '<(ui_string_overrider_output_basename).h', - '<@(ui_string_overrider_inputs)', - ], - }, - ], - }, - { - # GN version: //ios/chrome/browser/variations:ios_chrome_ui_string_overrider_factory - 'target_name': 'ios_chrome_ui_string_overrider_factory', - 'type': 'static_library', - 'dependencies': [ - '../../components/components.gyp:variations_service', - 'ios_chrome_ui_string_overrider_factory_gen', - ], - 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/<(ui_string_overrider_output_basename).cc', - '<(SHARED_INTERMEDIATE_DIR)/<(ui_string_overrider_output_basename).h', - ], - }, - ], -} diff --git a/chromium/ios/chrome/ios_chrome_resources_bundle.gypi b/chromium/ios/chrome/ios_chrome_resources_bundle.gypi deleted file mode 100644 index f37a61a6410..00000000000 --- a/chromium/ios/chrome/ios_chrome_resources_bundle.gypi +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2015 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. -{ - 'dependencies': [ - '<(DEPTH)/ios/chrome/ios_chrome_resources.gyp:ios_packed_resources', - ], - 'mac_bundle_resources': [ - '<(SHARED_INTERMEDIATE_DIR)/repack_ios/chrome_100_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/repack_ios/chrome_200_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/repack_ios/chrome_300_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/repack_ios/resources.pak', - '<!@pymod_do_main(ios_repack_locales -o -s <(SHARED_INTERMEDIATE_DIR) ' - '-x <(SHARED_INTERMEDIATE_DIR)/repack_ios <(locales))', - ], -} diff --git a/chromium/ios/chrome/ios_chrome_tests.gyp b/chromium/ios/chrome/ios_chrome_tests.gyp deleted file mode 100644 index ef28b4a4cb7..00000000000 --- a/chromium/ios/chrome/ios_chrome_tests.gyp +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - # GN version: //ios/chrome:ios_chrome_unittests - 'target_name': 'ios_chrome_unittests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - '../../base/base.gyp:base', - '../../base/base.gyp:test_support_base', - '../../components/components.gyp:bookmarks_test_support', - '../../components/components.gyp:favicon_base', - '../../components/components.gyp:metrics', - '../../components/components.gyp:metrics_test_support', - '../../components/components.gyp:password_manager_core_browser', - '../../components/components.gyp:password_manager_core_browser_test_support', - '../../components/components.gyp:password_manager_core_common', - '../../components/components.gyp:syncable_prefs_test_support', - '../../components/components.gyp:update_client', - '../../components/components.gyp:version_info', - '../../components/prefs/prefs.gyp:prefs_test_support', - '../../net/net.gyp:net_test_support', - '../../skia/skia.gyp:skia', - '../../testing/gmock.gyp:gmock', - '../../testing/gtest.gyp:gtest', - '../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', - '../../third_party/ocmock/ocmock.gyp:ocmock', - '../../ui/gfx/gfx.gyp:gfx', - '../../ui/gfx/gfx.gyp:gfx_test_support', - '../web/ios_web.gyp:ios_web', - '../web/ios_web.gyp:ios_web_test_support', - 'ios_chrome.gyp:ios_chrome_app', - 'ios_chrome.gyp:ios_chrome_browser', - 'ios_chrome.gyp:ios_chrome_common', - 'ios_chrome_test_support', - ], - 'mac_bundle_resources': [ - 'browser/ui/native_content_controller_test.xib' - ], - 'sources': [ - 'app/application_delegate/memory_warning_helper_unittest.mm', - 'app/safe_mode_util_unittest.cc', - 'browser/chrome_url_util_unittest.mm', - 'browser/crash_loop_detection_util_unittest.mm', - 'browser/favicon/large_icon_cache_unittest.cc', - 'browser/geolocation/CLLocation+XGeoHeaderTest.mm', - 'browser/geolocation/location_manager_unittest.mm', - 'browser/geolocation/omnibox_geolocation_local_state_unittest.mm', - 'browser/install_time_util_unittest.mm', - 'browser/installation_notifier_unittest.mm', - 'browser/metrics/ios_chrome_metrics_service_accessor_unittest.cc', - 'browser/metrics/ios_chrome_stability_metrics_provider_unittest.cc', - 'browser/metrics/mobile_session_shutdown_metrics_provider_unittest.mm', - 'browser/metrics/previous_session_info_unittest.mm', - 'browser/net/cookie_util_unittest.mm', - 'browser/net/image_fetcher_unittest.mm', - 'browser/net/metrics_network_client_unittest.mm', - 'browser/net/retryable_url_fetcher_unittest.mm', - 'browser/notification_promo_unittest.cc', - 'browser/passwords/password_controller_unittest.mm', - 'browser/reading_list/reading_list_entry_unittest.cc', - 'browser/reading_list/reading_list_model_unittest.cc', - 'browser/signin/chrome_identity_service_observer_bridge_unittest.mm', - 'browser/signin/gaia_auth_fetcher_ios_unittest.mm', - 'browser/snapshots/lru_cache_unittest.mm', - 'browser/snapshots/snapshot_cache_unittest.mm', - 'browser/snapshots/snapshots_util_unittest.mm', - 'browser/ssl/ios_ssl_error_handler_unittest.mm', - 'browser/translate/translate_service_ios_unittest.cc', - 'browser/ui/commands/set_up_for_testing_command_unittest.mm', - 'browser/ui/context_menu/context_menu_coordinator_unittest.mm', - 'browser/ui/keyboard/UIKeyCommand+ChromeTest.mm', - 'browser/ui/keyboard/hardware_keyboard_watcher_unittest.mm', - 'browser/ui/native_content_controller_unittest.mm', - 'browser/ui/ui_util_unittest.mm', - 'browser/ui/uikit_ui_util_unittest.mm', - 'browser/update_client/ios_chrome_update_query_params_delegate_unittest.cc', - 'browser/web_resource/web_resource_util_unittest.cc', - 'common/string_util_unittest.mm', - 'test/google_toolbox_unittest.mm', - ], - 'actions': [ - { - 'action_name': 'copy_ios_chrome_test_data', - 'variables': { - 'test_data_files': [ - '../../net/data/ssl/certificates/', - 'test/data/webdata/bookmarkimages', - ], - 'test_data_prefix': 'ios/chrome', - }, - 'includes': [ '../../build/copy_test_data_ios.gypi' ] - }, - ], - 'includes': ['ios_chrome_resources_bundle.gypi'], - }, - { - # GN version: //ios/chrome/browser:test_support - 'target_name': 'ios_chrome_test_support', - 'type': 'static_library', - 'dependencies': [ - '../../base/base.gyp:base', - '../../components/components.gyp:keyed_service_core', - '../../components/components.gyp:keyed_service_ios', - '../../components/components.gyp:password_manager_core_browser_test_support', - '../../components/components.gyp:signin_ios_browser_test_support', - '../../components/components.gyp:sync_driver_test_support', - '../../sync/sync.gyp:sync', - '../../testing/gmock.gyp:gmock', - '../../testing/gtest.gyp:gtest', - '../../ui/base/ui_base.gyp:ui_base', - '../../url/url.gyp:url_lib', - '../provider/ios_provider_chrome.gyp:ios_provider_chrome_browser', - '../provider/ios_provider_chrome.gyp:ios_provider_chrome_browser_test_support', - 'ios_chrome.gyp:ios_chrome_browser', - ], - 'sources': [ - 'browser/browser_state/test_chrome_browser_state.h', - 'browser/browser_state/test_chrome_browser_state.mm', - 'browser/browser_state/test_chrome_browser_state_isolated_context.h', - 'browser/browser_state/test_chrome_browser_state_isolated_context.mm', - 'browser/browser_state/test_chrome_browser_state_manager.cc', - 'browser/browser_state/test_chrome_browser_state_manager.h', - 'browser/geolocation/location_manager+Testing.h', - 'browser/geolocation/test_location_manager.h', - 'browser/geolocation/test_location_manager.mm', - 'browser/net/mock_image_fetcher.h', - 'browser/net/mock_image_fetcher.mm', - 'browser/signin/fake_oauth2_token_service_builder.h', - 'browser/signin/fake_oauth2_token_service_builder.mm', - 'browser/signin/fake_signin_manager_builder.cc', - 'browser/signin/fake_signin_manager_builder.h', - 'browser/sync/fake_sync_service_factory.cc', - 'browser/sync/fake_sync_service_factory.h', - 'browser/sync/ios_chrome_profile_sync_test_util.cc', - 'browser/sync/ios_chrome_profile_sync_test_util.h', - 'browser/sync/sync_setup_service_mock.cc', - 'browser/sync/sync_setup_service_mock.h', - 'test/block_cleanup_test.h', - 'test/block_cleanup_test.mm', - 'test/ios_chrome_scoped_testing_chrome_browser_provider.h', - 'test/ios_chrome_scoped_testing_chrome_browser_provider.mm', - 'test/ios_chrome_scoped_testing_local_state.cc', - 'test/ios_chrome_scoped_testing_local_state.h', - 'test/ios_chrome_unit_test_suite.h', - 'test/ios_chrome_unit_test_suite.mm', - 'test/run_all_unittests.cc', - 'test/testing_application_context.h', - 'test/testing_application_context.mm', - ], - }, - ], -} diff --git a/chromium/ios/chrome/ios_share_extension_resources.gyp b/chromium/ios/chrome/ios_share_extension_resources.gyp deleted file mode 100644 index afe3b70edba..00000000000 --- a/chromium/ios/chrome/ios_share_extension_resources.gyp +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 2015 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. - -{ - 'variables': { - 'chromium_code': 1, - 'grit_base_dir': '<(SHARED_INTERMEDIATE_DIR)', - 'grit_out_dir': '<(grit_base_dir)/ios/share_extension', - }, - 'targets': [ - { - # GN version: //ios/chrome/share_extensions:resources - 'target_name': 'ios_share_extension_resources', - 'type': 'none', - 'dependencies': [ - 'ios_share_extension_strings_gen', - ], - }, - { - # GN version: //ios/chrome/share_extensions/strings - 'target_name': 'ios_share_extension_strings_gen', - 'type': 'none', - 'hard_dependency': 1, - 'actions': [ - { - 'action_name': 'generate_ios_share_extension_strings', - 'variables': { - 'grit_grd_file': 'share_extension/strings/ios_share_extension_strings.grd', - }, - 'includes': [ '../../build/grit_action.gypi' ], - }, - ], - 'includes': [ '../../build/grit_target.gypi' ], - # Override the exported include-dirs; ios/chrome/grit/ios_*strings.h - # should only be referenceable as ios/chrome/grit to allow DEPS-time - # checking of usage. - 'direct_dependent_settings': { - 'include_dirs': [ - '<(grit_base_dir)', - ], - 'include_dirs!': [ - '<(grit_out_dir)', - ], - } - }, - { - # GN version: //ios/chrome/share_extensions:packed_resources - 'target_name': 'ios_share_extension_packed_resources', - 'type': 'none', - 'dependencies': [ - 'ios_share_extension_resources', - ], - 'actions': [ - { - 'action_name': 'repack_ios_share_extension_locales', - 'variables': { - 'repack_locales_path': 'tools/build/ios_repack_extension_locales.py', - }, - 'inputs': [ - 'tools/build/ios_repack_extension_locales.py', - '<!@pymod_do_main(ios_repack_extension_locales -i ' - '-n share_extension ' - '-s <(SHARED_INTERMEDIATE_DIR) ' - '-x <(SHARED_INTERMEDIATE_DIR)/repack_share_extension ' - '-b <(branding_path_component) ' - '<(locales))' - ], - 'outputs': [ - '<!@pymod_do_main(ios_repack_extension_locales -o ' - '-n share_extension ' - '-s <(SHARED_INTERMEDIATE_DIR) ' - '-x <(SHARED_INTERMEDIATE_DIR)/repack_share_extension ' - '<(locales))' - ], - 'action': [ - 'python', - 'tools/build/ios_repack_extension_locales.py', - '-n', 'share_extension', - '-x', '<(SHARED_INTERMEDIATE_DIR)/repack_share_extension', - '-s', '<(SHARED_INTERMEDIATE_DIR)', - '-b', '<(branding_path_component)', - '<@(locales)', - ], - }, - ], - }, - ], -} - diff --git a/chromium/ios/chrome/ios_today_extension_resources.gyp b/chromium/ios/chrome/ios_today_extension_resources.gyp deleted file mode 100644 index 90ac125e7c9..00000000000 --- a/chromium/ios/chrome/ios_today_extension_resources.gyp +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 2015 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. - -{ - 'variables': { - 'chromium_code': 1, - 'grit_base_dir': '<(SHARED_INTERMEDIATE_DIR)', - 'grit_out_dir': '<(grit_base_dir)/ios/today_extension', - }, - 'targets': [ - { - # GN version: //ios/chrome/today_extension:resources - 'target_name': 'ios_today_extension_resources', - 'type': 'none', - 'dependencies': [ - 'ios_today_extension_strings_gen', - ], - }, - { - # GN version: //ios/chrome/today_extension/strings - 'target_name': 'ios_today_extension_strings_gen', - 'type': 'none', - 'hard_dependency': 1, - 'actions': [ - { - 'action_name': 'generate_ios_today_extension_strings', - 'variables': { - 'grit_grd_file': 'today_extension/strings/ios_today_extension_strings.grd', - }, - 'includes': [ '../../build/grit_action.gypi' ], - }, - ], - 'includes': [ '../../build/grit_target.gypi' ], - # Override the exported include-dirs; ios/chrome/grit/ios_*strings.h - # should only be referenceable as ios/chrome/grit to allow DEPS-time - # checking of usage. - 'direct_dependent_settings': { - 'include_dirs': [ - '<(grit_base_dir)', - ], - 'include_dirs!': [ - '<(grit_out_dir)', - ], - } - }, - { - # GN version: //ios/chrome/today_extension:packed_resources - 'target_name': 'ios_today_extension_packed_resources', - 'type': 'none', - 'dependencies': [ - 'ios_today_extension_resources', - ], - 'actions': [ - { - 'action_name': 'repack_ios_today_extension_locales', - 'variables': { - 'repack_locales_path': 'tools/build/ios_repack_extension_locales.py', - }, - 'inputs': [ - 'tools/build/ios_repack_extension_locales.py', - '<!@pymod_do_main(ios_repack_extension_locales -i ' - '-n today_extension ' - '-s <(SHARED_INTERMEDIATE_DIR) ' - '-x <(SHARED_INTERMEDIATE_DIR)/repack_today_extension ' - '-b <(branding_path_component) ' - '<(locales))' - ], - 'outputs': [ - '<!@pymod_do_main(ios_repack_extension_locales -o ' - '-n today_extension ' - '-s <(SHARED_INTERMEDIATE_DIR) ' - '-x <(SHARED_INTERMEDIATE_DIR)/repack_today_extension ' - '<(locales))' - ], - 'action': [ - 'python', - 'tools/build/ios_repack_extension_locales.py', - '-n', 'today_extension', - '-x', '<(SHARED_INTERMEDIATE_DIR)/repack_today_extension', - '-s', '<(SHARED_INTERMEDIATE_DIR)', - '-b', '<(branding_path_component)', - '<@(locales)', - ], - }, - ], - }, - ], -} - diff --git a/chromium/ios/chrome/ios_today_extension_resources_bundle.gypi b/chromium/ios/chrome/ios_today_extension_resources_bundle.gypi deleted file mode 100644 index cddc6443850..00000000000 --- a/chromium/ios/chrome/ios_today_extension_resources_bundle.gypi +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2015 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. -{ - 'dependencies': [ - '<(DEPTH)/ios/chrome/ios_today_extension_resources.gyp:ios_today_extension_packed_resources', - ], - 'mac_bundle_resources': [ - '<!@pymod_do_main(ios_repack_extension_locales -n today_extension -o ' - '-s <(SHARED_INTERMEDIATE_DIR) ' - '-x <(SHARED_INTERMEDIATE_DIR)/repack_today_extension <(locales))', - ], -} diff --git a/chromium/ios/chrome/today_extension/BUILD.gn b/chromium/ios/chrome/today_extension/BUILD.gn index ffa17a9af7a..88d5c68f1bf 100644 --- a/chromium/ios/chrome/today_extension/BUILD.gn +++ b/chromium/ios/chrome/today_extension/BUILD.gn @@ -15,4 +15,5 @@ extension_repack_all_locales("packed_resources") { extension = "today_extension" input_locales = ios_packed_locales output_locales = ios_packed_locales_as_mac_outputs + copy_data_to_bundle = true } diff --git a/chromium/ios/chrome/tools/strings/generate_localizable_strings.gyp b/chromium/ios/chrome/tools/strings/generate_localizable_strings.gyp deleted file mode 100644 index bfe51f0f3a3..00000000000 --- a/chromium/ios/chrome/tools/strings/generate_localizable_strings.gyp +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2016 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. - -# Builds an OS X command line tool to generate Localizable.strings and -# InfoPlist.strings from compiled locales.pak. - -{ - 'targets': [ - { - 'target_name': 'generate_localizable_strings', - 'type': 'executable', - 'toolsets': ['host'], - 'dependencies': [ - '../../../../base/base.gyp:base', - '../../../../ui/base/ui_base.gyp:ui_data_pack', - ], - 'sources': [ - 'generate_localizable_strings.mm', - ], - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - ], - }, - ], -} diff --git a/chromium/ios/consumer/ios_consumer_base.gyp b/chromium/ios/consumer/ios_consumer_base.gyp deleted file mode 100644 index 0b1c7492f8d..00000000000 --- a/chromium/ios/consumer/ios_consumer_base.gyp +++ /dev/null @@ -1,25 +0,0 @@ -# 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. -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - # GN version: //ios/public/consumer/base - 'target_name': 'ios_consumer_base', - 'type': 'static_library', - 'dependencies': [ - '../../base/base.gyp:base', - ], - 'include_dirs': [ - '../..', - ], - 'sources': [ - '../public/consumer/base/debugger.h', - 'base/debugger.mm', - ], - }, - ], -} diff --git a/chromium/ios/crnet/BUILD.gn b/chromium/ios/crnet/BUILD.gn new file mode 100644 index 00000000000..b35b36d43e3 --- /dev/null +++ b/chromium/ios/crnet/BUILD.gn @@ -0,0 +1,134 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/buildflag_header.gni") +import("//build/config/ios/rules.gni") +import("//build/config/mac/symbols.gni") +import("//build/mac/tweak_info_plist.gni") +import("//build/util/version.gni") +import("//testing/test.gni") +import("//url/features.gni") + +assert(!is_component_build, "CrNet requires static library build.") + +source_set("crnet_sources") { + deps = [ + "//base:base", + "//components/metrics:metrics", + "//components/metrics/proto:proto", + "//components/prefs:prefs", + "//ios/net", + "//ios/web:user_agent", + "//net", + "//url", + "//url:url_features", + ] + + sources = [ + "CrNet.h", + "CrNet.mm", + "crnet_environment.h", + "crnet_environment.mm", + "sdch_owner_pref_storage.cc", + "sdch_owner_pref_storage.h", + ] + + if (!use_platform_icu_alternatives) { + deps += [ "//base:i18n" ] + } +} + +# Tweak |info_plist| with current version and revision. +tweak_info_plist("tweak_crnet_plist") { + info_plist = "Info.plist" + args = [] +} + +bundle_data("crnet_framework_resources") { + # This bundle contains "Accept-Languages" header values for known locales. + # TODO(mef): These strings should be auto-generated from chrome's .xtb + # files, not hardcoded. + sources = [ + "Resources/Localization/am.lproj", + "Resources/Localization/ar.lproj", + "Resources/Localization/bg.lproj", + "Resources/Localization/bn.lproj", + "Resources/Localization/ca.lproj", + "Resources/Localization/cs.lproj", + "Resources/Localization/da.lproj", + "Resources/Localization/de.lproj", + "Resources/Localization/el.lproj", + "Resources/Localization/en-GB.lproj", + "Resources/Localization/en.lproj", + "Resources/Localization/es-419.lproj", + "Resources/Localization/es.lproj", + "Resources/Localization/fa.lproj", + "Resources/Localization/fi.lproj", + "Resources/Localization/fil.lproj", + "Resources/Localization/fr.lproj", + "Resources/Localization/gu.lproj", + "Resources/Localization/he.lproj", + "Resources/Localization/hi.lproj", + "Resources/Localization/hr.lproj", + "Resources/Localization/hu.lproj", + "Resources/Localization/id.lproj", + "Resources/Localization/it.lproj", + "Resources/Localization/ja.lproj", + "Resources/Localization/kn.lproj", + "Resources/Localization/ko.lproj", + "Resources/Localization/lt.lproj", + "Resources/Localization/lv.lproj", + "Resources/Localization/ml.lproj", + "Resources/Localization/mr.lproj", + "Resources/Localization/ms.lproj", + "Resources/Localization/nb.lproj", + "Resources/Localization/nl.lproj", + "Resources/Localization/pl.lproj", + "Resources/Localization/pt-BR.lproj", + "Resources/Localization/pt-PT.lproj", + "Resources/Localization/pt.lproj", + "Resources/Localization/ro.lproj", + "Resources/Localization/ru.lproj", + "Resources/Localization/sk.lproj", + "Resources/Localization/sl.lproj", + "Resources/Localization/sr.lproj", + "Resources/Localization/sv.lproj", + "Resources/Localization/sw.lproj", + "Resources/Localization/ta.lproj", + "Resources/Localization/te.lproj", + "Resources/Localization/th.lproj", + "Resources/Localization/tr.lproj", + "Resources/Localization/uk.lproj", + "Resources/Localization/vi.lproj", + "Resources/Localization/zh-Hans.lproj", + "Resources/Localization/zh-Hant.lproj", + "Resources/Localization/zh.lproj", + ] + outputs = [ + "{{bundle_resources_dir}}/crnet_resources.bundle/{{source_file_part}}", + ] +} + +ios_framework_bundle("crnet_framework") { + output_name = "CrNet" + info_plist_target = ":tweak_crnet_plist" + + deps = [ + ":crnet_framework_resources", + ":crnet_sources", + "//base", + "//net:net", + ] + + libs = [ "UIKit.Framework" ] + + public_headers = [ "CrNet.h" ] + + sources = [ + "CrNet.h", + ] + + configs -= [ "//build/config/compiler:default_symbols" ] + configs += [ "//build/config/compiler:symbols" ] +} diff --git a/chromium/ios/crnet/crnet.gyp b/chromium/ios/crnet/crnet.gyp deleted file mode 100644 index eb38734c9a2..00000000000 --- a/chromium/ios/crnet/crnet.gyp +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - 'target_name': 'crnet', - 'type': 'static_library', - 'dependencies': [ - '../../components/prefs/prefs.gyp:prefs', - '../../ios/net/ios_net.gyp:ios_net', - '../../ios/web/ios_web.gyp:user_agent', - '../../net/net.gyp:net', - 'crnet_resources', - ], - 'mac_framework_headers': [ - 'CrNet.h', - ], - 'direct_dependent_settings': { - 'include_dirs': [ '.' ], - }, - 'sources': [ - # TODO(ellyjones): http://crbug.com/485144 - '../../net/url_request/sdch_dictionary_fetcher.cc', - '../../net/url_request/sdch_dictionary_fetcher.h', - 'CrNet.h', - 'CrNet.mm', - 'crnet_environment.h', - 'crnet_environment.mm', - 'sdch_owner_pref_storage.cc', - 'sdch_owner_pref_storage.h', - ], - 'defines': [ - # TODO(stuartmorgan): Revisit the way this is set, and the above is - # built, once the web/ layer is complete. Note that this setting doesn't - # propagate to any included targets. - 'CRNET=1', - ], - 'xcode_settings': { - 'DEAD_CODE_STRIPPING': 'YES', - }, - }, - { - 'target_name': 'crnet_framework', - 'product_name': 'CrNet', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ - 'CrNet.h', - 'CrNet.mm', - 'crnet_environment.h', - 'crnet_environment.mm', - 'sdch_owner_pref_storage.cc', - 'sdch_owner_pref_storage.h', - 'sdch_owner_pref_storage.cc', - ], - 'mac_framework_headers': [ - 'CrNet.h', - ], - 'link_settings': { - 'libraries': [ - 'Foundation.framework', - ], - }, - 'xcode_settings': { - 'DEBUGGING_SYMBOLS': 'YES', - 'INFOPLIST_FILE': 'Info.plist', - 'LD_DYLIB_INSTALL_NAME': '@loader_path/Frameworks/CrNet.framework/CrNet', - }, - 'dependencies': [ - '../../base/base.gyp:base', - '../../components/prefs/prefs.gyp:prefs', - '../../ios/net/ios_net.gyp:ios_net', - '../../ios/web/ios_web.gyp:user_agent', - '../../net/net.gyp:net', - 'crnet_resources', - ], - 'configurations': { - 'Debug_Base': { - 'xcode_settings': { - 'DEPLOYMENT_POSTPROCESSING': 'NO', - 'DEBUG_INFORMATION_FORMAT': 'dwarf', - 'STRIP_INSTALLED_PRODUCT': 'NO', - } - }, - 'Release_Base': { - 'xcode_settings': { - 'DEPLOYMENT_POSTPROCESSING': 'YES', - 'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym', - 'STRIP_INSTALLED_PRODUCT': 'YES', - 'STRIP_STYLE': 'non-global', - } - }, - }, - }, - { - # This bundle contains "Accept-Languages" header values for known locales. - # TODO(huey): These strings should be auto-generated from chrome's .xtb - # files, not hardcoded. - 'target_name': 'crnet_resources', - 'type': 'loadable_module', - 'mac_bundle': 1, - 'mac_bundle_resources': [ - 'Resources/Localization/am.lproj/Localizable.strings', - 'Resources/Localization/ar.lproj/Localizable.strings', - 'Resources/Localization/bg.lproj/Localizable.strings', - 'Resources/Localization/bn.lproj/Localizable.strings', - 'Resources/Localization/ca.lproj/Localizable.strings', - 'Resources/Localization/cs.lproj/Localizable.strings', - 'Resources/Localization/da.lproj/Localizable.strings', - 'Resources/Localization/de.lproj/Localizable.strings', - 'Resources/Localization/el.lproj/Localizable.strings', - 'Resources/Localization/en-GB.lproj/Localizable.strings', - 'Resources/Localization/en.lproj/Localizable.strings', - 'Resources/Localization/es-419.lproj/Localizable.strings', - 'Resources/Localization/es.lproj/Localizable.strings', - 'Resources/Localization/fa.lproj/Localizable.strings', - 'Resources/Localization/fi.lproj/Localizable.strings', - 'Resources/Localization/fil.lproj/Localizable.strings', - 'Resources/Localization/fr.lproj/Localizable.strings', - 'Resources/Localization/gu.lproj/Localizable.strings', - 'Resources/Localization/he.lproj/Localizable.strings', - 'Resources/Localization/hi.lproj/Localizable.strings', - 'Resources/Localization/hr.lproj/Localizable.strings', - 'Resources/Localization/hu.lproj/Localizable.strings', - 'Resources/Localization/id.lproj/Localizable.strings', - 'Resources/Localization/it.lproj/Localizable.strings', - 'Resources/Localization/ja.lproj/Localizable.strings', - 'Resources/Localization/kn.lproj/Localizable.strings', - 'Resources/Localization/ko.lproj/Localizable.strings', - 'Resources/Localization/lt.lproj/Localizable.strings', - 'Resources/Localization/lv.lproj/Localizable.strings', - 'Resources/Localization/ml.lproj/Localizable.strings', - 'Resources/Localization/mr.lproj/Localizable.strings', - 'Resources/Localization/ms.lproj/Localizable.strings', - 'Resources/Localization/nb.lproj/Localizable.strings', - 'Resources/Localization/nl.lproj/Localizable.strings', - 'Resources/Localization/pl.lproj/Localizable.strings', - 'Resources/Localization/pt-BR.lproj/Localizable.strings', - 'Resources/Localization/pt-PT.lproj/Localizable.strings', - 'Resources/Localization/pt.lproj/Localizable.strings', - 'Resources/Localization/ro.lproj/Localizable.strings', - 'Resources/Localization/ru.lproj/Localizable.strings', - 'Resources/Localization/sk.lproj/Localizable.strings', - 'Resources/Localization/sl.lproj/Localizable.strings', - 'Resources/Localization/sr.lproj/Localizable.strings', - 'Resources/Localization/sv.lproj/Localizable.strings', - 'Resources/Localization/sw.lproj/Localizable.strings', - 'Resources/Localization/ta.lproj/Localizable.strings', - 'Resources/Localization/te.lproj/Localizable.strings', - 'Resources/Localization/th.lproj/Localizable.strings', - 'Resources/Localization/tr.lproj/Localizable.strings', - 'Resources/Localization/uk.lproj/Localizable.strings', - 'Resources/Localization/vi.lproj/Localizable.strings', - 'Resources/Localization/zh-Hans.lproj/Localizable.strings', - 'Resources/Localization/zh-Hant.lproj/Localizable.strings', - 'Resources/Localization/zh.lproj/Localizable.strings', - ], - 'all_dependent_settings': { - 'link_settings': { - 'mac_bundle_resources': [ - '>(PRODUCT_DIR)/crnet_resources.bundle', - ], - }, - }, - }, - ], -} diff --git a/chromium/ios/crnet/crnet_consumer/BUILD.gn b/chromium/ios/crnet/crnet_consumer/BUILD.gn new file mode 100644 index 00000000000..d67c65aef69 --- /dev/null +++ b/chromium/ios/crnet/crnet_consumer/BUILD.gn @@ -0,0 +1,30 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/ios/rules.gni") + +ios_app_bundle("crnet_consumer") { + info_plist = "crnet-consumer-Info.plist" + + deps = [ + "//base", + "//ios/crnet:crnet_framework+link", + + # All shared libraries must have the sanitizer deps to properly link in + # asan mode (this target will be empty in other cases). + "//build/config/sanitizers:deps", + ] + + sources = [ + "crnet_consumer_app_delegate.h", + "crnet_consumer_app_delegate.mm", + "crnet_consumer_view_controller.h", + "crnet_consumer_view_controller.m", + "main.mm", + ] + + bundle_deps = [ "//ios/crnet:crnet_framework+bundle" ] + + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/ios/crnet/crnet_consumer/crnet_consumer.gyp b/chromium/ios/crnet/crnet_consumer/crnet_consumer.gyp deleted file mode 100644 index b89dfcc5bdd..00000000000 --- a/chromium/ios/crnet/crnet_consumer/crnet_consumer.gyp +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [], - 'conditions': [ - # Our shared library hack only works with ninja; xcode cannot generate - # iOS build targets for dynamic libraries. - ['"<(GENERATOR)"=="ninja"', { - 'targets': [ - { - 'target_name': 'crnet_consumer', - 'type': 'executable', - 'mac_bundle': 1, - 'dependencies': [ - '../../../ios/crnet/crnet_pack.gyp:crnet_pack', - ], - 'sources': [ - 'crnet_consumer_app_delegate.h', - 'crnet_consumer_app_delegate.mm', - 'crnet_consumer_view_controller.h', - 'crnet_consumer_view_controller.m', - 'main.mm', - ], - 'mac_bundle_resources': [ - '../../../third_party/icu/common/icudtl.dat', - 'Default.png', - 'crnet-consumer-Info.plist', - ], - 'include_dirs': [ - '../../..', - '..', - ], - 'link_settings': { - 'libraries': [ - '<(PRODUCT_DIR)/libcrnet_standalone.a', - '$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework', - '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', - '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework', - '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', - '$(SDKROOT)/System/Library/Frameworks/Security.framework', - '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework', - ], - 'xcode_settings': { - 'OTHER_LDFLAGS': [ - '-lresolv', - '-lsqlite3', - '-lxml2', - ], - }, - }, - 'xcode_settings': { - 'CLANG_ENABLE_OBJC_ARC': 'YES', - 'DEAD_CODE_STRIPPING': 'YES', - 'INFOPLIST_FILE': 'crnet-consumer-Info.plist', - }, - }, - ], - }], - ], -} diff --git a/chromium/ios/crnet/crnet_pack.gyp b/chromium/ios/crnet/crnet_pack.gyp deleted file mode 100644 index 79d654599e9..00000000000 --- a/chromium/ios/crnet/crnet_pack.gyp +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [], - 'conditions': [ - # Our shared library hack only works with ninja; xcode cannot generate - # iOS build targets for dynamic libraries. More details below. - ['"<(GENERATOR)"=="ninja"', { - 'targets': [ - { - 'target_name': 'crnet_dummy', - 'type': 'executable', - 'mac_bundle': 1, - 'dependencies': [ - '../../ios/crnet/crnet.gyp:crnet', - ], - 'sources': [ - '../../ios/build/packaging/dummy_main.mm', - ], - 'include_dirs': [ - '../..', - ], - 'xcode_settings': { - 'INFOPLIST_FILE': '../../ios/build/packaging/dummy-Info.plist', - }, - }, - { - # Build this target to package a standalone CrNet in a single - # .a file. - 'target_name': 'crnet_pack', - 'type': 'none', - 'dependencies': [ - # Depend on the dummy target so that all of CrNet's dependencies - # are built before packaging. - 'crnet_dummy', - ], - 'actions': [ - { - 'action_name': 'Package CrNet', - 'variables': { - 'tool_path': - '../../ios/build/packaging/link_dependencies.py', - }, - - # Actions need an inputs list, even if it's empty. - 'inputs': [ - '<(tool_path)', - '<(PRODUCT_DIR)/crnet_dummy.app/crnet_dummy', - ], - # Only specify one output, since this will be libtool's output. - 'outputs': [ '<(PRODUCT_DIR)/libcrnet_standalone.a' ], - 'action': ['<(tool_path)', - '<(PRODUCT_DIR)', - 'crnet_dummy.app/crnet_dummy', - '<@(_outputs)', - ], - }, - ], - }, - ], - }], - ], -} diff --git a/chromium/ios/crnet/test/BUILD.gn b/chromium/ios/crnet/test/BUILD.gn new file mode 100644 index 00000000000..f96fe823e0e --- /dev/null +++ b/chromium/ios/crnet/test/BUILD.gn @@ -0,0 +1,25 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/ios/rules.gni") +import("//testing/test.gni") + +test("crnet_test") { + testonly = true + sources = [ + "crnet_http_tests.mm", + "crnet_test_runner.mm", + ] + + deps = [ + "//base", + "//base:i18n", + "//ios/crnet:crnet_framework+link", + "//ios/third_party/gcdwebserver", + "//net:test_support", + "//third_party/icu", + ] + + bundle_deps = [ "//ios/crnet:crnet_framework+bundle" ] +} diff --git a/chromium/ios/crnet/test/crnet_test.gyp b/chromium/ios/crnet/test/crnet_test.gyp deleted file mode 100644 index f44883d9b8a..00000000000 --- a/chromium/ios/crnet/test/crnet_test.gyp +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2015 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. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [], - 'conditions': [ - # The CrNet build is ninja-only because of the hack in - # ios/build/packaging/link_dependencies.py. - ['OS=="ios" and "<(GENERATOR)"=="ninja"', { - 'targets': [ - { - 'target_name': 'crnet_test', - 'type': 'executable', - 'dependencies': [ - '../../../ios/crnet/crnet.gyp:crnet', - '../../../ios/third_party/gcdwebserver/gcdwebserver.gyp:gcdwebserver', - '../../../testing/gtest.gyp:gtest', - ], - 'sources': [ - 'crnet_http_tests.mm', - 'crnet_test_runner.mm', - ], - 'include_dirs': [ - '../../..', - '..', - ], - 'link_settings': { - }, - }, - ], - }], - ], -} diff --git a/chromium/ios/ios.gyp b/chromium/ios/ios.gyp deleted file mode 100644 index 151cbd8a23e..00000000000 --- a/chromium/ios/ios.gyp +++ /dev/null @@ -1,35 +0,0 @@ -# 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. -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - 'target_name': 'ios', - 'type': 'none', - 'dependencies': [ - 'chrome/common/physical_web/physical_web.gyp:*', - 'chrome/ios_chrome_tests.gyp:*', - 'chrome/ios_share_extension_resources.gyp:*', - 'chrome/ios_today_extension_resources.gyp:*', - 'consumer/ios_consumer_base.gyp:*', - 'crnet/crnet.gyp:*', - 'crnet/crnet_consumer/crnet_consumer.gyp:*', - 'crnet/crnet_pack.gyp:*', - 'crnet/test/crnet_test.gyp:*', - 'net/ios_net.gyp:*', - 'net/ios_net_unittests.gyp:*', - 'provider/ios_provider_chrome.gyp:*', - 'provider/ios_provider_web.gyp:*', - 'testing/ios_testing.gyp:*', - 'web/ios_web.gyp:*', - 'web/ios_web_inttests.gyp:*', - 'web/ios_web_shell.gyp:*', - 'web/ios_web_shell_tests.gyp:*', - 'web/ios_web_unittests.gyp:*', - ], - }, - ], -} diff --git a/chromium/ios/net/BUILD.gn b/chromium/ios/net/BUILD.gn index 65c9eac43a2..fff941a9182 100644 --- a/chromium/ios/net/BUILD.gn +++ b/chromium/ios/net/BUILD.gn @@ -4,11 +4,11 @@ import("//ios/build/config.gni") import("//testing/test.gni") +import("//url/features.gni") source_set("net") { deps = [ "//base", - "//base:i18n", "//net", "//url:url_features", ] @@ -55,6 +55,10 @@ source_set("net") { "url_scheme_util.h", "url_scheme_util.mm", ] + + if (!use_platform_icu_alternatives) { + deps += [ "//base:i18n" ] + } } test("ios_net_unittests") { diff --git a/chromium/ios/net/ios_net.gyp b/chromium/ios/net/ios_net.gyp deleted file mode 100644 index 79a1ffe312b..00000000000 --- a/chromium/ios/net/ios_net.gyp +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2015 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. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - # GN version: //ios/net - 'target_name': 'ios_net', - 'type': 'static_library', - 'include_dirs': [ - '../..', - ], - 'dependencies': [ - '../../base/base.gyp:base', - '../../net/net.gyp:net', - ], - 'sources': [ - 'clients/crn_forwarding_network_client.h', - 'clients/crn_forwarding_network_client.mm', - 'clients/crn_forwarding_network_client_factory.h', - 'clients/crn_forwarding_network_client_factory.mm', - 'clients/crn_network_client_protocol.h', - 'clients/crn_simple_network_client_factory.h', - 'clients/crn_simple_network_client_factory.mm', - 'cookies/cookie_cache.cc', - 'cookies/cookie_cache.h', - 'cookies/cookie_creation_time_manager.h', - 'cookies/cookie_creation_time_manager.mm', - 'cookies/cookie_store_ios.h', - 'cookies/cookie_store_ios.mm', - 'cookies/cookie_store_ios_client.h', - 'cookies/cookie_store_ios_client.mm', - 'cookies/system_cookie_util.h', - 'cookies/system_cookie_util.mm', - 'crn_http_protocol_handler.h', - 'crn_http_protocol_handler.mm', - 'crn_http_protocol_handler_proxy.h', - 'crn_http_protocol_handler_proxy_with_client_thread.h', - 'crn_http_protocol_handler_proxy_with_client_thread.mm', - 'crn_http_url_response.h', - 'crn_http_url_response.mm', - 'empty_nsurlcache.h', - 'empty_nsurlcache.mm', - 'http_cache_helper.cc', - 'http_cache_helper.h', - 'http_protocol_logging.h', - 'http_protocol_logging.mm', - 'http_response_headers_util.h', - 'http_response_headers_util.mm', - 'nsurlrequest_util.h', - 'nsurlrequest_util.mm', - 'protocol_handler_util.h', - 'protocol_handler_util.mm', - 'request_tracker.h', - 'request_tracker.mm', - 'url_scheme_util.h', - 'url_scheme_util.mm', - ], - }, - ], -} diff --git a/chromium/ios/net/ios_net_unittests.gyp b/chromium/ios/net/ios_net_unittests.gyp deleted file mode 100644 index 7d4ab0471bb..00000000000 --- a/chromium/ios/net/ios_net_unittests.gyp +++ /dev/null @@ -1,37 +0,0 @@ -# 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. -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - # GN version: //ios/net:ios_net_unittests - 'target_name': 'ios_net_unittests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - '../../base/base.gyp:base', - '../../base/base.gyp:run_all_unittests', - '../../net/net.gyp:net_test_support', - '../../testing/gtest.gyp:gtest', - '../../url/url.gyp:url_lib', - 'ios_net.gyp:ios_net', - ], - 'include_dirs': [ - '../..', - ], - 'sources': [ - 'clients/crn_forwarding_network_client_factory_unittest.mm', - 'cookies/cookie_cache_unittest.cc', - 'cookies/cookie_creation_time_manager_unittest.mm', - 'cookies/cookie_store_ios_unittest.mm', - 'cookies/system_cookie_util_unittest.mm', - 'http_response_headers_util_unittest.mm', - 'nsurlrequest_util_unittest.mm', - 'protocol_handler_util_unittest.mm', - 'url_scheme_util_unittest.mm', - ], - }, - ], -} diff --git a/chromium/ios/provider/ios_provider_chrome.gyp b/chromium/ios/provider/ios_provider_chrome.gyp deleted file mode 100644 index e07f1ff251b..00000000000 --- a/chromium/ios/provider/ios_provider_chrome.gyp +++ /dev/null @@ -1,68 +0,0 @@ -# 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. -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - # GN version: //ios/public/provider/chrome/browser - 'target_name': 'ios_provider_chrome_browser', - 'type': 'static_library', - 'sources': [ - '../public/provider/chrome/browser/browser_constants.cc', - '../public/provider/chrome/browser/browser_constants.h', - '../public/provider/chrome/browser/chrome_browser_provider.h', - '../public/provider/chrome/browser/chrome_browser_provider.mm', - '../public/provider/chrome/browser/geolocation_updater_provider.h', - '../public/provider/chrome/browser/geolocation_updater_provider.mm', - '../public/provider/chrome/browser/signin/chrome_identity.h', - '../public/provider/chrome/browser/signin/chrome_identity.mm', - '../public/provider/chrome/browser/signin/chrome_identity_interaction_manager.h', - '../public/provider/chrome/browser/signin/chrome_identity_interaction_manager.mm', - '../public/provider/chrome/browser/signin/chrome_identity_service.h', - '../public/provider/chrome/browser/signin/chrome_identity_service.mm', - '../public/provider/chrome/browser/signin/signin_error_provider.h', - '../public/provider/chrome/browser/signin/signin_error_provider.mm', - '../public/provider/chrome/browser/signin/signin_resources_provider.h', - '../public/provider/chrome/browser/signin/signin_resources_provider.mm', - '../public/provider/chrome/browser/ui/default_ios_web_view_factory.h', - '../public/provider/chrome/browser/ui/default_ios_web_view_factory.mm', - '../public/provider/chrome/browser/ui/infobar_view_delegate.h', - '../public/provider/chrome/browser/ui/infobar_view_protocol.h', - '../public/provider/chrome/browser/updatable_resource_provider.h', - '../public/provider/chrome/browser/updatable_resource_provider.mm', - ], - 'dependencies': [ - '../../base/base.gyp:base', - '../../components/components.gyp:autofill_core_browser', - '../../components/components.gyp:favicon_base', - '../../components/components.gyp:metrics', - '../../components/components.gyp:sync_sessions', - '../../net/net.gyp:net', - '../web/ios_web.gyp:ios_web', - 'ios_provider_web.gyp:ios_provider_web', - ], - }, - { - # GN version: //ios/public/provider/chrome/browser:test_support - 'target_name': 'ios_provider_chrome_browser_test_support', - 'type': 'static_library', - 'sources': [ - '../public/provider/chrome/browser/test_chrome_browser_provider.h', - '../public/provider/chrome/browser/test_chrome_browser_provider.mm', - '../public/provider/chrome/browser/test_chrome_provider_initializer.h', - '../public/provider/chrome/browser/test_chrome_provider_initializer.mm', - '../public/provider/chrome/browser/test_updatable_resource_provider.h', - '../public/provider/chrome/browser/test_updatable_resource_provider.mm', - ], - 'dependencies': [ - '../../base/base.gyp:base', - '../../components/components.gyp:signin_ios_browser_test_support', - '../../testing/gtest.gyp:gtest', - 'ios_provider_chrome_browser', - ], - }, - ], -} diff --git a/chromium/ios/provider/ios_provider_web.gyp b/chromium/ios/provider/ios_provider_web.gyp deleted file mode 100644 index 8d4a10fe200..00000000000 --- a/chromium/ios/provider/ios_provider_web.gyp +++ /dev/null @@ -1,32 +0,0 @@ -# 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. -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - # GN version: //ios/public/provider/web - 'target_name': 'ios_provider_web', - 'type': 'static_library', - 'include_dirs': [ - '../..', - ], - 'dependencies': [ - '../../base/base.gyp:base', - '../web/ios_web.gyp:ios_web', - ], - 'sources': [ - '../public/provider/web/web_controller_provider.h', - '../public/provider/web/web_controller_provider.mm', - '../public/provider/web/web_ui_ios.h', - '../public/provider/web/web_ui_ios_controller.cc', - '../public/provider/web/web_ui_ios_controller.h', - '../public/provider/web/web_ui_ios_controller_factory.h', - '../public/provider/web/web_ui_ios_message_handler.cc', - '../public/provider/web/web_ui_ios_message_handler.h', - ], - }, - ], -} diff --git a/chromium/ios/public/provider/chrome/browser/BUILD.gn b/chromium/ios/public/provider/chrome/browser/BUILD.gn index 2d00dce3064..5c632581bd6 100644 --- a/chromium/ios/public/provider/chrome/browser/BUILD.gn +++ b/chromium/ios/public/provider/chrome/browser/BUILD.gn @@ -12,6 +12,7 @@ source_set("browser") { "geolocation_updater_provider.mm", "signin/chrome_identity.h", "signin/chrome_identity.mm", + "signin/chrome_identity_browser_opener.h", "signin/chrome_identity_interaction_manager.h", "signin/chrome_identity_interaction_manager.mm", "signin/chrome_identity_service.h", @@ -20,10 +21,12 @@ source_set("browser") { "signin/signin_error_provider.mm", "signin/signin_resources_provider.h", "signin/signin_resources_provider.mm", + "ui/app_rating_prompt.h", "ui/default_ios_web_view_factory.h", "ui/default_ios_web_view_factory.mm", "ui/infobar_view_delegate.h", "ui/infobar_view_protocol.h", + "ui/text_field_styling.h", "updatable_resource_provider.h", "updatable_resource_provider.mm", ] @@ -43,6 +46,12 @@ source_set("test_support") { testonly = true sources = [ + "signin/fake_chrome_identity.h", + "signin/fake_chrome_identity.mm", + "signin/fake_chrome_identity_interaction_manager.h", + "signin/fake_chrome_identity_interaction_manager.mm", + "signin/fake_chrome_identity_service.h", + "signin/fake_chrome_identity_service.mm", "test_chrome_browser_provider.h", "test_chrome_browser_provider.mm", "test_chrome_provider_initializer.h", @@ -55,6 +64,7 @@ source_set("test_support") { ":browser", "//base", "//components/signin/ios/browser:test_support", + "//testing/gmock", "//testing/gtest", ] } diff --git a/chromium/ios/public/provider/web/BUILD.gn b/chromium/ios/public/provider/web/BUILD.gn index f9334fc27a9..d70aa343eea 100644 --- a/chromium/ios/public/provider/web/BUILD.gn +++ b/chromium/ios/public/provider/web/BUILD.gn @@ -6,12 +6,6 @@ source_set("web") { sources = [ "web_controller_provider.h", "web_controller_provider.mm", - "web_ui_ios.h", - "web_ui_ios_controller.cc", - "web_ui_ios_controller.h", - "web_ui_ios_controller_factory.h", - "web_ui_ios_message_handler.cc", - "web_ui_ios_message_handler.h", ] deps = [ diff --git a/chromium/ios/testing/earl_grey/BUILD.gn b/chromium/ios/testing/earl_grey/BUILD.gn index 7c7eeb41a7c..a499d965a7f 100644 --- a/chromium/ios/testing/earl_grey/BUILD.gn +++ b/chromium/ios/testing/earl_grey/BUILD.gn @@ -11,10 +11,14 @@ source_set("earl_grey_support") { testonly = true deps = [ + "//base/test:test_support", "//ios/third_party/earl_grey", ] sources = [ + "disabled_test_macros.h", + "matchers.h", + "matchers.mm", "wait_util.h", "wait_util.mm", ] diff --git a/chromium/ios/testing/earl_grey/earl_grey_support.gyp b/chromium/ios/testing/earl_grey/earl_grey_support.gyp deleted file mode 100644 index 96c72ebf92b..00000000000 --- a/chromium/ios/testing/earl_grey/earl_grey_support.gyp +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - # GN version: //ios/testing/earl_grey:earl_grey_support - 'target_name': 'earl_grey_support', - 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/ios/third_party/earl_grey/earl_grey.gyp:EarlGrey', - ], - 'sources': [ - 'wait_util.h', - 'wait_util.mm', - ], - 'include_dirs': [ - '../../..', - ], - }, - ], -} diff --git a/chromium/ios/testing/ios_testing.gyp b/chromium/ios/testing/ios_testing.gyp deleted file mode 100644 index 80f09abcf61..00000000000 --- a/chromium/ios/testing/ios_testing.gyp +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - # GN version: //ios/testing:ocmock_support - 'target_name': 'ocmock_support', - 'type': 'static_library', - 'dependencies': [ - '../../base/base.gyp:base', - '../../third_party/ocmock/ocmock.gyp:ocmock', - '../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', - ], - 'sources': [ - 'ocmock_complex_type_helper.h', - 'ocmock_complex_type_helper.mm', - ], - 'include_dirs': [ - '../..', - ], - 'export_dependent_settings': [ - '../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', - ], - }, - { - # GN version: //ios/testing:ocmock_support_unittest - 'target_name': 'ocmock_support_unittest', - 'type': 'executable', - 'variables': { - 'ios_product_name': '<(_target_name)', - }, - 'sources': [ - 'ocmock_complex_type_helper_unittest.mm', - ], - 'dependencies': [ - 'ocmock_support', - '../../base/base.gyp:run_all_unittests', - '../../base/base.gyp:test_support_base', - '../../testing/gmock.gyp:gmock', - '../../testing/gtest.gyp:gtest', - '../../testing/iossim/iossim.gyp:iossim#host', - '../../third_party/ocmock/ocmock.gyp:ocmock', - ], - 'include_dirs': [ - '../..', - ], - 'xcode_settings': {'OTHER_LDFLAGS': ['-ObjC']}, - }, - ], -} diff --git a/chromium/ios/third_party/blink/blink_html_tokenizer.gyp b/chromium/ios/third_party/blink/blink_html_tokenizer.gyp deleted file mode 100644 index 5548922db26..00000000000 --- a/chromium/ios/third_party/blink/blink_html_tokenizer.gyp +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -{ - 'targets': [ - { - # GN version: //ios/third_party/blink:html_tokenizer - 'target_name': 'blink_html_tokenizer', - 'type': 'static_library', - 'dependencies': [ - '../../../base/base.gyp:base', - ], - 'include_dirs': [ - '../../..', - ], - 'sources': [ - 'src/html_character_provider.h', - 'src/html_input_stream_preprocessor.h', - 'src/html_markup_tokenizer_inlines.h', - 'src/html_token.h', - 'src/html_token.mm', - 'src/html_tokenizer.h', - 'src/html_tokenizer.mm', - 'src/html_tokenizer_adapter.h', - ], - }, - ], -} diff --git a/chromium/ios/third_party/earl_grey/BUILD.gn b/chromium/ios/third_party/earl_grey/BUILD.gn index 2e1f7e6f050..be7a6f6895e 100644 --- a/chromium/ios/third_party/earl_grey/BUILD.gn +++ b/chromium/ios/third_party/earl_grey/BUILD.gn @@ -7,17 +7,11 @@ import("//build/config/ios/rules.gni") config("config") { include_dirs = [ "src/EarlGrey" ] - - # EarlGrey and its dependencies need to link to XCTest.framework - # that is not under $ios_sdk_path. - common_flags = [ "-F$ios_sdk_path/../../Library/Frameworks" ] - cflags_objc = common_flags - cflags_objcc = common_flags - ldflags = common_flags } ios_framework_bundle("earl_grey") { output_name = "EarlGrey" + info_plist = "Info.plist" testonly = true sources = [ @@ -72,6 +66,8 @@ ios_framework_bundle("earl_grey") { "src/EarlGrey/Additions/UIAnimation+GREYAdditions.m", "src/EarlGrey/Additions/UIApplication+GREYAdditions.h", "src/EarlGrey/Additions/UIApplication+GREYAdditions.m", + "src/EarlGrey/Additions/UIGestureRecognizer+GREYAdditions.h", + "src/EarlGrey/Additions/UIGestureRecognizer+GREYAdditions.m", "src/EarlGrey/Additions/UIScrollView+GREYAdditions.h", "src/EarlGrey/Additions/UIScrollView+GREYAdditions.m", "src/EarlGrey/Additions/UISwitch+GREYAdditions.h", @@ -88,8 +84,6 @@ ios_framework_bundle("earl_grey") { "src/EarlGrey/Additions/UIWindow+GREYAdditions.m", "src/EarlGrey/Additions/XCTestCase+GREYAdditions.h", "src/EarlGrey/Additions/XCTestCase+GREYAdditions.m", - "src/EarlGrey/Additions/_UIGestureRecognizerFailureMap_GREYAdditions.h", - "src/EarlGrey/Additions/_UIGestureRecognizerFailureMap_GREYAdditions.m", "src/EarlGrey/Additions/_UIModalItemsPresentingViewController_GREYAdditions.h", "src/EarlGrey/Additions/_UIModalItemsPresentingViewController_GREYAdditions.m", "src/EarlGrey/Additions/__NSCFLocalDataTask_GREYAdditions.h", @@ -186,6 +180,8 @@ ios_framework_bundle("earl_grey") { "src/EarlGrey/Synchronization/GREYNSTimerIdlingResource.m", "src/EarlGrey/Synchronization/GREYOperationQueueIdlingResource.h", "src/EarlGrey/Synchronization/GREYOperationQueueIdlingResource.m", + "src/EarlGrey/Synchronization/GREYRunLoopSpinner.h", + "src/EarlGrey/Synchronization/GREYRunLoopSpinner.m", "src/EarlGrey/Synchronization/GREYSyncAPI.h", "src/EarlGrey/Synchronization/GREYSyncAPI.m", "src/EarlGrey/Synchronization/GREYTimedIdlingResource.h", @@ -237,6 +233,7 @@ ios_framework_bundle("earl_grey") { "src/EarlGrey/Synchronization/GREYUIThreadExecutor.h", ] deps = [ + "//build/config/ios:xctest", "//ios/third_party/fishhook", "//third_party/google_toolbox_for_mac", ] @@ -256,7 +253,14 @@ ios_framework_bundle("earl_grey") { ] public_configs = [ ":config" ] - configs += [ "//build/config/compiler:enable_arc" ] - configs -= [ "//build/config/gcc:symbol_visibility_hidden" ] - configs += [ "//build/config/gcc:symbol_visibility_default" ] + + configs -= [ + "//build/config/gcc:symbol_visibility_hidden", + "//build/config/compiler:chromium_code", + ] + configs += [ + "//build/config/compiler:no_chromium_code", + "//build/config/compiler:enable_arc", + "//build/config/gcc:symbol_visibility_default", + ] } diff --git a/chromium/ios/third_party/earl_grey/earl_grey.gyp b/chromium/ios/third_party/earl_grey/earl_grey.gyp deleted file mode 100644 index 73734125b0f..00000000000 --- a/chromium/ios/third_party/earl_grey/earl_grey.gyp +++ /dev/null @@ -1,324 +0,0 @@ -# Copyright 2016 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': 'EarlGrey', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ - 'src/EarlGrey/Action/GREYAction.h', - 'src/EarlGrey/Action/GREYActionBlock.h', - 'src/EarlGrey/Action/GREYActionBlock.m', - 'src/EarlGrey/Action/GREYActions.h', - 'src/EarlGrey/Action/GREYActions.m', - 'src/EarlGrey/Action/GREYBaseAction.m', - 'src/EarlGrey/Action/GREYChangeStepperAction.h', - 'src/EarlGrey/Action/GREYChangeStepperAction.m', - 'src/EarlGrey/Action/GREYPathGestureUtils.h', - 'src/EarlGrey/Action/GREYPathGestureUtils.m', - 'src/EarlGrey/Action/GREYPickerAction.h', - 'src/EarlGrey/Action/GREYPickerAction.m', - 'src/EarlGrey/Action/GREYScrollAction.h', - 'src/EarlGrey/Action/GREYScrollAction.m', - 'src/EarlGrey/Action/GREYScrollActionError.m', - 'src/EarlGrey/Action/GREYScrollToContentEdgeAction.h', - 'src/EarlGrey/Action/GREYScrollToContentEdgeAction.m', - 'src/EarlGrey/Action/GREYSlideAction.h', - 'src/EarlGrey/Action/GREYSlideAction.m', - 'src/EarlGrey/Action/GREYSwipeAction.h', - 'src/EarlGrey/Action/GREYSwipeAction.m', - 'src/EarlGrey/Action/GREYTapAction.h', - 'src/EarlGrey/Action/GREYTapAction.m', - 'src/EarlGrey/Action/GREYTapper.h', - 'src/EarlGrey/Action/GREYTapper.m', - 'src/EarlGrey/Additions/__NSCFLocalDataTask_GREYAdditions.h', - 'src/EarlGrey/Additions/__NSCFLocalDataTask_GREYAdditions.m', - 'src/EarlGrey/Additions/_UIGestureRecognizerFailureMap_GREYAdditions.h', - 'src/EarlGrey/Additions/_UIGestureRecognizerFailureMap_GREYAdditions.m', - 'src/EarlGrey/Additions/_UIModalItemsPresentingViewController_GREYAdditions.h', - 'src/EarlGrey/Additions/_UIModalItemsPresentingViewController_GREYAdditions.m', - 'src/EarlGrey/Additions/CAAnimation+GREYAdditions.h', - 'src/EarlGrey/Additions/CAAnimation+GREYAdditions.m', - 'src/EarlGrey/Additions/CALayer+GREYAdditions.h', - 'src/EarlGrey/Additions/CALayer+GREYAdditions.m', - 'src/EarlGrey/Additions/CGGeometry+GREYAdditions.h', - 'src/EarlGrey/Additions/CGGeometry+GREYAdditions.m', - 'src/EarlGrey/Additions/NSError+GREYAdditions.h', - 'src/EarlGrey/Additions/NSError+GREYAdditions.m', - 'src/EarlGrey/Additions/NSObject+GREYAdditions.h', - 'src/EarlGrey/Additions/NSObject+GREYAdditions.m', - 'src/EarlGrey/Additions/NSRunLoop+GREYAdditions.h', - 'src/EarlGrey/Additions/NSRunLoop+GREYAdditions.m', - 'src/EarlGrey/Additions/NSString+GREYAdditions.h', - 'src/EarlGrey/Additions/NSString+GREYAdditions.m', - 'src/EarlGrey/Additions/NSTimer+GREYAdditions.h', - 'src/EarlGrey/Additions/NSTimer+GREYAdditions.m', - 'src/EarlGrey/Additions/NSURL+GREYAdditions.h', - 'src/EarlGrey/Additions/NSURL+GREYAdditions.m', - 'src/EarlGrey/Additions/NSURLConnection+GREYAdditions.h', - 'src/EarlGrey/Additions/NSURLConnection+GREYAdditions.m', - 'src/EarlGrey/Additions/UIAnimation+GREYAdditions.h', - 'src/EarlGrey/Additions/UIAnimation+GREYAdditions.m', - 'src/EarlGrey/Additions/UIApplication+GREYAdditions.h', - 'src/EarlGrey/Additions/UIApplication+GREYAdditions.m', - 'src/EarlGrey/Additions/UIScrollView+GREYAdditions.h', - 'src/EarlGrey/Additions/UIScrollView+GREYAdditions.m', - 'src/EarlGrey/Additions/UISwitch+GREYAdditions.h', - 'src/EarlGrey/Additions/UISwitch+GREYAdditions.m', - 'src/EarlGrey/Additions/UITouch+GREYAdditions.h', - 'src/EarlGrey/Additions/UITouch+GREYAdditions.m', - 'src/EarlGrey/Additions/UIView+GREYAdditions.h', - 'src/EarlGrey/Additions/UIView+GREYAdditions.m', - 'src/EarlGrey/Additions/UIViewController+GREYAdditions.h', - 'src/EarlGrey/Additions/UIViewController+GREYAdditions.m', - 'src/EarlGrey/Additions/UIWebView+GREYAdditions.h', - 'src/EarlGrey/Additions/UIWebView+GREYAdditions.m', - 'src/EarlGrey/Additions/UIWindow+GREYAdditions.h', - 'src/EarlGrey/Additions/UIWindow+GREYAdditions.m', - 'src/EarlGrey/Additions/XCTestCase+GREYAdditions.h', - 'src/EarlGrey/Additions/XCTestCase+GREYAdditions.m', - 'src/EarlGrey/AppSupport/GREYIdlingResource.h', - 'src/EarlGrey/Assertion/GREYAssertion.h', - 'src/EarlGrey/Assertion/GREYAssertionBlock.h', - 'src/EarlGrey/Assertion/GREYAssertionBlock.m', - 'src/EarlGrey/Assertion/GREYAssertionDefines.h', - 'src/EarlGrey/Assertion/GREYAssertions.h', - 'src/EarlGrey/Assertion/GREYAssertions.m', - 'src/EarlGrey/Common/GREYAnalytics.h', - 'src/EarlGrey/Common/GREYAnalytics.m', - 'src/EarlGrey/Common/GREYConfiguration.h', - 'src/EarlGrey/Common/GREYConfiguration.m', - 'src/EarlGrey/Common/GREYConstants.h', - 'src/EarlGrey/Common/GREYConstants.m', - 'src/EarlGrey/Common/GREYDefines.h', - 'src/EarlGrey/Common/GREYElementHierarchy.h', - 'src/EarlGrey/Common/GREYElementHierarchy.m', - 'src/EarlGrey/Common/GREYExposed.h', - 'src/EarlGrey/Common/GREYPrivate.h', - 'src/EarlGrey/Common/GREYScreenshotUtil.h', - 'src/EarlGrey/Common/GREYScreenshotUtil.m', - 'src/EarlGrey/Common/GREYSwizzler.h', - 'src/EarlGrey/Common/GREYSwizzler.m', - 'src/EarlGrey/Common/GREYTestHelper.h', - 'src/EarlGrey/Common/GREYTestHelper.m', - 'src/EarlGrey/Common/GREYVisibilityChecker.h', - 'src/EarlGrey/Common/GREYVisibilityChecker.m', - 'src/EarlGrey/Core/GREYAutomationSetup.h', - 'src/EarlGrey/Core/GREYAutomationSetup.m', - 'src/EarlGrey/Core/GREYElementFinder.h', - 'src/EarlGrey/Core/GREYElementFinder.m', - 'src/EarlGrey/Core/GREYElementInteraction.h', - 'src/EarlGrey/Core/GREYElementInteraction.m', - 'src/EarlGrey/Core/GREYInteractionDataSource.h', - 'src/EarlGrey/Core/GREYKeyboard.h', - 'src/EarlGrey/Core/GREYKeyboard.m', - 'src/EarlGrey/Delegate/GREYCAAnimationDelegate.h', - 'src/EarlGrey/Delegate/GREYCAAnimationDelegate.m', - 'src/EarlGrey/Delegate/GREYNSURLConnectionDelegate.h', - 'src/EarlGrey/Delegate/GREYNSURLConnectionDelegate.m', - 'src/EarlGrey/Delegate/GREYSurrogateDelegate.h', - 'src/EarlGrey/Delegate/GREYSurrogateDelegate.m', - 'src/EarlGrey/Delegate/GREYUIWebViewDelegate.h', - 'src/EarlGrey/Delegate/GREYUIWebViewDelegate.m', - 'src/EarlGrey/EarlGrey.h', - 'src/EarlGrey/EarlGrey.m', - 'src/EarlGrey/Event/GREYSingleSequenceTouchInjector.h', - 'src/EarlGrey/Event/GREYSingleSequenceTouchInjector.m', - 'src/EarlGrey/Event/GREYSyntheticEvents.h', - 'src/EarlGrey/Event/GREYSyntheticEvents.m', - 'src/EarlGrey/Exception/GREYDefaultFailureHandler.h', - 'src/EarlGrey/Exception/GREYDefaultFailureHandler.m', - 'src/EarlGrey/Exception/GREYFailureHandler.h', - 'src/EarlGrey/Exception/GREYFrameworkException.h', - 'src/EarlGrey/Exception/GREYFrameworkException.m', - 'src/EarlGrey/Matcher/GREYAllOf.h', - 'src/EarlGrey/Matcher/GREYAllOf.m', - 'src/EarlGrey/Matcher/GREYAnyOf.h', - 'src/EarlGrey/Matcher/GREYAnyOf.m', - 'src/EarlGrey/Matcher/GREYBaseMatcher.h', - 'src/EarlGrey/Matcher/GREYBaseMatcher.m', - 'src/EarlGrey/Matcher/GREYDescription.h', - 'src/EarlGrey/Matcher/GREYElementMatcherBlock.h', - 'src/EarlGrey/Matcher/GREYElementMatcherBlock.m', - 'src/EarlGrey/Matcher/GREYHCMatcher.h', - 'src/EarlGrey/Matcher/GREYHCMatcher.m', - 'src/EarlGrey/Matcher/GREYLayoutConstraint.h', - 'src/EarlGrey/Matcher/GREYLayoutConstraint.m', - 'src/EarlGrey/Matcher/GREYMatcher.h', - 'src/EarlGrey/Matcher/GREYMatchers.h', - 'src/EarlGrey/Matcher/GREYMatchers.m', - 'src/EarlGrey/Matcher/GREYNot.h', - 'src/EarlGrey/Matcher/GREYNot.m', - 'src/EarlGrey/Matcher/GREYStringDescription.h', - 'src/EarlGrey/Matcher/GREYStringDescription.m', - 'src/EarlGrey/Provider/GREYDataEnumerator.h', - 'src/EarlGrey/Provider/GREYDataEnumerator.m', - 'src/EarlGrey/Provider/GREYElementProvider.h', - 'src/EarlGrey/Provider/GREYElementProvider.m', - 'src/EarlGrey/Provider/GREYProvider.h', - 'src/EarlGrey/Provider/GREYUIWindowProvider.h', - 'src/EarlGrey/Provider/GREYUIWindowProvider.m', - 'src/EarlGrey/Synchronization/GREYAppStateTracker.h', - 'src/EarlGrey/Synchronization/GREYAppStateTracker.m', - 'src/EarlGrey/Synchronization/GREYCondition.h', - 'src/EarlGrey/Synchronization/GREYCondition.m', - 'src/EarlGrey/Synchronization/GREYDispatchQueueIdlingResource.h', - 'src/EarlGrey/Synchronization/GREYDispatchQueueIdlingResource.m', - 'src/EarlGrey/Synchronization/GREYNSTimerIdlingResource.h', - 'src/EarlGrey/Synchronization/GREYNSTimerIdlingResource.m', - 'src/EarlGrey/Synchronization/GREYOperationQueueIdlingResource.h', - 'src/EarlGrey/Synchronization/GREYOperationQueueIdlingResource.m', - 'src/EarlGrey/Synchronization/GREYSyncAPI.h', - 'src/EarlGrey/Synchronization/GREYSyncAPI.m', - 'src/EarlGrey/Synchronization/GREYTimedIdlingResource.h', - 'src/EarlGrey/Synchronization/GREYTimedIdlingResource.m', - 'src/EarlGrey/Synchronization/GREYUIThreadExecutor.h', - 'src/EarlGrey/Synchronization/GREYUIThreadExecutor.m', - 'src/EarlGrey/Synchronization/GREYUIWebViewIdlingResource.h', - 'src/EarlGrey/Synchronization/GREYUIWebViewIdlingResource.m', - ], - 'mac_framework_headers': [ - 'src/EarlGrey/EarlGrey.h', - 'src/EarlGrey/Action/GREYAction.h', - 'src/EarlGrey/Action/GREYActionBlock.h', - 'src/EarlGrey/Action/GREYActions.h', - 'src/EarlGrey/Action/GREYBaseAction.h', - 'src/EarlGrey/Action/GREYScrollActionError.h', - 'src/EarlGrey/AppSupport/GREYIdlingResource.h', - 'src/EarlGrey/Assertion/GREYAssertion.h', - 'src/EarlGrey/Assertion/GREYAssertionBlock.h', - 'src/EarlGrey/Assertion/GREYAssertionDefines.h', - 'src/EarlGrey/Assertion/GREYAssertions.h', - 'src/EarlGrey/Common/GREYConfiguration.h', - 'src/EarlGrey/Common/GREYConstants.h', - 'src/EarlGrey/Common/GREYDefines.h', - 'src/EarlGrey/Common/GREYElementHierarchy.h', - 'src/EarlGrey/Common/GREYScreenshotUtil.h', - 'src/EarlGrey/Common/GREYTestHelper.h', - 'src/EarlGrey/Core/GREYElementFinder.h', - 'src/EarlGrey/Core/GREYElementInteraction.h', - 'src/EarlGrey/Core/GREYInteraction.h', - 'src/EarlGrey/Exception/GREYFailureHandler.h', - 'src/EarlGrey/Exception/GREYFrameworkException.h', - 'src/EarlGrey/Matcher/GREYAllOf.h', - 'src/EarlGrey/Matcher/GREYAnyOf.h', - 'src/EarlGrey/Matcher/GREYBaseMatcher.h', - 'src/EarlGrey/Matcher/GREYDescription.h', - 'src/EarlGrey/Matcher/GREYElementMatcherBlock.h', - 'src/EarlGrey/Matcher/GREYLayoutConstraint.h', - 'src/EarlGrey/Matcher/GREYMatcher.h', - 'src/EarlGrey/Matcher/GREYMatchers.h', - 'src/EarlGrey/Matcher/GREYNot.h', - 'src/EarlGrey/Provider/GREYDataEnumerator.h', - 'src/EarlGrey/Provider/GREYProvider.h', - 'src/EarlGrey/Synchronization/GREYNSTimerIdlingResource.h', - 'src/EarlGrey/Synchronization/GREYOperationQueueIdlingResource.h', - 'src/EarlGrey/Synchronization/GREYDispatchQueueIdlingResource.h', - 'src/EarlGrey/Synchronization/GREYSyncAPI.h', - 'src/EarlGrey/Synchronization/GREYCondition.h', - 'src/EarlGrey/Synchronization/GREYUIThreadExecutor.h', - ], - 'mac_framework_private_headers': [ - 'src/EarlGrey/Action/GREYPathGestureUtils.h', - 'src/EarlGrey/Action/GREYScrollAction.h', - 'src/EarlGrey/Action/GREYSwipeAction.h', - 'src/EarlGrey/Action/GREYTapAction.h', - 'src/EarlGrey/Additions/__NSCFLocalDataTask_GREYAdditions.h', - 'src/EarlGrey/Additions/_UIGestureRecognizerFailureMap_GREYAdditions.h', - 'src/EarlGrey/Additions/_UIModalItemsPresentingViewController_GREYAdditions.h', - 'src/EarlGrey/Additions/CAAnimation+GREYAdditions.h', - 'src/EarlGrey/Additions/CALayer+GREYAdditions.h', - 'src/EarlGrey/Additions/CGGeometry+GREYAdditions.h', - 'src/EarlGrey/Additions/NSError+GREYAdditions.h', - 'src/EarlGrey/Additions/NSRunLoop+GREYAdditions.h', - 'src/EarlGrey/Additions/NSString+GREYAdditions.h', - 'src/EarlGrey/Additions/NSTimer+GREYAdditions.h', - 'src/EarlGrey/Additions/NSURL+GREYAdditions.h', - 'src/EarlGrey/Additions/NSURLConnection+GREYAdditions.h', - 'src/EarlGrey/Additions/UIAnimation+GREYAdditions.h', - 'src/EarlGrey/Additions/UIApplication+GREYAdditions.h', - 'src/EarlGrey/Additions/UIScrollView+GREYAdditions.h', - 'src/EarlGrey/Additions/UISwitch+GREYAdditions.h', - 'src/EarlGrey/Additions/UITouch+GREYAdditions.h', - 'src/EarlGrey/Additions/UIView+GREYAdditions.h', - 'src/EarlGrey/Additions/UIViewController+GREYAdditions.h', - 'src/EarlGrey/Additions/UIWebView+GREYAdditions.h', - 'src/EarlGrey/Additions/UIWindow+GREYAdditions.h', - 'src/EarlGrey/Additions/XCTestCase+GREYAdditions.h', - 'src/EarlGrey/Common/GREYExposed.h', - 'src/EarlGrey/Common/GREYPrivate.h', - 'src/EarlGrey/Common/GREYSwizzler.h', - 'src/EarlGrey/Common/GREYVisibilityChecker.h', - 'src/EarlGrey/Delegate/GREYCAAnimationDelegate.h', - 'src/EarlGrey/Delegate/GREYNSURLConnectionDelegate.h', - 'src/EarlGrey/Delegate/GREYSurrogateDelegate.h', - 'src/EarlGrey/Delegate/GREYUIWebViewDelegate.h', - 'src/EarlGrey/Event/GREYSingleSequenceTouchInjector.h', - 'src/EarlGrey/Event/GREYSyntheticEvents.h', - 'src/EarlGrey/Provider/GREYElementProvider.h', - 'src/EarlGrey/Provider/GREYUIWindowProvider.h', - 'src/EarlGrey/Synchronization/GREYAppStateTracker.h', - 'src/EarlGrey/Synchronization/GREYTimedIdlingResource.h', - ], - 'dependencies': [ - '../../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', - '../fishhook/fishhook.gyp:fishhook', - '../ochamcrest/ochamcrest.gyp:OCHamcrest', - ], - # EarlGrey.pch requires that NS_BLOCK_ASSERTIONS be undefined. - 'defines!': [ - 'NS_BLOCK_ASSERTIONS=1', - ], - 'xcode_settings': { - 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', - 'GCC_PREFIX_HEADER': 'src/EarlGrey.pch', - 'USE_HEADERMAP': 'YES', - 'CLANG_ENABLE_OBJC_ARC': 'YES', - 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer', - 'BUNDLE_IDENTIFIER': 'com.google.earlgrey.EarlGrey', - 'INFOPLIST_FILE': 'src/EarlGrey-Info.plist', - 'DYLIB_INSTALL_NAME_BASE': '@rpath', - 'OTHER_LDFLAGS': [ - '-Xlinker', '-rpath', '-Xlinker', '@executable_path/Frameworks', - '-Xlinker', '-rpath', '-Xlinker', '@loader_path/Frameworks' - ] - }, - 'link_settings': { - 'libraries': [ - 'CoreGraphics.framework', - 'Foundation.framework', - 'IOKit.framework', - 'QuartzCore.framework', - 'UIKit.framework', - 'XCTest.framework', - ], - }, - 'include_dirs': [ - 'src', - 'src/EarlGrey', - ], - 'export_dependent_settings': [ - '../ochamcrest/ochamcrest.gyp:OCHamcrest', - ], - 'mac_framework_dirs': [ - '$(SDKROOT)/../../Library/Frameworks', - '<(PRODUCT_DIR)' - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'src/EarlGrey', - ], - 'mac_framework_dirs': [ - # EarlGrey and its dependencies need to link to XCTest.framework - # which is not under SDKROOT. - '$(SDKROOT)/../../Library/Frameworks', - '<(PRODUCT_DIR)' - ], - }, - }, - ], -} - diff --git a/chromium/ios/third_party/earl_grey/ios_eg_test.gni b/chromium/ios/third_party/earl_grey/ios_eg_test.gni new file mode 100644 index 00000000000..39d21029af8 --- /dev/null +++ b/chromium/ios/third_party/earl_grey/ios_eg_test.gni @@ -0,0 +1,30 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/ios/rules.gni") + +# EarlGrey tests are just XCTests that also depends on EarlGrey. +template("ios_eg_test") { + ios_xctest_test(target_name) { + forward_variables_from(invoker, "*") + if (!defined(bundle_deps)) { + bundle_deps = [] + } + bundle_deps += [ + "//ios/third_party/earl_grey:earl_grey+bundle", + "//ios/third_party/ochamcrest:ochamcrest+bundle", + ] + if (!defined(deps)) { + deps = [] + } + deps += [ + "//ios/third_party/earl_grey:earl_grey+link", + "//ios/third_party/ochamcrest:ochamcrest+link", + ] + } +} + +set_defaults("ios_eg_test") { + configs = default_executable_configs +} diff --git a/chromium/ios/third_party/fishhook/fishhook.gyp b/chromium/ios/third_party/fishhook/fishhook.gyp deleted file mode 100644 index 968eb044f6a..00000000000 --- a/chromium/ios/third_party/fishhook/fishhook.gyp +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2016 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': [ - { - # GN version: //ios/third_party/fishhook - 'target_name': 'fishhook', - 'type': 'static_library', - 'sources': [ - 'src/fishhook.c', - 'src/fishhook.h', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'src' - ], - }, - }, - ], -} diff --git a/chromium/ios/third_party/gcdwebserver/BUILD.gn b/chromium/ios/third_party/gcdwebserver/BUILD.gn index 5207f75b5d0..4b83fd64a40 100644 --- a/chromium/ios/third_party/gcdwebserver/BUILD.gn +++ b/chromium/ios/third_party/gcdwebserver/BUILD.gn @@ -23,7 +23,7 @@ config("private_config") { # TODO(crbug.com/569158): Suppresses warnings that are treated as errors # when minimum iOS version support is increased to iOS 9 and up. # This should be removed once all deprecation violations have been fixed. - cflags = [ "-Wno-deprecated-declarations" ] + cflags = [ "-Wno-error=deprecated-declarations" ] } source_set("gcdwebserver") { diff --git a/chromium/ios/third_party/gcdwebserver/gcdwebserver.gyp b/chromium/ios/third_party/gcdwebserver/gcdwebserver.gyp deleted file mode 100644 index 7b81626e055..00000000000 --- a/chromium/ios/third_party/gcdwebserver/gcdwebserver.gyp +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -{ - 'targets' : [ - { - # GN version: //ios/third_party/gcdwebserver - 'target_name' : 'gcdwebserver', - 'type': 'static_library', - 'include_dirs': [ - 'src/GCDWebServer/Core', - 'src/GCDWebServer/Requests', - 'src/GCDWebServer/Responses', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'src/GCDWebServer/Core', - 'src/GCDWebServer/Requests', - 'src/GCDWebServer/Responses', - ], - }, - 'xcode_settings': { - 'CLANG_ENABLE_OBJC_ARC': 'YES', - # TODO(crbug.com/569158): Suppresses warnings that are treated as errors - # when minimum iOS version support is increased to iOS 9 and up. - # This should be removed once all deprecation violations have been fixed. - 'WARNING_CFLAGS': ['-Wno-deprecated-declarations'], - }, - 'sources': [ - 'src/GCDWebServer/Core/GCDWebServer.h', - 'src/GCDWebServer/Core/GCDWebServer.m', - 'src/GCDWebServer/Core/GCDWebServerConnection.h', - 'src/GCDWebServer/Core/GCDWebServerConnection.m', - 'src/GCDWebServer/Core/GCDWebServerFunctions.h', - 'src/GCDWebServer/Core/GCDWebServerFunctions.m', - 'src/GCDWebServer/Core/GCDWebServerHTTPStatusCodes.h', - 'src/GCDWebServer/Core/GCDWebServerPrivate.h', - 'src/GCDWebServer/Core/GCDWebServerRequest.h', - 'src/GCDWebServer/Core/GCDWebServerRequest.m', - 'src/GCDWebServer/Core/GCDWebServerResponse.h', - 'src/GCDWebServer/Core/GCDWebServerResponse.m', - 'src/GCDWebServer/Requests/GCDWebServerDataRequest.h', - 'src/GCDWebServer/Requests/GCDWebServerDataRequest.m', - 'src/GCDWebServer/Requests/GCDWebServerFileRequest.h', - 'src/GCDWebServer/Requests/GCDWebServerFileRequest.m', - 'src/GCDWebServer/Requests/GCDWebServerMultiPartFormRequest.h', - 'src/GCDWebServer/Requests/GCDWebServerMultiPartFormRequest.m', - 'src/GCDWebServer/Requests/GCDWebServerURLEncodedFormRequest.h', - 'src/GCDWebServer/Requests/GCDWebServerURLEncodedFormRequest.m', - 'src/GCDWebServer/Responses/GCDWebServerDataResponse.h', - 'src/GCDWebServer/Responses/GCDWebServerDataResponse.m', - 'src/GCDWebServer/Responses/GCDWebServerErrorResponse.h', - 'src/GCDWebServer/Responses/GCDWebServerErrorResponse.m', - 'src/GCDWebServer/Responses/GCDWebServerFileResponse.h', - 'src/GCDWebServer/Responses/GCDWebServerFileResponse.m', - 'src/GCDWebServer/Responses/GCDWebServerStreamedResponse.h', - 'src/GCDWebServer/Responses/GCDWebServerStreamedResponse.m', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework', - '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework', - ], - 'xcode_settings': { - 'OTHER_LDFLAGS': [ - '-lz', - ], - }, - }, - }, - ], -} diff --git a/chromium/ios/third_party/material_text_accessibility_ios/BUILD.gn b/chromium/ios/third_party/material_text_accessibility_ios/BUILD.gn new file mode 100644 index 00000000000..72f0ead127c --- /dev/null +++ b/chromium/ios/third_party/material_text_accessibility_ios/BUILD.gn @@ -0,0 +1,28 @@ +# Copyright 2016 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. + +config("material_text_accessibility_ios_config") { + include_dirs = [ "src/src" ] + visibility = [ ":material_text_accessibility_ios" ] +} + +source_set("material_text_accessibility_ios") { + sources = [ + "src/src/MDFTextAccessibility-Bridging-Header.h", + "src/src/MDFTextAccessibility.h", + "src/src/MDFTextAccessibility.m", + "src/src/private/MDFColorCalculations.h", + "src/src/private/MDFColorCalculations.m", + "src/src/private/MDFImageCalculations.h", + "src/src/private/MDFImageCalculations.m", + "src/src/private/NSArray+MDFUtils.h", + "src/src/private/NSArray+MDFUtils.m", + ] + + public_configs = [ ":material_text_accessibility_ios_config" ] + configs += [ + ":material_text_accessibility_ios_config", + "//build/config/compiler:enable_arc", + ] +} diff --git a/chromium/ios/third_party/ochamcrest/BUILD.gn b/chromium/ios/third_party/ochamcrest/BUILD.gn index 4994658711a..815a85d2f9b 100644 --- a/chromium/ios/third_party/ochamcrest/BUILD.gn +++ b/chromium/ios/third_party/ochamcrest/BUILD.gn @@ -6,6 +6,7 @@ import("//build/config/ios/rules.gni") ios_framework_bundle("ochamcrest") { output_name = "OCHamcrest" + info_plist = "Info.plist" testonly = true sources = [ @@ -228,7 +229,13 @@ ios_framework_bundle("ochamcrest") { "UIKit.framework", ] - configs += [ "//build/config/compiler:enable_arc" ] - configs -= [ "//build/config/gcc:symbol_visibility_hidden" ] - configs += [ "//build/config/gcc:symbol_visibility_default" ] + configs -= [ + "//build/config/compiler:chromium_code", + "//build/config/gcc:symbol_visibility_hidden", + ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/compiler:no_chromium_code", + "//build/config/gcc:symbol_visibility_default", + ] } diff --git a/chromium/ios/third_party/ochamcrest/ochamcrest.gyp b/chromium/ios/third_party/ochamcrest/ochamcrest.gyp deleted file mode 100644 index bf1ec1b2b7e..00000000000 --- a/chromium/ios/third_party/ochamcrest/ochamcrest.gyp +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 2016 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. - -{ - 'chromium_sources': 0, - 'targets': [ - { - 'target_name': 'OCHamcrest', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ - 'src/Source/Core/HCAssertThat.h', - 'src/Source/Core/HCAssertThat.m', - 'src/Source/Core/HCBaseDescription.h', - 'src/Source/Core/HCBaseDescription.m', - 'src/Source/Core/HCBaseMatcher.h', - 'src/Source/Core/HCBaseMatcher.m', - 'src/Source/Core/HCDescription.h', - 'src/Source/Core/HCDiagnosingMatcher.h', - 'src/Source/Core/HCDiagnosingMatcher.m', - 'src/Source/Core/HCMatcher.h', - 'src/Source/Core/HCSelfDescribing.h', - 'src/Source/Core/HCStringDescription.h', - 'src/Source/Core/HCStringDescription.m', - 'src/Source/Core/Helpers/HCCollect.h', - 'src/Source/Core/Helpers/HCCollect.m', - 'src/Source/Core/Helpers/HCInvocationMatcher.h', - 'src/Source/Core/Helpers/HCInvocationMatcher.m', - 'src/Source/Core/Helpers/HCRequireNonNilObject.h', - 'src/Source/Core/Helpers/HCRequireNonNilObject.m', - 'src/Source/Core/Helpers/HCWrapInMatcher.h', - 'src/Source/Core/Helpers/HCWrapInMatcher.m', - 'src/Source/Core/Helpers/NSInvocation+OCHamcrest.h', - 'src/Source/Core/Helpers/NSInvocation+OCHamcrest.m', - 'src/Source/Core/Helpers/ReturnValueGetters/HCBoolReturnGetter.h', - 'src/Source/Core/Helpers/ReturnValueGetters/HCBoolReturnGetter.m', - 'src/Source/Core/Helpers/ReturnValueGetters/HCCharReturnGetter.h', - 'src/Source/Core/Helpers/ReturnValueGetters/HCCharReturnGetter.m', - 'src/Source/Core/Helpers/ReturnValueGetters/HCDoubleReturnGetter.h', - 'src/Source/Core/Helpers/ReturnValueGetters/HCDoubleReturnGetter.m', - 'src/Source/Core/Helpers/ReturnValueGetters/HCFloatReturnGetter.h', - 'src/Source/Core/Helpers/ReturnValueGetters/HCFloatReturnGetter.m', - 'src/Source/Core/Helpers/ReturnValueGetters/HCIntReturnGetter.h', - 'src/Source/Core/Helpers/ReturnValueGetters/HCIntReturnGetter.m', - 'src/Source/Core/Helpers/ReturnValueGetters/HCLongLongReturnGetter.h', - 'src/Source/Core/Helpers/ReturnValueGetters/HCLongLongReturnGetter.m', - 'src/Source/Core/Helpers/ReturnValueGetters/HCLongReturnGetter.h', - 'src/Source/Core/Helpers/ReturnValueGetters/HCLongReturnGetter.m', - 'src/Source/Core/Helpers/ReturnValueGetters/HCObjectReturnGetter.h', - 'src/Source/Core/Helpers/ReturnValueGetters/HCObjectReturnGetter.m', - 'src/Source/Core/Helpers/ReturnValueGetters/HCReturnTypeHandlerChain.h', - 'src/Source/Core/Helpers/ReturnValueGetters/HCReturnTypeHandlerChain.m', - 'src/Source/Core/Helpers/ReturnValueGetters/HCReturnValueGetter.h', - 'src/Source/Core/Helpers/ReturnValueGetters/HCReturnValueGetter.m', - 'src/Source/Core/Helpers/ReturnValueGetters/HCShortReturnGetter.h', - 'src/Source/Core/Helpers/ReturnValueGetters/HCShortReturnGetter.m', - 'src/Source/Core/Helpers/ReturnValueGetters/HCUnsignedCharReturnGetter.h', - 'src/Source/Core/Helpers/ReturnValueGetters/HCUnsignedCharReturnGetter.m', - 'src/Source/Core/Helpers/ReturnValueGetters/HCUnsignedIntReturnGetter.h', - 'src/Source/Core/Helpers/ReturnValueGetters/HCUnsignedIntReturnGetter.m', - 'src/Source/Core/Helpers/ReturnValueGetters/HCUnsignedLongLongReturnGetter.h', - 'src/Source/Core/Helpers/ReturnValueGetters/HCUnsignedLongLongReturnGetter.m', - 'src/Source/Core/Helpers/ReturnValueGetters/HCUnsignedLongReturnGetter.h', - 'src/Source/Core/Helpers/ReturnValueGetters/HCUnsignedLongReturnGetter.m', - 'src/Source/Core/Helpers/ReturnValueGetters/HCUnsignedShortReturnGetter.h', - 'src/Source/Core/Helpers/ReturnValueGetters/HCUnsignedShortReturnGetter.m', - 'src/Source/Core/Helpers/TestFailureReporters/HCGenericTestFailureReporter.h', - 'src/Source/Core/Helpers/TestFailureReporters/HCGenericTestFailureReporter.m', - 'src/Source/Core/Helpers/TestFailureReporters/HCSenTestFailureReporter.h', - 'src/Source/Core/Helpers/TestFailureReporters/HCSenTestFailureReporter.m', - 'src/Source/Core/Helpers/TestFailureReporters/HCTestFailure.h', - 'src/Source/Core/Helpers/TestFailureReporters/HCTestFailure.m', - 'src/Source/Core/Helpers/TestFailureReporters/HCTestFailureReporter.h', - 'src/Source/Core/Helpers/TestFailureReporters/HCTestFailureReporter.m', - 'src/Source/Core/Helpers/TestFailureReporters/HCTestFailureReporterChain.h', - 'src/Source/Core/Helpers/TestFailureReporters/HCTestFailureReporterChain.m', - 'src/Source/Core/Helpers/TestFailureReporters/HCXCTestFailureReporter.h', - 'src/Source/Core/Helpers/TestFailureReporters/HCXCTestFailureReporter.m', - 'src/Source/Library/Collection/HCEvery.h', - 'src/Source/Library/Collection/HCEvery.m', - 'src/Source/Library/Collection/HCHasCount.h', - 'src/Source/Library/Collection/HCHasCount.m', - 'src/Source/Library/Collection/HCIsCollectionContaining.h', - 'src/Source/Library/Collection/HCIsCollectionContaining.m', - 'src/Source/Library/Collection/HCIsCollectionContainingInAnyOrder.h', - 'src/Source/Library/Collection/HCIsCollectionContainingInAnyOrder.m', - 'src/Source/Library/Collection/HCIsCollectionContainingInOrder.h', - 'src/Source/Library/Collection/HCIsCollectionContainingInOrder.m', - 'src/Source/Library/Collection/HCIsCollectionContainingInRelativeOrder.h', - 'src/Source/Library/Collection/HCIsCollectionContainingInRelativeOrder.m', - 'src/Source/Library/Collection/HCIsCollectionOnlyContaining.h', - 'src/Source/Library/Collection/HCIsCollectionOnlyContaining.m', - 'src/Source/Library/Collection/HCIsDictionaryContaining.h', - 'src/Source/Library/Collection/HCIsDictionaryContaining.m', - 'src/Source/Library/Collection/HCIsDictionaryContainingEntries.h', - 'src/Source/Library/Collection/HCIsDictionaryContainingEntries.m', - 'src/Source/Library/Collection/HCIsDictionaryContainingKey.h', - 'src/Source/Library/Collection/HCIsDictionaryContainingKey.m', - 'src/Source/Library/Collection/HCIsDictionaryContainingValue.h', - 'src/Source/Library/Collection/HCIsDictionaryContainingValue.m', - 'src/Source/Library/Collection/HCIsEmptyCollection.h', - 'src/Source/Library/Collection/HCIsEmptyCollection.m', - 'src/Source/Library/Collection/HCIsIn.h', - 'src/Source/Library/Collection/HCIsIn.m', - 'src/Source/Library/Decorator/HCDescribedAs.h', - 'src/Source/Library/Decorator/HCDescribedAs.m', - 'src/Source/Library/Decorator/HCIs.h', - 'src/Source/Library/Decorator/HCIs.m', - 'src/Source/Library/Logical/HCAllOf.h', - 'src/Source/Library/Logical/HCAllOf.m', - 'src/Source/Library/Logical/HCAnyOf.h', - 'src/Source/Library/Logical/HCAnyOf.m', - 'src/Source/Library/Logical/HCIsAnything.h', - 'src/Source/Library/Logical/HCIsAnything.m', - 'src/Source/Library/Logical/HCIsNot.h', - 'src/Source/Library/Logical/HCIsNot.m', - 'src/Source/Library/Number/HCIsCloseTo.h', - 'src/Source/Library/Number/HCIsCloseTo.m', - 'src/Source/Library/Number/HCIsEqualToNumber.h', - 'src/Source/Library/Number/HCIsEqualToNumber.m', - 'src/Source/Library/Number/HCIsTrueFalse.h', - 'src/Source/Library/Number/HCIsTrueFalse.m', - 'src/Source/Library/Number/HCNumberAssert.h', - 'src/Source/Library/Number/HCNumberAssert.m', - 'src/Source/Library/Number/HCOrderingComparison.h', - 'src/Source/Library/Number/HCOrderingComparison.m', - 'src/Source/Library/Object/HCArgumentCaptor.h', - 'src/Source/Library/Object/HCArgumentCaptor.m', - 'src/Source/Library/Object/HCClassMatcher.h', - 'src/Source/Library/Object/HCClassMatcher.m', - 'src/Source/Library/Object/HCConformsToProtocol.h', - 'src/Source/Library/Object/HCConformsToProtocol.m', - 'src/Source/Library/Object/HCHasDescription.h', - 'src/Source/Library/Object/HCHasDescription.m', - 'src/Source/Library/Object/HCHasProperty.h', - 'src/Source/Library/Object/HCHasProperty.m', - 'src/Source/Library/Object/HCIsEqual.h', - 'src/Source/Library/Object/HCIsEqual.m', - 'src/Source/Library/Object/HCIsInstanceOf.h', - 'src/Source/Library/Object/HCIsInstanceOf.m', - 'src/Source/Library/Object/HCIsNil.h', - 'src/Source/Library/Object/HCIsNil.m', - 'src/Source/Library/Object/HCIsSame.h', - 'src/Source/Library/Object/HCIsSame.m', - 'src/Source/Library/Object/HCIsTypeOf.h', - 'src/Source/Library/Object/HCIsTypeOf.m', - 'src/Source/Library/Object/HCThrowsException.h', - 'src/Source/Library/Object/HCThrowsException.m', - 'src/Source/Library/Text/HCIsEqualIgnoringCase.h', - 'src/Source/Library/Text/HCIsEqualIgnoringCase.m', - 'src/Source/Library/Text/HCIsEqualIgnoringWhiteSpace.h', - 'src/Source/Library/Text/HCIsEqualIgnoringWhiteSpace.m', - 'src/Source/Library/Text/HCStringContains.h', - 'src/Source/Library/Text/HCStringContains.m', - 'src/Source/Library/Text/HCStringContainsInOrder.h', - 'src/Source/Library/Text/HCStringContainsInOrder.m', - 'src/Source/Library/Text/HCStringEndsWith.h', - 'src/Source/Library/Text/HCStringEndsWith.m', - 'src/Source/Library/Text/HCStringStartsWith.h', - 'src/Source/Library/Text/HCStringStartsWith.m', - 'src/Source/Library/Text/HCSubstringMatcher.h', - 'src/Source/Library/Text/HCSubstringMatcher.m', - 'src/Source/OCHamcrest.h', - ], - 'mac_framework_headers': [ - 'src/Source/Core/HCAssertThat.h', - 'src/Source/Core/HCBaseDescription.h', - 'src/Source/Core/HCBaseMatcher.h', - 'src/Source/Core/HCDescription.h', - 'src/Source/Core/HCDiagnosingMatcher.h', - 'src/Source/Core/HCMatcher.h', - 'src/Source/Core/HCSelfDescribing.h', - 'src/Source/Core/HCStringDescription.h', - 'src/Source/Core/Helpers/HCCollect.h', - 'src/Source/Core/Helpers/HCInvocationMatcher.h', - 'src/Source/Core/Helpers/HCRequireNonNilObject.h', - 'src/Source/Core/Helpers/HCWrapInMatcher.h', - 'src/Source/Core/Helpers/TestFailureReporters/HCTestFailure.h', - 'src/Source/Core/Helpers/TestFailureReporters/HCTestFailureReporter.h', - 'src/Source/Core/Helpers/TestFailureReporters/HCTestFailureReporterChain.h', - 'src/Source/Library/Collection/HCEvery.h', - 'src/Source/Library/Collection/HCHasCount.h', - 'src/Source/Library/Collection/HCIsCollectionContaining.h', - 'src/Source/Library/Collection/HCIsCollectionContainingInAnyOrder.h', - 'src/Source/Library/Collection/HCIsCollectionContainingInOrder.h', - 'src/Source/Library/Collection/HCIsCollectionContainingInRelativeOrder.h', - 'src/Source/Library/Collection/HCIsCollectionOnlyContaining.h', - 'src/Source/Library/Collection/HCIsDictionaryContaining.h', - 'src/Source/Library/Collection/HCIsDictionaryContainingEntries.h', - 'src/Source/Library/Collection/HCIsDictionaryContainingKey.h', - 'src/Source/Library/Collection/HCIsDictionaryContainingValue.h', - 'src/Source/Library/Collection/HCIsEmptyCollection.h', - 'src/Source/Library/Collection/HCIsIn.h', - 'src/Source/Library/Decorator/HCDescribedAs.h', - 'src/Source/Library/Decorator/HCIs.h', - 'src/Source/Library/Logical/HCAllOf.h', - 'src/Source/Library/Logical/HCAnyOf.h', - 'src/Source/Library/Logical/HCIsAnything.h', - 'src/Source/Library/Logical/HCIsNot.h', - 'src/Source/Library/Number/HCIsCloseTo.h', - 'src/Source/Library/Number/HCIsEqualToNumber.h', - 'src/Source/Library/Number/HCIsTrueFalse.h', - 'src/Source/Library/Number/HCNumberAssert.h', - 'src/Source/Library/Number/HCOrderingComparison.h', - 'src/Source/Library/Object/HCArgumentCaptor.h', - 'src/Source/Library/Object/HCClassMatcher.h', - 'src/Source/Library/Object/HCConformsToProtocol.h', - 'src/Source/Library/Object/HCHasDescription.h', - 'src/Source/Library/Object/HCHasProperty.h', - 'src/Source/Library/Object/HCIsEqual.h', - 'src/Source/Library/Object/HCIsInstanceOf.h', - 'src/Source/Library/Object/HCIsNil.h', - 'src/Source/Library/Object/HCIsSame.h', - 'src/Source/Library/Object/HCIsTypeOf.h', - 'src/Source/Library/Object/HCThrowsException.h', - 'src/Source/Library/Text/HCIsEqualIgnoringCase.h', - 'src/Source/Library/Text/HCIsEqualIgnoringWhiteSpace.h', - 'src/Source/Library/Text/HCStringContains.h', - 'src/Source/Library/Text/HCStringContainsInOrder.h', - 'src/Source/Library/Text/HCStringEndsWith.h', - 'src/Source/Library/Text/HCStringStartsWith.h', - 'src/Source/Library/Text/HCSubstringMatcher.h', - 'src/Source/OCHamcrest.h', - ], - 'xcode_settings': { - 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', - 'USE_HEADERMAP': 'YES', - 'CLANG_ENABLE_ARC': 'YES', - 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer', - 'PRODUCT_BUNDLE_IDENTIFIER': 'org.hamcrest.OCHamcrest.OCHamcrest-iOS', - 'INFOPLIST_FILE': 'src/Source/OCHamcrest-Info.plist', - 'DYLIB_INSTALL_NAME_BASE': '@rpath', - 'OTHER_LDFLAGS': [ - '-Xlinker', '-rpath', '-Xlinker', '@executable_path/Frameworks', - '-Xlinker', '-rpath', '-Xlinker', '@loader_path/Frameworks' - ] - }, - 'include_dirs': [ - 'src', - 'src/Source', - ], - 'mac_framework_dirs': [ - '$(SDKROOT)/../../Library/Frameworks', - ], - 'link_settings': { - 'libraries': [ - 'Foundation.framework', - 'UIKit.framework', - ], - }, - }, - ], -} diff --git a/chromium/ios/web/BUILD.gn b/chromium/ios/web/BUILD.gn index 045e41f0426..4011076470a 100644 --- a/chromium/ios/web/BUILD.gn +++ b/chromium/ios/web/BUILD.gn @@ -7,7 +7,7 @@ import("//ios/web/js_compile.gni") import("//testing/test.gni") import("//tools/grit/grit_rule.gni") -source_set("web") { +source_set("web_arc") { deps = [ ":core", ":js_resources", @@ -65,10 +65,6 @@ source_set("web") { "net/cert_host_pair.cc", "net/cert_host_pair.h", "net/cert_policy.cc", - "net/cert_store_impl.cc", - "net/cert_store_impl.h", - "net/cert_verifier_block_adapter.cc", - "net/cert_verifier_block_adapter.h", "net/certificate_policy_cache.cc", "net/clients/crw_js_injection_network_client.h", "net/clients/crw_js_injection_network_client.mm", @@ -94,12 +90,12 @@ source_set("web") { "net/request_tracker_impl.mm", "net/web_http_protocol_handler_delegate.h", "net/web_http_protocol_handler_delegate.mm", + "payments/payment_request.cc", "public/active_state_manager.h", "public/block_types.h", "public/browser_state.h", "public/browser_url_rewriter.h", "public/cert_policy.h", - "public/cert_store.h", "public/certificate_policy_cache.h", "public/favicon_status.cc", "public/favicon_status.h", @@ -115,6 +111,7 @@ source_set("web") { "public/navigation_manager.h", "public/origin_util.h", "public/origin_util.mm", + "public/payments/payment_request.h", "public/referrer.h", "public/referrer_util.cc", "public/referrer_util.h", @@ -163,6 +160,12 @@ source_set("web") { "public/web_thread_delegate.h", "public/web_ui_ios_data_source.h", "public/web_view_creation_util.h", + "public/webui/web_ui_ios.h", + "public/webui/web_ui_ios_controller.cc", + "public/webui/web_ui_ios_controller.h", + "public/webui/web_ui_ios_controller_factory.h", + "public/webui/web_ui_ios_message_handler.cc", + "public/webui/web_ui_ios_message_handler.h", "string_util.cc", "url_scheme_util.mm", "url_util.cc", @@ -184,12 +187,71 @@ source_set("web") { "web_state/js/credential_util.mm", "web_state/js/crw_js_injection_manager.mm", "web_state/js/crw_js_injection_receiver.mm", - "web_state/js/crw_js_invoke_parameter_queue.h", - "web_state/js/crw_js_invoke_parameter_queue.mm", "web_state/js/crw_js_plugin_placeholder_manager.h", "web_state/js/crw_js_plugin_placeholder_manager.mm", "web_state/js/crw_js_post_request_loader.h", "web_state/js/crw_js_post_request_loader.mm", + "web_thread_impl.cc", + "web_thread_impl.h", + "web_view_creation_util.mm", + "webui/crw_web_ui_manager.h", + "webui/crw_web_ui_manager.mm", + "webui/crw_web_ui_page_builder.h", + "webui/crw_web_ui_page_builder.mm", + "webui/mojo_facade.h", + "webui/mojo_facade.mm", + "webui/mojo_js_constants.cc", + "webui/mojo_js_constants.h", + "webui/shared_resources_data_source_ios.h", + "webui/shared_resources_data_source_ios.mm", + "webui/url_data_manager_ios.cc", + "webui/url_data_manager_ios.h", + "webui/url_data_manager_ios_backend.h", + "webui/url_data_manager_ios_backend.mm", + "webui/url_data_source_ios.mm", + "webui/url_data_source_ios_impl.cc", + "webui/url_data_source_ios_impl.h", + "webui/url_fetcher_block_adapter.h", + "webui/url_fetcher_block_adapter.mm", + "webui/web_ui_ios_controller_factory_registry.cc", + "webui/web_ui_ios_controller_factory_registry.h", + "webui/web_ui_ios_data_source_impl.h", + "webui/web_ui_ios_data_source_impl.mm", + "webui/web_ui_ios_impl.h", + "webui/web_ui_ios_impl.mm", + ] + + libs = [ "WebKit.framework" ] + + configs += [ "//build/config/compiler:enable_arc" ] +} + +source_set("web") { + deps = [ + ":core", + ":js_resources", + ":resources", + ":user_agent", + "//base", + "//components/url_formatter", + "//ios/net", + "//ios/third_party/blink:html_tokenizer", + "//mojo/public/cpp/system", + "//mojo/public/js", + "//net", + "//services/shell/public/cpp", + "//ui/base", + "//ui/gfx", + "//ui/gfx/geometry:geometry", + "//ui/resources", + "//url", + ] + + public_deps = [ + ":web_arc", + ] + + sources = [ "web_state/js/crw_js_window_id_manager.h", "web_state/js/crw_js_window_id_manager.mm", "web_state/js/page_script_util.h", @@ -230,37 +292,11 @@ source_set("web") { "web_state/web_view_internal_creation_util.mm", "web_state/wk_web_view_security_util.h", "web_state/wk_web_view_security_util.mm", - "web_thread_impl.cc", - "web_thread_impl.h", - "web_view_creation_util.mm", - "webui/crw_web_ui_manager.h", - "webui/crw_web_ui_manager.mm", - "webui/crw_web_ui_page_builder.h", - "webui/crw_web_ui_page_builder.mm", - "webui/mojo_facade.h", - "webui/mojo_facade.mm", - "webui/mojo_js_constants.cc", - "webui/mojo_js_constants.h", - "webui/shared_resources_data_source_ios.h", - "webui/shared_resources_data_source_ios.mm", - "webui/url_data_manager_ios.cc", - "webui/url_data_manager_ios.h", - "webui/url_data_manager_ios_backend.h", - "webui/url_data_manager_ios_backend.mm", - "webui/url_data_source_ios.mm", - "webui/url_data_source_ios_impl.cc", - "webui/url_data_source_ios_impl.h", - "webui/url_fetcher_block_adapter.h", - "webui/url_fetcher_block_adapter.mm", - "webui/web_ui_ios_controller_factory_registry.cc", - "webui/web_ui_ios_controller_factory_registry.h", - "webui/web_ui_ios_data_source_impl.h", - "webui/web_ui_ios_data_source_impl.mm", - "webui/web_ui_ios_impl.h", - "webui/web_ui_ios_impl.mm", ] libs = [ "WebKit.framework" ] + + allow_circular_includes_from = [ ":web_arc" ] } source_set("core") { @@ -296,10 +332,15 @@ source_set("earl_grey_test_support") { ":web", "//base", "//base/test:test_support", + "//ios/testing/earl_grey:earl_grey_support", "//ios/third_party/earl_grey", ] sources = [ + "public/test/earl_grey/js_test_util.h", + "public/test/earl_grey/js_test_util.mm", + "public/test/earl_grey/web_view_actions.h", + "public/test/earl_grey/web_view_actions.mm", "public/test/earl_grey/web_view_matchers.h", "public/test/earl_grey/web_view_matchers.mm", "public/test/web_view_interaction_test_util.h", @@ -312,6 +353,7 @@ source_set("test_support") { deps = [ ":web", + "//base", "//base/test:test_support", "//ios/testing:ocmock_support", "//ios/third_party/gcdwebserver", @@ -332,10 +374,16 @@ source_set("test_support") { "public/test/http_server_util.mm", "public/test/js_test_util.h", "public/test/js_test_util.mm", + "public/test/native_controller_test_util.h", + "public/test/native_controller_test_util.mm", "public/test/navigation_test_util.h", "public/test/navigation_test_util.mm", "public/test/response_providers/data_response_provider.h", "public/test/response_providers/data_response_provider.mm", + "public/test/response_providers/delayed_response_provider.h", + "public/test/response_providers/delayed_response_provider.mm", + "public/test/response_providers/error_page_response_provider.h", + "public/test/response_providers/error_page_response_provider.mm", "public/test/response_providers/file_based_response_provider.h", "public/test/response_providers/file_based_response_provider.mm", "public/test/response_providers/file_based_response_provider_impl.h", @@ -362,6 +410,7 @@ source_set("test_support") { "public/test/test_web_thread_bundle.h", "public/test/test_web_view_content_view.h", "public/test/test_web_view_content_view.mm", + "public/test/web_js_test.h", "public/test/web_test.h", "public/test/web_test.mm", "public/test/web_test_suite.h", @@ -443,13 +492,13 @@ test("ios_web_unittests") { "navigation/nscoder_util_unittest.mm", "net/cert_host_pair_unittest.cc", "net/cert_policy_unittest.cc", - "net/cert_verifier_block_adapter_unittest.cc", "net/clients/crw_js_injection_network_client_unittest.mm", "net/crw_cert_verification_controller_unittest.mm", "net/crw_ssl_status_updater_unittest.mm", "net/request_group_util_unittest.mm", "net/request_tracker_impl_unittest.mm", "net/web_http_protocol_handler_delegate_unittest.mm", + "payments/payment_request_unittest.cc", "public/origin_util_unittest.mm", "public/referrer_util_unittest.cc", "public/web_state/page_viewport_state_unittest.mm", @@ -464,7 +513,6 @@ test("ios_web_unittests") { "web_state/js/core_js_unittest.mm", "web_state/js/credential_util_unittest.mm", "web_state/js/crw_js_injection_manager_unittest.mm", - "web_state/js/crw_js_invoke_parameter_queue_unittest.mm", "web_state/js/crw_js_post_request_loader_unittest.mm", "web_state/js/crw_js_window_id_manager_unittest.mm", "web_state/js/page_script_util_unittest.mm", diff --git a/chromium/ios/web/app/BUILD.gn b/chromium/ios/web/app/BUILD.gn index 7599a96ad82..62204ff4052 100644 --- a/chromium/ios/web/app/BUILD.gn +++ b/chromium/ios/web/app/BUILD.gn @@ -9,7 +9,6 @@ source_set("app") { "web_main.mm", "web_main_loop.h", "web_main_loop.mm", - "web_main_runner.h", "web_main_runner.mm", ] diff --git a/chromium/ios/web/ios_web.gyp b/chromium/ios/web/ios_web.gyp deleted file mode 100644 index 5237d9c10f3..00000000000 --- a/chromium/ios/web/ios_web.gyp +++ /dev/null @@ -1,572 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - # GN version: //ios/web/public/app - 'target_name': 'ios_web_app', - 'type': 'static_library', - 'include_dirs': [ - '../..', - ], - 'dependencies': [ - 'ios_web', - '../../base/base.gyp:base', - '../../base/base.gyp:base_i18n', - '../../crypto/crypto.gyp:crypto', - '../../net/net.gyp:net', - '../../ui/base/ui_base.gyp:ui_base', - '../../ui/gfx/gfx.gyp:gfx', - '../../ui/gfx/gfx.gyp:gfx_geometry', - ], - 'sources': [ - 'app/web_main.mm', - 'app/web_main_loop.h', - 'app/web_main_loop.mm', - 'app/web_main_runner.h', - 'app/web_main_runner.mm', - 'public/app/web_main.h', - 'public/app/web_main_delegate.h', - 'public/app/web_main_parts.h', - ], - }, - { - # GN version: //ios/web - 'target_name': 'ios_web', - 'type': 'static_library', - 'include_dirs': [ - '../..', - ], - 'dependencies': [ - 'ios_web_core', - 'ios_web_resources.gyp:ios_web_resources', - 'js_resources', - 'user_agent', - '../../base/base.gyp:base', - '../../components/url_formatter/url_formatter.gyp:url_formatter', - '../../ios/net/ios_net.gyp:ios_net', - '../../ios/third_party/blink/blink_html_tokenizer.gyp:blink_html_tokenizer', - '../../net/net.gyp:net', - '../../mojo/mojo_edk.gyp:mojo_system_impl', - '../../mojo/mojo_public.gyp:mojo_public', - '../../services/shell/shell_public.gyp:shell_public', - '../../ui/base/ui_base.gyp:ui_base', - '../../ui/gfx/gfx.gyp:gfx', - '../../ui/gfx/gfx.gyp:gfx_geometry', - '../../ui/resources/ui_resources.gyp:ui_resources', - '../../url/url.gyp:url_lib', - ], - 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/webui_resources_map.cc', - 'active_state_manager_impl.h', - 'active_state_manager_impl.mm', - 'alloc_with_zone_interceptor.h', - 'alloc_with_zone_interceptor.mm', - 'browser_state.mm', - 'browser_url_rewriter_impl.h', - 'browser_url_rewriter_impl.mm', - 'interstitials/html_web_interstitial_impl.h', - 'interstitials/html_web_interstitial_impl.mm', - 'interstitials/native_web_interstitial_impl.h', - 'interstitials/native_web_interstitial_impl.mm', - 'interstitials/web_interstitial_facade_delegate.h', - 'interstitials/web_interstitial_impl.h', - 'interstitials/web_interstitial_impl.mm', - 'load_committed_details.cc', - 'navigation/crw_session_certificate_policy_manager.h', - 'navigation/crw_session_certificate_policy_manager.mm', - 'navigation/crw_session_controller+private_constructors.h', - 'navigation/crw_session_controller.h', - 'navigation/crw_session_controller.mm', - 'navigation/crw_session_entry.h', - 'navigation/crw_session_entry.mm', - 'navigation/navigation_item_facade_delegate.h', - 'navigation/navigation_item_impl.h', - 'navigation/navigation_item_impl.mm', - 'navigation/navigation_manager_delegate.h', - 'navigation/navigation_manager_facade_delegate.h', - 'navigation/navigation_manager_impl.h', - 'navigation/navigation_manager_impl.mm', - 'navigation/nscoder_util.h', - 'navigation/nscoder_util.mm', - 'navigation/time_smoother.cc', - 'navigation/time_smoother.h', - 'net/cert_host_pair.cc', - 'net/cert_host_pair.h', - 'net/cert_policy.cc', - 'net/cert_store_impl.cc', - 'net/cert_store_impl.h', - 'net/cert_verifier_block_adapter.cc', - 'net/cert_verifier_block_adapter.h', - 'net/certificate_policy_cache.cc', - 'net/clients/crw_js_injection_network_client.h', - 'net/clients/crw_js_injection_network_client.mm', - 'net/clients/crw_js_injection_network_client_factory.h', - 'net/clients/crw_js_injection_network_client_factory.mm', - 'net/clients/crw_redirect_network_client.h', - 'net/clients/crw_redirect_network_client.mm', - 'net/clients/crw_redirect_network_client_factory.h', - 'net/clients/crw_redirect_network_client_factory.mm', - 'net/cookie_notification_bridge.h', - 'net/cookie_notification_bridge.mm', - 'net/crw_cert_verification_controller.h', - 'net/crw_cert_verification_controller.mm', - 'net/crw_request_tracker_delegate.h', - 'net/crw_ssl_status_updater.h', - 'net/crw_ssl_status_updater.mm', - 'net/request_group_util.h', - 'net/request_group_util.mm', - 'net/request_tracker_data_memoizing_store.h', - 'net/request_tracker_factory_impl.h', - 'net/request_tracker_factory_impl.mm', - 'net/request_tracker_impl.h', - 'net/request_tracker_impl.mm', - 'net/web_http_protocol_handler_delegate.h', - 'net/web_http_protocol_handler_delegate.mm', - 'public/active_state_manager.h', - 'public/block_types.h', - 'public/browser_state.h', - 'public/browser_url_rewriter.h', - 'public/cert_policy.h', - 'public/cert_store.h', - 'public/certificate_policy_cache.h', - 'public/favicon_status.cc', - 'public/favicon_status.h', - 'public/favicon_url.cc', - 'public/favicon_url.h', - 'public/interstitials/web_interstitial.h', - 'public/interstitials/web_interstitial_delegate.h', - 'public/java_script_dialog_callback.h', - 'public/java_script_dialog_presenter.h', - 'public/java_script_dialog_type.h', - 'public/load_committed_details.h', - 'public/navigation_item.h', - 'public/navigation_manager.h', - 'public/origin_util.h', - 'public/origin_util.mm', - 'public/referrer.h', - 'public/referrer_util.cc', - 'public/referrer_util.h', - 'public/security_style.h', - 'public/ssl_status.cc', - 'public/ssl_status.h', - 'public/string_util.h', - 'public/url_scheme_util.h', - 'public/url_schemes.h', - 'public/url_schemes.mm', - 'public/url_util.h', - 'public/web/url_data_source_ios.h', - 'public/web_capabilities.cc', - 'public/web_capabilities.h', - 'public/web_client.h', - 'public/web_client.mm', - 'public/web_kit_constants.h', - 'public/web_state/context_menu_params.h', - 'public/web_state/credential.h', - 'public/web_state/crw_web_controller_observer.h', - 'public/web_state/crw_web_user_interface_delegate.h', - 'public/web_state/crw_web_view_proxy.h', - 'public/web_state/crw_web_view_scroll_view_proxy.h', - 'public/web_state/global_web_state_observer.h', - 'public/web_state/js/credential_util.h', - 'public/web_state/js/crw_js_injection_evaluator.h', - 'public/web_state/js/crw_js_injection_manager.h', - 'public/web_state/js/crw_js_injection_receiver.h', - 'public/web_state/page_display_state.h', - 'public/web_state/page_display_state.mm', - 'public/web_state/ui/crw_content_view.h', - 'public/web_state/ui/crw_generic_content_view.h', - 'public/web_state/ui/crw_native_content.h', - 'public/web_state/ui/crw_native_content_provider.h', - 'public/web_state/ui/crw_web_delegate.h', - 'public/web_state/ui/crw_web_view_content_view.h', - 'public/web_state/url_verification_constants.h', - 'public/web_state/web_state.h', - 'public/web_state/web_state_delegate.h', - 'public/web_state/web_state_delegate_bridge.h', - 'public/web_state/web_state_observer.h', - 'public/web_state/web_state_observer_bridge.h', - 'public/web_state/web_state_policy_decider.h', - 'public/web_state/web_state_user_data.h', - 'public/web_thread.h', - 'public/web_thread_delegate.h', - 'public/web_ui_ios_data_source.h', - 'public/web_view_creation_util.h', - 'string_util.cc', - 'url_scheme_util.mm', - 'url_util.cc', - 'web_kit_constants.cc', - 'web_state/blocked_popup_info.h', - 'web_state/blocked_popup_info.mm', - 'web_state/context_menu_params.mm', - 'web_state/credential.cc', - 'web_state/crw_pass_kit_downloader.h', - 'web_state/crw_pass_kit_downloader.mm', - 'web_state/crw_web_view_proxy_impl.h', - 'web_state/crw_web_view_proxy_impl.mm', - 'web_state/crw_web_view_scroll_view_proxy.mm', - 'web_state/error_translation_util.h', - 'web_state/error_translation_util.mm', - 'web_state/global_web_state_event_tracker.h', - 'web_state/global_web_state_event_tracker.mm', - 'web_state/global_web_state_observer.cc', - 'web_state/js/credential_util.mm', - 'web_state/js/crw_js_injection_manager.mm', - 'web_state/js/crw_js_injection_receiver.mm', - 'web_state/js/crw_js_invoke_parameter_queue.h', - 'web_state/js/crw_js_invoke_parameter_queue.mm', - 'web_state/js/crw_js_plugin_placeholder_manager.h', - 'web_state/js/crw_js_plugin_placeholder_manager.mm', - 'web_state/js/crw_js_post_request_loader.h', - 'web_state/js/crw_js_post_request_loader.mm', - 'web_state/js/crw_js_window_id_manager.h', - 'web_state/js/crw_js_window_id_manager.mm', - 'web_state/js/page_script_util.h', - 'web_state/js/page_script_util.mm', - 'web_state/page_viewport_state.h', - 'web_state/page_viewport_state.mm', - 'web_state/ui/crw_generic_content_view.mm', - 'web_state/ui/crw_swipe_recognizer_provider.h', - 'web_state/ui/crw_touch_tracking_recognizer.h', - 'web_state/ui/crw_touch_tracking_recognizer.mm', - 'web_state/ui/crw_web_controller.h', - 'web_state/ui/crw_web_controller.mm', - 'web_state/ui/crw_web_controller_container_view.h', - 'web_state/ui/crw_web_controller_container_view.mm', - 'web_state/ui/crw_web_view_content_view.mm', - 'web_state/ui/crw_wk_script_message_router.h', - 'web_state/ui/crw_wk_script_message_router.mm', - 'web_state/ui/web_view_js_utils.h', - 'web_state/ui/web_view_js_utils.mm', - 'web_state/ui/wk_back_forward_list_item_holder.h', - 'web_state/ui/wk_back_forward_list_item_holder.mm', - 'web_state/ui/wk_web_view_configuration_provider.h', - 'web_state/ui/wk_web_view_configuration_provider.mm', - 'web_state/web_controller_observer_bridge.h', - 'web_state/web_controller_observer_bridge.mm', - 'web_state/web_state.mm', - 'web_state/web_state_delegate.mm', - 'web_state/web_state_delegate_bridge.mm', - 'web_state/web_state_facade_delegate.h', - 'web_state/web_state_impl.h', - 'web_state/web_state_impl.mm', - 'web_state/web_state_observer.mm', - 'web_state/web_state_observer_bridge.mm', - 'web_state/web_state_policy_decider.mm', - 'web_state/web_state_weak_ptr_factory.h', - 'web_state/web_state_weak_ptr_factory.mm', - 'web_state/web_view_internal_creation_util.h', - 'web_state/web_view_internal_creation_util.mm', - 'web_state/wk_web_view_security_util.h', - 'web_state/wk_web_view_security_util.mm', - 'web_thread_impl.cc', - 'web_thread_impl.h', - 'web_view_creation_util.mm', - 'webui/crw_web_ui_manager.h', - 'webui/crw_web_ui_manager.mm', - 'webui/crw_web_ui_page_builder.h', - 'webui/crw_web_ui_page_builder.mm', - 'webui/mojo_facade.h', - 'webui/mojo_facade.mm', - 'webui/mojo_js_constants.cc', - 'webui/mojo_js_constants.h', - 'webui/shared_resources_data_source_ios.h', - 'webui/shared_resources_data_source_ios.mm', - 'webui/url_data_manager_ios.cc', - 'webui/url_data_manager_ios.h', - 'webui/url_data_manager_ios_backend.h', - 'webui/url_data_manager_ios_backend.mm', - 'webui/url_data_source_ios.mm', - 'webui/url_data_source_ios_impl.cc', - 'webui/url_data_source_ios_impl.h', - 'webui/url_fetcher_block_adapter.h', - 'webui/url_fetcher_block_adapter.mm', - 'webui/web_ui_ios_controller_factory_registry.cc', - 'webui/web_ui_ios_controller_factory_registry.h', - 'webui/web_ui_ios_data_source_impl.h', - 'webui/web_ui_ios_data_source_impl.mm', - 'webui/web_ui_ios_impl.h', - 'webui/web_ui_ios_impl.mm', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/WebKit.framework', - ], - }, - }, - # Target shared by ios_web and CrNet. - { - # GN version: //ios/web:core - 'target_name': 'ios_web_core', - 'type': 'static_library', - 'dependencies': [ - '../../base/base.gyp:base', - ], - 'include_dirs': [ - '../..', - ], - 'sources': [ - 'crw_network_activity_indicator_manager.h', - 'crw_network_activity_indicator_manager.mm', - 'history_state_util.h', - 'history_state_util.mm', - ], - }, - { - # GN version: //ios/web:web_bundle - 'target_name': 'ios_web_js_bundle', - 'type': 'none', - 'variables': { - 'closure_entry_point': '__crWeb.webBundle', - 'js_bundle_files': [ - 'web_state/js/resources/base.js', - 'web_state/js/resources/common.js', - 'web_state/js/resources/console.js', - 'web_state/js/resources/core.js', - 'web_state/js/resources/dialog_overrides.js', - 'web_state/js/resources/message.js', - 'web_state/js/resources/web_bundle.js', - ], - }, - 'sources': [ - 'web_state/js/resources/base.js', - 'web_state/js/resources/common.js', - 'web_state/js/resources/console.js', - 'web_state/js/resources/core.js', - 'web_state/js/resources/dialog_overrides.js', - 'web_state/js/resources/message.js', - 'web_state/js/resources/web_bundle.js', - ], - '!sources': [ - # Remove all js files except web_bundle. Those files should not be - # copied with the rest of resources, as they just Closure dependencies - # for web_bundle.js. Dependencies were added as sources, so they get - # indexed by Xcode. - 'web_state/js/resources/base.js', - 'web_state/js/resources/common.js', - 'web_state/js/resources/console.js', - 'web_state/js/resources/core.js', - 'web_state/js/resources/dialog_overrides.js', - 'web_state/js/resources/message.js', - ], - 'link_settings': { - 'mac_bundle_resources': [ - '<(SHARED_INTERMEDIATE_DIR)/web_bundle.js', - ], - }, - 'includes': [ - 'js_compile_bundle.gypi' - ], - }, - { - # GN version: //ios/web:web_ui_bundle - 'target_name': 'ios_web_ui_js_bundle', - 'type': 'none', - 'variables': { - 'closure_entry_point': '__crWeb.webUIBundle', - 'js_bundle_files': [ - '../third_party/requirejs/require.js', - 'webui/resources/web_ui_base.js', - 'webui/resources/web_ui_bind.js', - 'webui/resources/web_ui_bundle.js', - 'webui/resources/web_ui_favicons.js', - 'webui/resources/web_ui_module_load_notifier.js', - 'webui/resources/web_ui_send.js', - ], - }, - 'sources': [ - '../third_party/requirejs/require.js', - 'webui/resources/web_ui_base.js', - 'webui/resources/web_ui_bind.js', - 'webui/resources/web_ui_bundle.js', - 'webui/resources/web_ui_favicons.js', - 'webui/resources/web_ui_module_load_notifier.js', - 'webui/resources/web_ui_send.js', - ], - '!sources': [ - # Remove all js files except web_ui_bundle. Those files should not be - # copied with the rest of resources, as they just Closure dependencies - # for web_ui_bundle.js. Dependencies were added as sources, so they get - # indexed by Xcode. - '../third_party/requirejs/require.js', - 'webui/resources/web_ui_base.js', - 'webui/resources/web_ui_bind.js', - 'webui/resources/web_ui_favicons.js', - 'webui/resources/web_ui_module_load_notifier.js', - 'webui/resources/web_ui_send.js', - ], - 'link_settings': { - 'mac_bundle_resources': [ - '<(SHARED_INTERMEDIATE_DIR)/web_ui_bundle.js', - ], - }, - 'includes': [ - 'js_compile_bundle.gypi' - ], - }, - { - # GN version: //ios/web:js_resources - 'target_name': 'js_resources', - 'type': 'none', - 'dependencies': [ - 'ios_web_js_bundle', - 'ios_web_ui_js_bundle', - ], - 'sources': [ - 'web_state/js/resources/post_request.js', - 'web_state/js/resources/plugin_placeholder.js', - 'web_state/js/resources/window_id.js', - ], - 'link_settings': { - 'mac_bundle_resources': [ - '<(SHARED_INTERMEDIATE_DIR)/post_request.js', - '<(SHARED_INTERMEDIATE_DIR)/plugin_placeholder.js', - '<(SHARED_INTERMEDIATE_DIR)/window_id.js', - ], - }, - 'includes': [ - 'js_compile_checked.gypi' - ], - }, - { - # GN version: //ios/web:earl_grey_test_support - 'target_name': 'ios_web_earl_grey_test_support', - 'type': 'static_library', - 'dependencies': [ - 'ios_web_test_support', - '<(DEPTH)/ios/third_party/earl_grey/earl_grey.gyp:EarlGrey', - ], - 'sources': [ - 'public/test/earl_grey/web_view_matchers.h', - 'public/test/earl_grey/web_view_matchers.mm', - 'public/test/web_view_interaction_test_util.h', - 'public/test/web_view_interaction_test_util.mm', - ], - }, - { - # GN version: //ios/web:test_support - 'target_name': 'ios_web_test_support', - 'type': 'static_library', - 'dependencies': [ - '../../base/base.gyp:test_support_base', - '../../ios/testing/ios_testing.gyp:ocmock_support', - '../../ios/third_party/gcdwebserver/gcdwebserver.gyp:gcdwebserver', - '../../net/net.gyp:net_test_support', - '../../testing/gmock.gyp:gmock', - '../../testing/gtest.gyp:gtest', - '../../third_party/ocmock/ocmock.gyp:ocmock', - '../../ui/base/ui_base.gyp:ui_base', - 'ios_web', - 'test_mojo_bindings', - ], - 'include_dirs': [ - '../..', - ], - 'sources': [ - 'public/test/crw_test_js_injection_receiver.h', - 'public/test/crw_test_js_injection_receiver.mm', - 'public/test/http_server.h', - 'public/test/http_server.mm', - 'public/test/http_server_util.h', - 'public/test/http_server_util.mm', - 'public/test/js_test_util.h', - 'public/test/js_test_util.mm', - 'public/test/navigation_test_util.h', - 'public/test/navigation_test_util.mm', - 'public/test/response_providers/data_response_provider.h', - 'public/test/response_providers/data_response_provider.mm', - 'public/test/response_providers/file_based_response_provider.h', - 'public/test/response_providers/file_based_response_provider.mm', - 'public/test/response_providers/file_based_response_provider_impl.h', - 'public/test/response_providers/file_based_response_provider_impl.mm', - 'public/test/response_providers/html_response_provider.h', - 'public/test/response_providers/html_response_provider.mm', - 'public/test/response_providers/html_response_provider_impl.h', - 'public/test/response_providers/html_response_provider_impl.mm', - 'public/test/response_providers/response_provider.h', - 'public/test/response_providers/response_provider.mm', - 'public/test/response_providers/string_response_provider.h', - 'public/test/response_providers/string_response_provider.mm', - 'public/test/scoped_testing_web_client.h', - 'public/test/scoped_testing_web_client.mm', - 'public/test/test_browser_state.cc', - 'public/test/test_browser_state.h', - 'public/test/test_redirect_observer.h', - 'public/test/test_redirect_observer.mm', - 'public/test/test_web_client.h', - 'public/test/test_web_client.mm', - 'public/test/test_web_state.h', - 'public/test/test_web_state.mm', - 'public/test/test_web_thread.h', - 'public/test/test_web_thread_bundle.h', - 'public/test/test_web_view_content_view.h', - 'public/test/test_web_view_content_view.mm', - 'public/test/web_test.h', - 'public/test/web_test.mm', - 'public/test/web_test_suite.h', - 'public/test/web_test_with_web_state.h', - 'public/test/web_test_with_web_state.mm', - 'test/crw_fake_web_controller_observer.h', - 'test/crw_fake_web_controller_observer.mm', - 'test/test_url_constants.cc', - 'test/test_url_constants.h', - 'test/test_web_thread.cc', - 'test/test_web_thread_bundle.cc', - 'test/web_int_test.h', - 'test/web_int_test.mm', - 'test/web_test_with_web_controller.h', - 'test/web_test_with_web_controller.mm', - 'test/web_test_suite.mm', - 'test/wk_web_view_crash_utils.h', - 'test/wk_web_view_crash_utils.mm', - ], - }, - { - # GN version: //ios/web/test:mojo_bindings - 'target_name': 'test_mojo_bindings_mojom', - 'type': 'none', - 'variables': { - 'mojom_files': [ - 'test/mojo_test.mojom', - ], - }, - 'include_dirs': [ - '..', - ], - 'includes': [ '../../mojo/mojom_bindings_generator_explicit.gypi' ], - }, - { - # GN version: //ios/web/test:mojo_bindings - 'target_name': 'test_mojo_bindings', - 'type': 'static_library', - 'dependencies': [ - '../../mojo/mojo_base.gyp:mojo_common_lib', - '../../mojo/mojo_public.gyp:mojo_cpp_bindings', - 'test_mojo_bindings_mojom', - ], - 'include_dirs': [ - '..', - ], - }, - { - # GN version: //ios/web:user_agent - 'target_name': 'user_agent', - 'type': 'static_library', - 'include_dirs': [ - '../..', - ], - 'dependencies': [ - '../../base/base.gyp:base' - ], - 'sources': [ - 'public/user_agent.h', - 'public/user_agent.mm', - ], - }, - ], -} diff --git a/chromium/ios/web/ios_web_inttests.gyp b/chromium/ios/web/ios_web_inttests.gyp deleted file mode 100644 index 71be2f34062..00000000000 --- a/chromium/ios/web/ios_web_inttests.gyp +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 2015 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. -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - 'target_name': 'ios_web_inttests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - '../../base/base.gyp:base', - '../../base/base.gyp:test_support_base', - '../../ios/provider/ios_provider_web.gyp:ios_provider_web', - '../../net/net.gyp:net_test_support', - '../../services/shell/shell_public.gyp:shell_public', - '../../testing/gtest.gyp:gtest', - '../../ui/base/ui_base.gyp:ui_base_test_support', - 'ios_web.gyp:ios_web', - 'ios_web.gyp:ios_web_test_support', - 'ios_web.gyp:test_mojo_bindings', - 'test_resources', - 'packed_test_resources', - ], - 'sources': [ - 'browser_state_web_view_partition_inttest.mm', - 'public/test/http_server_inttest.mm', - 'test/run_all_unittests.cc', - 'webui/web_ui_mojo_inttest.mm', - ], - 'mac_bundle_resources': [ - '<(SHARED_INTERMEDIATE_DIR)/ios/web/test/resources.pak' - ], - }, - { - # GN version: //ios/web/test:resources - 'target_name': 'test_resources', - 'type': 'none', - 'hard_dependency': 1, - 'dependencies': [ - 'ios_web.gyp:test_mojo_bindings', - ], - 'actions': [ - { - 'action_name': 'test_resources', - 'variables': { - 'grit_grd_file': 'test/test_resources.grd', - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ios/web/test', - 'grit_additional_defines': [ - '-E', 'root_gen_dir=<(SHARED_INTERMEDIATE_DIR)', - ], - }, - 'includes': [ '../../build/grit_action.gypi' ], - }, - ], - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'files': [ - '<(SHARED_INTERMEDIATE_DIR)/ios/web/test/test_resources.pak' - ], - }, - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - }, - }, - { - 'target_name': 'packed_test_resources', - 'type': 'none', - 'hard_depency': 1, - 'dependencies': [ - 'test_resources', - ], - 'variables': { - 'repack_path': [ - '../../tools/grit/grit/format/repack.py', - ], - }, - 'actions': [ - { - 'action_name': 'repack_test_resources', - 'variables': { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/ios/web/ios_web_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/ios/web/test/test_resources.pak' - ], - 'pak_output': '<(SHARED_INTERMEDIATE_DIR)/ios/web/test/resources.pak', - }, - 'includes': [ '../../build/repack_action.gypi' ], - }, - ], - }, - ], -} diff --git a/chromium/ios/web/ios_web_resources.gyp b/chromium/ios/web/ios_web_resources.gyp deleted file mode 100644 index b9d296a2ea6..00000000000 --- a/chromium/ios/web/ios_web_resources.gyp +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (c) 2016 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': [ - { - # GN version: //ios/web:resources - 'target_name': 'ios_web_resources', - 'type': 'none', - 'variables': { - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ios/web', - }, - 'actions': [ - { - 'action_name': 'generate_ios_web_resources', - 'variables': { - 'grit_grd_file': 'ios_web_resources.grd', - }, - 'grit_additional_defines': [ - '-E', 'root_out_dir=<(PRODUCT_DIR)', - ], - 'includes': [ '../../build/grit_action.gypi' ], - }, - ], - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'files': [ - '<(SHARED_INTERMEDIATE_DIR)/ios/web/ios_web_resources.pak' - ], - }, - ], - }, - ], -} diff --git a/chromium/ios/web/ios_web_shell.gyp b/chromium/ios/web/ios_web_shell.gyp deleted file mode 100644 index 244c1ceb29a..00000000000 --- a/chromium/ios/web/ios_web_shell.gyp +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - # GN version: //ios/web/shell:ios_web_shell - 'target_name': 'ios_web_shell', - 'includes': [ - 'ios_web_shell_exe.gypi', - ] - }, - ], -} diff --git a/chromium/ios/web/ios_web_shell_exe.gypi b/chromium/ios/web/ios_web_shell_exe.gypi deleted file mode 100644 index 4713cd4e219..00000000000 --- a/chromium/ios/web/ios_web_shell_exe.gypi +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 2016 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. - -{ - 'type': 'executable', - 'mac_bundle': 1, - 'include_dirs': [ - '../..', - ], - 'dependencies': [ - 'ios_web.gyp:ios_web', - 'ios_web.gyp:ios_web_app', - '../../base/base.gyp:base', - '../../net/net.gyp:net', - '../../net/net.gyp:net_extras', - '../../ui/base/ui_base.gyp:ui_base', - ], - 'export_dependent_settings': [ - 'ios_web.gyp:ios_web', - 'ios_web.gyp:ios_web_app', - '../../base/base.gyp:base', - '../../net/net.gyp:net', - '../../ui/base/ui_base.gyp:ui_base', - ], - 'xcode_settings': { - 'INFOPLIST_FILE': 'shell/Info.plist', - 'CLANG_ENABLE_OBJC_ARC': 'YES', - }, - 'sources': [ - 'shell/app_delegate.h', - 'shell/app_delegate.mm', - 'shell/shell_browser_state.h', - 'shell/shell_browser_state.mm', - 'shell/shell_main_delegate.h', - 'shell/shell_main_delegate.mm', - 'shell/shell_network_delegate.cc', - 'shell/shell_network_delegate.h', - 'shell/shell_url_request_context_getter.h', - 'shell/shell_url_request_context_getter.mm', - 'shell/shell_web_client.h', - 'shell/shell_web_client.mm', - 'shell/shell_web_main_parts.h', - 'shell/shell_web_main_parts.mm', - 'shell/view_controller.h', - 'shell/view_controller.mm', - 'shell/web_exe_main.mm', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', - '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', - ], - 'mac_bundle_resources': [ - 'shell/Default.png', - 'shell/textfield_background@2x.png', - 'shell/toolbar_back@2x.png', - 'shell/toolbar_forward@2x.png', - ], - }, -} diff --git a/chromium/ios/web/ios_web_shell_tests.gyp b/chromium/ios/web/ios_web_shell_tests.gyp deleted file mode 100644 index 8505ae43f18..00000000000 --- a/chromium/ios/web/ios_web_shell_tests.gyp +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 2016 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. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - 'target_name': 'ios_web_shell_test', - 'type': 'loadable_module', - 'mac_xctest_bundle': 1, - 'variables': { - 'test_host': '<(_target_name)_host', - }, - 'dependencies': [ - '<(test_host)', - ], - 'xcode_settings': { - 'WRAPPER_EXTENSION': 'xctest', - 'TEST_HOST': '${BUILT_PRODUCTS_DIR}/<(test_host).app/<(test_host)', - 'BUNDLE_LOADER': '$(TEST_HOST)', - 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer', - 'INFOPLIST_FILE': 'shell/test/Module-Info.plist', - 'OTHER_LDFLAGS': [ - '-bundle_loader <(test_host).app/<(test_host)', - ], - }, - 'sources': [ - 'shell/test/shell_test.mm', - ], - 'link_settings': { - 'libraries': [ - 'Foundation.framework', - 'XCTest.framework', - ], - }, - }, - { - # Create a test host for earl grey tests, so Xcode 7.3 and above - # doesn't contaminate the app structure. - 'target_name': 'ios_web_shell_test_host', - 'includes': [ - 'ios_web_shell_exe.gypi', - ], - 'link_settings': { - 'libraries': [ - 'XCTest.framework', - ], - }, - 'xcode_settings': { - 'INFOPLIST_FILE': 'shell/test/Host-Info.plist', - 'OTHER_LDFLAGS': [ - '-Xlinker', '-rpath', '-Xlinker', '@executable_path/Frameworks', - '-Xlinker', '-rpath', '-Xlinker', '@loader_path/Frameworks' - ] - }, - 'dependencies': [ - 'ios_web_shell_earl_grey_test_support', - '<(DEPTH)/ios/third_party/earl_grey/earl_grey.gyp:EarlGrey', - ], - 'sources': [ - 'shell/test/web_shell_navigation_egtest.mm', - ], - 'actions': [{ - 'action_name': 'copy_test_data', - 'variables': { - 'test_data_files': [ - '../../ios/web/shell/test/http_server_files', - ], - # Files are copied to .app/<test_data_prefix>/<test_data_files>. - # Since the test_data_files are two levels up, the test_data_prefix - # needs to be two levels deep so the files end up in the .app bundle - # and not in some parent directory. In other words, this will resolve - # to: .app/ios/web/../../ios/web/shell/test/http_server_files. - 'test_data_prefix': 'ios/web', - }, - 'includes': [ '../../build/copy_test_data_ios.gypi' ], - }], - - 'postbuilds': [ - { - 'postbuild_name': 'Copy OCHamcrest to TEST_HOST', - 'action': [ - 'ditto', - '${BUILT_PRODUCTS_DIR}/OCHamcrest.framework', - '${BUILT_PRODUCTS_DIR}/<(_target_name).app/Frameworks/OCHamcrest.framework', - ], - }, - { - 'postbuild_name': 'Copy EarlGrey to TEST_HOST', - 'action': [ - 'ditto', - '${BUILT_PRODUCTS_DIR}/EarlGrey.framework', - '${BUILT_PRODUCTS_DIR}/<(_target_name).app/Frameworks/EarlGrey.framework', - ], - }, - ], - }, - { - # TODO(crbug.com/606815): Refactor out code that is common across Chrome - # and the web shell. - 'target_name': 'ios_web_shell_earl_grey_test_support', - 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/ios/third_party/earl_grey/earl_grey.gyp:EarlGrey', - 'ios_web.gyp:ios_web_earl_grey_test_support', - '../testing/earl_grey/earl_grey_support.gyp:earl_grey_support', - ], - 'sources': [ - 'shell/test/app/navigation_test_util.h', - 'shell/test/app/navigation_test_util.mm', - 'shell/test/app/web_shell_test_util.h', - 'shell/test/app/web_shell_test_util.mm', - 'shell/test/app/web_view_interaction_test_util.h', - 'shell/test/app/web_view_interaction_test_util.mm', - 'shell/test/earl_grey/shell_matchers.h', - 'shell/test/earl_grey/shell_matchers.mm', - ], - }, - ], -} diff --git a/chromium/ios/web/ios_web_unittests.gyp b/chromium/ios/web/ios_web_unittests.gyp deleted file mode 100644 index 51fdfac2f28..00000000000 --- a/chromium/ios/web/ios_web_unittests.gyp +++ /dev/null @@ -1,100 +0,0 @@ -# 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. -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - # GN version: //ios/web:ios_web_unittests - 'target_name': 'ios_web_unittests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - '../../base/base.gyp:base', - '../../base/base.gyp:test_support_base', - '../../net/net.gyp:net_test_support', - '../../testing/gmock.gyp:gmock', - '../../testing/gtest.gyp:gtest', - '../../third_party/ocmock/ocmock.gyp:ocmock', - '../../ui/base/ui_base.gyp:ui_base_test_support', - '../testing/ios_testing.gyp:ocmock_support', - 'ios_web.gyp:ios_web', - 'ios_web.gyp:ios_web_test_support', - ], - 'sources': [ - 'active_state_manager_impl_unittest.mm', - 'alloc_with_zone_interceptor_unittest.mm', - 'browser_state_unittest.cc', - 'crw_network_activity_indicator_manager_unittest.mm', - 'history_state_util_unittest.mm', - 'navigation/crw_session_controller_unittest.mm', - 'navigation/crw_session_entry_unittest.mm', - 'navigation/navigation_item_impl_unittest.mm', - 'navigation/navigation_manager_impl_unittest.mm', - 'navigation/nscoder_util_unittest.mm', - 'net/cert_host_pair_unittest.cc', - 'net/cert_policy_unittest.cc', - 'net/cert_verifier_block_adapter_unittest.cc', - 'net/clients/crw_js_injection_network_client_unittest.mm', - 'net/crw_cert_verification_controller_unittest.mm', - 'net/crw_ssl_status_updater_unittest.mm', - 'net/request_group_util_unittest.mm', - 'net/request_tracker_impl_unittest.mm', - 'net/web_http_protocol_handler_delegate_unittest.mm', - 'public/origin_util_unittest.mm', - 'public/referrer_util_unittest.cc', - 'public/web_state/page_viewport_state_unittest.mm', - 'string_util_unittest.cc', - 'test/crw_fake_web_controller_observer_unittest.mm', - 'test/run_all_unittests.cc', - 'url_scheme_util_unittest.mm', - 'url_util_unittest.cc', - 'web_state/crw_pass_kit_downloader_unittest.mm', - 'web_state/crw_web_view_scroll_view_proxy_unittest.mm', - 'web_state/error_translation_util_unittest.mm', - 'web_state/js/common_js_unittest.mm', - 'web_state/js/core_js_unittest.mm', - 'web_state/js/credential_util_unittest.mm', - 'web_state/js/crw_js_injection_manager_unittest.mm', - 'web_state/js/crw_js_invoke_parameter_queue_unittest.mm', - 'web_state/js/crw_js_post_request_loader_unittest.mm', - 'web_state/js/crw_js_window_id_manager_unittest.mm', - 'web_state/js/page_script_util_unittest.mm', - 'web_state/ui/crw_web_controller_container_view_unittest.mm', - 'web_state/ui/crw_web_controller_observer_unittest.mm', - 'web_state/ui/crw_web_controller_unittest.mm', - 'web_state/ui/crw_wk_script_message_router_unittest.mm', - 'web_state/ui/web_view_js_utils_unittest.mm', - 'web_state/ui/wk_back_forward_list_item_holder_unittest.mm', - 'web_state/ui/wk_web_view_configuration_provider_unittest.mm', - 'web_state/web_state_impl_unittest.mm', - 'web_state/web_state_delegate_bridge_unittest.mm', - "web_state/web_state_delegate_stub.h", - "web_state/web_state_delegate_stub.mm", - 'web_state/web_view_internal_creation_util_unittest.mm', - 'web_state/wk_web_view_security_util_unittest.mm', - 'webui/crw_web_ui_manager_unittest.mm', - 'webui/crw_web_ui_page_builder_unittest.mm', - 'webui/mojo_facade_unittest.mm', - 'webui/url_fetcher_block_adapter_unittest.mm', - ], - 'actions': [ - { - 'action_name': 'copy_test_data', - 'variables': { - 'test_data_files': [ - '../../net/data/ssl/certificates/', - 'test/data/chrome.html', - 'test/data/testbadpass.pkpass', - 'test/data/testfavicon.png', - 'test/data/testpass.pkpass', - ], - 'test_data_prefix': 'ios/web', - }, - 'includes': [ '../../build/copy_test_data_ios.gypi' ], - }, - ], - }, - ], -} diff --git a/chromium/ios/web/js_compile.gni b/chromium/ios/web/js_compile.gni index 317d4469868..d712a6161b8 100644 --- a/chromium/ios/web/js_compile.gni +++ b/chromium/ios/web/js_compile.gni @@ -118,7 +118,6 @@ template("js_compile_checked") { # --jscomp_error=checkTypes # --jscomp_error=checkVars # --jscomp_error=missingProperties - # --jscomp_error=missingReturn # --jscomp_error=undefinedVars args = [ @@ -131,6 +130,7 @@ template("js_compile_checked") { "--jscomp_error=externsValidation", "--jscomp_error=globalThis", "--jscomp_error=invalidCasts", + "--jscomp_error=missingReturn", "--jscomp_error=nonStandardJsDocs", "--jscomp_error=suspiciousCode", "--jscomp_error=undefinedNames", diff --git a/chromium/ios/web/js_compile.gypi b/chromium/ios/web/js_compile.gypi deleted file mode 100644 index aae69e6d5a8..00000000000 --- a/chromium/ios/web/js_compile.gypi +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# This file should be deprecated in favor of js_compile_checked.gypi or -# eventually third_party/closure_compiler/compile_js.gypi as iOS JS code -# becomes error free. See http://crbug.com/487804 -{ - 'variables': { - 'closure_compiler_path': '<(DEPTH)/third_party/closure_compiler/compiler/compiler.jar', - 'compile_javascript%': 1, - }, - 'conditions': [ - ['compile_javascript==1', { - 'rules': [ - { - 'rule_name': 'jscompilation', - 'extension': 'js', - 'inputs': [ - '<(closure_compiler_path)', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/<(RULE_INPUT_NAME)', - ], - 'action': [ - 'java', - '-jar', - '<(closure_compiler_path)', - '--compilation_level', - 'SIMPLE_OPTIMIZATIONS', - '--js', - '<(RULE_INPUT_PATH)', - '--js_output_file', - '<@(_outputs)', - ], - 'message': 'Running closure compiler on <(RULE_INPUT_NAME)', - } # rule_name: jscompilation - ]}, - { # else - 'rules': [ - { - 'rule_name': 'jscompilation', - 'extension': 'js', - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/<(RULE_INPUT_NAME)', - ], - 'action': [ - 'cp', - '<(RULE_INPUT_PATH)', - '<@(_outputs)', - ], - } - ]} # rule_name: jscompilation - ] # condition: compile_javascript - ] # conditions -} diff --git a/chromium/ios/web/js_compile_bundle.gypi b/chromium/ios/web/js_compile_bundle.gypi deleted file mode 100644 index fec6cd21e4b..00000000000 --- a/chromium/ios/web/js_compile_bundle.gypi +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 2015 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. - -# This file is meant to be included into a target to provide a rule -# to build JavaScript bundles using closure compiler. -# -# To use this, create a gyp target with the following form: -# { -# 'target_name': 'my_js_target', -# 'type': 'none', -# 'variables': { -# 'closure_entry_point': 'name of the closure module', -# 'js_bundle_files': ['path/to/dependency/file',], -# }, -# 'includes': ['path/to/this/gypi/file'], -# } -# -# Required variables: -# closure_entry_point - name of the entry point closure module. -# js_bundle_files - list of js files to build a bundle. - -{ - 'variables': { - 'closure_compiler_path': '<(DEPTH)/third_party/closure_compiler/compiler/compiler.jar', - }, - 'rules': [ - { - 'rule_name': 'jsbundlecompilation', - 'extension': 'js', - 'inputs': [ - '<(closure_compiler_path)', - '<@(js_bundle_files)', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/<(RULE_INPUT_NAME)', - ], - 'action': [ - 'java', - '-jar', - '<(closure_compiler_path)', - '--compilation_level', - 'SIMPLE_OPTIMIZATIONS', - # Pass every js file to closure compiler. --only_closure_dependencies - # flag ensures that unnecessary files will not be compiled into the - # final output file. - '--js', - '<@(js_bundle_files)', - '--js_output_file', - '<@(_outputs)', - '--only_closure_dependencies', - '--closure_entry_point=<(closure_entry_point)', - ], - 'message': 'Building <(RULE_INPUT_NAME) JavaScript bundle', - } # rule_name: jsbundlecompilation - ] -} diff --git a/chromium/ios/web/js_compile_checked.gypi b/chromium/ios/web/js_compile_checked.gypi deleted file mode 100644 index fe04d94ace8..00000000000 --- a/chromium/ios/web/js_compile_checked.gypi +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 2015 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. - -# This file should be identical to js_compile.gypi except it passes jscomp_error -# flags to the compiler. One should prefer this over js_compile.gypi once the -# JS code being compiled are error free. -# -# This file should be eventually deprecated in favor of -# third_party/closure_compiler/compile_js.gypi once they have the same set of -# jscomp_error flags enabled. See http://crbug.com/487804 -{ - 'variables': { - 'closure_compiler_path': '<(DEPTH)/third_party/closure_compiler/compiler/compiler.jar', - 'compile_javascript%': 1, - }, - 'conditions': [ - ['compile_javascript==1', { - 'rules': [ - { - 'rule_name': 'jscompilation', - 'extension': 'js', - 'inputs': [ - '<(closure_compiler_path)', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/<(RULE_INPUT_NAME)', - ], - 'action': [ - 'java', - '-jar', - '<(closure_compiler_path)', - '--compilation_level', - 'SIMPLE_OPTIMIZATIONS', - '--jscomp_error=accessControls', - '--jscomp_error=ambiguousFunctionDecl', - # '--jscomp_error=checkTypes', - # '--jscomp_error=checkVars', - '--jscomp_error=constantProperty', - '--jscomp_error=deprecated', - '--jscomp_error=externsValidation', - '--jscomp_error=globalThis', - '--jscomp_error=invalidCasts', - # '--jscomp_error=missingProperties', - # '--jscomp_error=missingReturn', - '--jscomp_error=nonStandardJsDocs', - '--jscomp_error=suspiciousCode', - '--jscomp_error=undefinedNames', - # '--jscomp_error=undefinedVars', - '--jscomp_error=unknownDefines', - '--jscomp_error=uselessCode', - '--jscomp_error=visibility', - '--js', - '<(RULE_INPUT_PATH)', - '--js_output_file', - '<@(_outputs)', - ], - 'message': 'Running closure compiler on <(RULE_INPUT_NAME)', - } # rule_name: jscompilation - ]}, - { # else - 'rules': [ - { - 'rule_name': 'jscompilation', - 'extension': 'js', - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/<(RULE_INPUT_NAME)', - ], - 'action': [ - 'cp', - '<(RULE_INPUT_PATH)', - '<@(_outputs)', - ], - } - ]} # rule_name: jscompilation - ] # condition: compile_javascript - ] # conditions -} diff --git a/chromium/ios/web/public/app/BUILD.gn b/chromium/ios/web/public/app/BUILD.gn index e55a118d5eb..c00924921ad 100644 --- a/chromium/ios/web/public/app/BUILD.gn +++ b/chromium/ios/web/public/app/BUILD.gn @@ -7,6 +7,7 @@ source_set("app") { "web_main.h", "web_main_delegate.h", "web_main_parts.h", + "web_main_runner.h", ] public_deps = [ diff --git a/chromium/ios/web/shell/BUILD.gn b/chromium/ios/web/shell/BUILD.gn index 0d7a0645ef2..71c8d84aa99 100644 --- a/chromium/ios/web/shell/BUILD.gn +++ b/chromium/ios/web/shell/BUILD.gn @@ -8,10 +8,6 @@ import("//ios/build/config.gni") ios_app_bundle("ios_web_shell") { info_plist = "Info.plist" - sources = [ - "web_exe_main.mm", - ] - deps = [ ":shell", @@ -20,13 +16,6 @@ ios_app_bundle("ios_web_shell") { "//build/config/sanitizers:deps", ] - ldflags = [ - "-Xlinker", - "-objc_abi_version", - "-Xlinker", - "2", - ] - configs += [ "//build/config/compiler:enable_arc" ] assert_no_deps = ios_assert_no_deps @@ -63,6 +52,7 @@ source_set("shell") { "shell_web_main_parts.mm", "view_controller.h", "view_controller.mm", + "web_exe_main.mm", ] deps = [ diff --git a/chromium/ios/web/shell/test/BUILD.gn b/chromium/ios/web/shell/test/BUILD.gn new file mode 100644 index 00000000000..d1cf2944f75 --- /dev/null +++ b/chromium/ios/web/shell/test/BUILD.gn @@ -0,0 +1,90 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//ios/build/config.gni") +import("//ios/third_party/earl_grey/ios_eg_test.gni") + +ios_eg_test("ios_web_shell_test") { + sources = [ + "context_menu_egtest.mm", + "meta_tags_egtest.mm", + "navigation_egtest.mm", + "page_state_egtest.mm", + "pdf_egtest.mm", + "plugin_placeholder_egtest.mm", + "redirect_egtest.mm", + ] + + deps = [ + "//base", + "//base/test:test_support", + "//ios/testing/earl_grey:earl_grey_support", + "//ios/web:earl_grey_test_support", + "//ios/web:test_support", + "//ios/web/shell", + "//ios/web/shell/test:earl_grey_test_support", + "//net:net", + "//url:url", + + # All shared libraries must have the sanitizer deps to properly link in + # asan mode (this target will be empty in other cases). + "//build/config/sanitizers:deps", + ] + + bundle_deps = [ ":bundle" ] + + configs += [ "//build/config/compiler:enable_arc" ] + + assert_no_deps = ios_assert_no_deps +} + +source_set("earl_grey_test_support") { + testonly = true + + deps = [ + "//base", + "//base/test:test_support", + "//ios/testing/earl_grey:earl_grey_support", + "//ios/third_party/earl_grey", + "//ios/web", + "//ios/web:earl_grey_test_support", + "//ios/web:test_support", + "//ios/web/shell", + "//url", + ] + + public_deps = [ + "//build/config/ios:xctest", + ] + + sources = [ + "app/navigation_test_util.h", + "app/navigation_test_util.mm", + "app/web_shell_test_util.h", + "app/web_shell_test_util.mm", + "app/web_view_interaction_test_util.h", + "app/web_view_interaction_test_util.mm", + "earl_grey/shell_actions.h", + "earl_grey/shell_actions.mm", + "earl_grey/shell_base_test_case.h", + "earl_grey/shell_base_test_case.mm", + "earl_grey/shell_earl_grey.h", + "earl_grey/shell_earl_grey.mm", + "earl_grey/shell_matchers.h", + "earl_grey/shell_matchers.mm", + ] +} + +bundle_data("bundle") { + visibility = [ ":ios_web_shell_test_host" ] + sources = [ + "http_server_files/basic_navigation_test.html", + "http_server_files/tall_page.html", + "http_server_files/testpage.pdf", + ] + outputs = [ + "{{bundle_resources_dir}}/{{source_root_relative_dir}}/" + + "{{source_file_part}}", + ] +} diff --git a/chromium/ios/web/test/BUILD.gn b/chromium/ios/web/test/BUILD.gn index 2e1ed6b953f..37416461798 100644 --- a/chromium/ios/web/test/BUILD.gn +++ b/chromium/ios/web/test/BUILD.gn @@ -10,9 +10,11 @@ mojom("mojo_bindings") { sources = [ "mojo_test.mojom", ] + + use_new_wrapper_types = false } -repack_and_bundle("packed_resources") { +repack("packed_resources") { testonly = true sources = [ "$root_gen_dir/ios/web/ios_web_resources.pak", @@ -23,7 +25,7 @@ repack_and_bundle("packed_resources") { "//ios/web:resources", ] output = "$target_gen_dir/resources.pak" - bundle_output = "{{bundle_resources_dir}}/{{source_file_part}}" + copy_data_to_bundle = true } grit("resources") { |