diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-23 15:05:51 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-23 15:31:48 +0000 |
| commit | 9cb87fa7638e305ef35b04f54ba07ac4fa04adcb (patch) | |
| tree | 2793d80883b7daab67258117755046d428f9978c /chromium/ios | |
| parent | 98ff39cb35ef2bd32bb1af9565628a4a4b0979b2 (diff) | |
| download | qtwebengine-chromium-9cb87fa7638e305ef35b04f54ba07ac4fa04adcb.tar.gz | |
BASELINE: Update Chromium to 47.0.2526.71
Also adds a few missing spellcheck sources.
Change-Id: I300864710316ff3cd3ad456dd7a3d048b45f57d5
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/ios')
| -rw-r--r-- | chromium/ios/web/ios_web.gyp | 6 | ||||
| -rw-r--r-- | chromium/ios/web/ios_web_unittests.gyp | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/chromium/ios/web/ios_web.gyp b/chromium/ios/web/ios_web.gyp index a1ab0fff1db..73542c01920 100644 --- a/chromium/ios/web/ios_web.gyp +++ b/chromium/ios/web/ios_web.gyp @@ -105,6 +105,8 @@ 'navigation/time_smoother.h', 'navigation/web_load_params.h', 'navigation/web_load_params.mm', + 'net/cert_host_pair.h', + 'net/cert_host_pair.cc', 'net/cert_policy.cc', 'net/cert_store_impl.cc', 'net/cert_store_impl.h', @@ -128,8 +130,6 @@ 'net/clients/crw_redirect_network_client_factory.mm', 'net/cookie_notification_bridge.h', 'net/cookie_notification_bridge.mm', - 'net/crw_cert_policy_cache.h', - 'net/crw_cert_policy_cache.mm', 'net/crw_cert_verification_controller.h', 'net/crw_cert_verification_controller.mm', 'net/crw_request_tracker_delegate.h', @@ -269,6 +269,8 @@ '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/crw_wk_simple_web_view_controller.h', 'web_state/ui/crw_wk_simple_web_view_controller.mm', 'web_state/ui/crw_wk_web_view_crash_detector.h', diff --git a/chromium/ios/web/ios_web_unittests.gyp b/chromium/ios/web/ios_web_unittests.gyp index f6df39f9cf1..5281340eb35 100644 --- a/chromium/ios/web/ios_web_unittests.gyp +++ b/chromium/ios/web/ios_web_unittests.gyp @@ -34,12 +34,12 @@ '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_csp_network_client_unittest.mm', 'net/clients/crw_js_injection_network_client_unittest.mm', 'net/clients/crw_passkit_network_client_unittest.mm', - 'net/crw_cert_policy_cache_unittest.mm', 'net/crw_cert_verification_controller_unittest.mm', 'net/crw_url_verifying_protocol_handler_unittest.mm', 'net/request_group_util_unittest.mm', @@ -68,6 +68,7 @@ '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/crw_wk_simple_web_view_controller_unittest.mm', 'web_state/ui/crw_wk_web_view_crash_detector_unittest.mm', 'web_state/ui/web_view_js_utils_unittest.mm', |