diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 10:22:43 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 12:36:28 +0000 |
commit | 271a6c3487a14599023a9106329505597638d793 (patch) | |
tree | e040d58ffc86c1480b79ca8528020ca9ec919bf8 /chromium/remoting | |
parent | 7b2ffa587235a47d4094787d72f38102089f402a (diff) | |
download | qtwebengine-chromium-271a6c3487a14599023a9106329505597638d793.tar.gz |
BASELINE: Update Chromium to 77.0.3865.59
Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/remoting')
-rw-r--r-- | chromium/remoting/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/remoting/android/BUILD.gn | 2 | ||||
-rw-r--r-- | chromium/remoting/android/remoting_apk_tmpl.gni | 1 | ||||
-rw-r--r-- | chromium/remoting/base/BUILD.gn | 6 | ||||
-rw-r--r-- | chromium/remoting/client/display/BUILD.gn | 3 | ||||
-rw-r--r-- | chromium/remoting/host/BUILD.gn | 12 | ||||
-rw-r--r-- | chromium/remoting/host/installer/mac/BUILD.gn | 7 | ||||
-rw-r--r-- | chromium/remoting/host/it2me/BUILD.gn | 7 | ||||
-rw-r--r-- | chromium/remoting/host/mac/BUILD.gn | 7 | ||||
-rw-r--r-- | chromium/remoting/host/win/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/remoting/ios/app/BUILD.gn | 5 | ||||
-rw-r--r-- | chromium/remoting/ios/display/BUILD.gn | 3 | ||||
-rw-r--r-- | chromium/remoting/ios/domain/BUILD.gn | 1 | ||||
-rw-r--r-- | chromium/remoting/protocol/BUILD.gn | 17 | ||||
-rw-r--r-- | chromium/remoting/resources/BUILD.gn | 1 | ||||
-rw-r--r-- | chromium/remoting/signaling/BUILD.gn | 14 | ||||
-rw-r--r-- | chromium/remoting/webapp/BUILD.gn | 2 | ||||
-rw-r--r-- | chromium/remoting/webapp/build_template.gni | 22 | ||||
-rw-r--r-- | chromium/remoting/webapp/files.gni | 2 |
19 files changed, 28 insertions, 92 deletions
diff --git a/chromium/remoting/BUILD.gn b/chromium/remoting/BUILD.gn index 080f2e00b66..0aa314039cc 100644 --- a/chromium/remoting/BUILD.gn +++ b/chromium/remoting/BUILD.gn @@ -193,9 +193,7 @@ test("remoting_unittests") { } if (!is_chromeos) { - deps += [ - "//remoting/client/display:unit_tests", - ] + deps += [ "//remoting/client/display:unit_tests" ] } } diff --git a/chromium/remoting/android/BUILD.gn b/chromium/remoting/android/BUILD.gn index 88838950300..d12099984c2 100644 --- a/chromium/remoting/android/BUILD.gn +++ b/chromium/remoting/android/BUILD.gn @@ -19,7 +19,6 @@ generate_jni("jni_headers") { "java/src/org/chromium/chromoting/jni/JniOAuthTokenGetter.java", "java/src/org/chromium/chromoting/jni/TouchEventData.java", ] - jni_package = "remoting" } _raw_resources_base_dir = "$target_gen_dir/credits_resources_raw/res" @@ -82,6 +81,7 @@ remoting_localize("remoting_test_apk_manifest") { instrumentation_test_apk("remoting_test_apk") { android_manifest = "$root_gen_dir/remoting/android_test/AndroidManifest.xml" android_manifest_dep = ":remoting_test_apk_manifest" + target_sdk_version = 23 apk_name = "ChromotingTest" apk_under_test = ":remoting_apk" java_files = [ diff --git a/chromium/remoting/android/remoting_apk_tmpl.gni b/chromium/remoting/android/remoting_apk_tmpl.gni index 1921cec9701..22607887d9f 100644 --- a/chromium/remoting/android/remoting_apk_tmpl.gni +++ b/chromium/remoting/android/remoting_apk_tmpl.gni @@ -14,6 +14,7 @@ template("remoting_apk_tmpl") { android_manifest = "$root_gen_dir/remoting/android/AndroidManifest.xml" android_manifest_dep = "//remoting/android:remoting_apk_manifest" + target_sdk_version = 28 shared_libraries = [ "//remoting/client/jni:remoting_client_jni" ] version_name = chrome_version_name version_code = chrome_version_code diff --git a/chromium/remoting/base/BUILD.gn b/chromium/remoting/base/BUILD.gn index 9173c4a0180..c60d2a4d684 100644 --- a/chromium/remoting/base/BUILD.gn +++ b/chromium/remoting/base/BUILD.gn @@ -23,8 +23,6 @@ source_set("base") { "leaky_bucket.cc", "leaky_bucket.h", "name_value_map.h", - "platform_details.cc", - "platform_details.h", "rate_counter.cc", "rate_counter.h", "remoting_bot.cc", @@ -79,7 +77,6 @@ source_set("base") { sources -= [ "chromium_url_request.cc", "chromoting_event.cc", - "platform_details.cc", "telemetry_log_writer.cc", "url_request_context_getter.cc", ] @@ -103,6 +100,8 @@ source_set("authorization") { "oauth_token_getter_proxy.h", "offline_token_exchanger.cc", "offline_token_exchanger.h", + "passthrough_oauth_token_getter.cc", + "passthrough_oauth_token_getter.h", ] configs += [ @@ -177,6 +176,7 @@ source_set("unit_tests") { "buffered_socket_writer_unittest.cc", "capabilities_unittest.cc", "compound_buffer_unittest.cc", + "leaky_bucket_unittest.cc", "oauth_token_getter_proxy_unittest.cc", "rate_counter_unittest.cc", "result_unittest.cc", diff --git a/chromium/remoting/client/display/BUILD.gn b/chromium/remoting/client/display/BUILD.gn index 193e4c6fbea..6f581ece19f 100644 --- a/chromium/remoting/client/display/BUILD.gn +++ b/chromium/remoting/client/display/BUILD.gn @@ -58,6 +58,9 @@ source_set("display") { "GLKit.framework", "OpenGLES.framework", ] + + # TODO(crbug.com/875022) fix for OpenGLES deprecation. + defines = [ "GLES_SILENCE_DEPRECATION" ] } if (is_win) { diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn index e8445db3e6e..c3ab224b5a0 100644 --- a/chromium/remoting/host/BUILD.gn +++ b/chromium/remoting/host/BUILD.gn @@ -149,8 +149,6 @@ static_library("common") { "disconnect_window_mac.h", "disconnect_window_mac.mm", "disconnect_window_win.cc", - "dns_blackhole_checker.cc", - "dns_blackhole_checker.h", "evaluate_capability.cc", "evaluate_capability.h", "forward_process_stats_agent.cc", @@ -167,8 +165,6 @@ static_library("common") { "heartbeat_sender.h", "host_attributes.cc", "host_attributes.h", - "host_change_notification_listener.cc", - "host_change_notification_listener.h", "host_config.cc", "host_config.h", "host_config_upgrader.cc", @@ -269,8 +265,6 @@ static_library("common") { "server_log_entry_host.h", "shutdown_watchdog.cc", "shutdown_watchdog.h", - "signaling_connector.cc", - "signaling_connector.h", "single_window_desktop_environment.cc", "single_window_desktop_environment.h", "single_window_input_injector.h", @@ -296,8 +290,6 @@ static_library("common") { "usage_stats_consent_win.cc", "username.cc", "username.h", - "xmpp_heartbeat_sender.cc", - "xmpp_heartbeat_sender.h", "xmpp_register_support_host_request.cc", "xmpp_register_support_host_request.h", ] @@ -313,6 +305,7 @@ static_library("common") { deps = [ "//base:i18n", + "//build:branding_buildflags", "//components/policy/core/common", "//crypto", "//google_apis", @@ -486,11 +479,11 @@ source_set("unit_tests") { "desktop_process_unittest.cc", "desktop_session_agent_unittest.cc", "ftl_host_change_notification_listener_unittest.cc", + "ftl_signaling_connector_unittest.cc", "gcd_rest_client_unittest.cc", "gcd_state_updater_unittest.cc", "heartbeat_sender_unittest.cc", "host_attributes_unittest.cc", - "host_change_notification_listener_unittest.cc", "host_config_unittest.cc", "host_experiment_session_plugin_unittest.cc", "host_extension_session_manager_unittest.cc", @@ -522,7 +515,6 @@ source_set("unit_tests") { "token_validator_base_unittest.cc", "token_validator_factory_impl_unittest.cc", "touch_injector_win_unittest.cc", - "xmpp_heartbeat_sender_unittest.cc", "xmpp_register_support_host_request_unittest.cc", ] diff --git a/chromium/remoting/host/installer/mac/BUILD.gn b/chromium/remoting/host/installer/mac/BUILD.gn index 357b1f566e3..99492235770 100644 --- a/chromium/remoting/host/installer/mac/BUILD.gn +++ b/chromium/remoting/host/installer/mac/BUILD.gn @@ -137,7 +137,6 @@ mac_app_bundle("remoting_host_uninstaller") { deps = [ ":remoting_host_uninstaller_resources", - ":remoting_host_uninstaller_xibs", "//base", "//remoting/host:remoting_infoplist_strings", "//remoting/host/mac:constants", @@ -148,12 +147,6 @@ mac_app_bundle("remoting_host_uninstaller") { } } -mac_xib_bundle_data("remoting_host_uninstaller_xibs") { - sources = [ - "uninstaller/remoting_uninstaller.xib", - ] -} - bundle_data("remoting_host_uninstaller_resources") { sources = [ "uninstaller/remoting_uninstaller.icns", diff --git a/chromium/remoting/host/it2me/BUILD.gn b/chromium/remoting/host/it2me/BUILD.gn index 39dc4673757..473ce9339d3 100644 --- a/chromium/remoting/host/it2me/BUILD.gn +++ b/chromium/remoting/host/it2me/BUILD.gn @@ -170,12 +170,6 @@ if (!is_chromeos && enable_remoting_host) { } } - mac_xib_bundle_data("remote_assistance_host_xibs") { - sources = [ - "//remoting/host/mac/disconnect_window.xib", - ] - } - if (icu_use_data_file) { bundle_data("remote_assistance_host_resources") { sources = [ @@ -238,7 +232,6 @@ if (!is_chromeos && enable_remoting_host) { } deps += [ ":remote_assistance_host_dialog_icon", - ":remote_assistance_host_xibs", "//remoting/host:remoting_infoplist_strings", "//remoting/resources:copy_locales", ] diff --git a/chromium/remoting/host/mac/BUILD.gn b/chromium/remoting/host/mac/BUILD.gn index 780de150f68..ba7dfe874df 100644 --- a/chromium/remoting/host/mac/BUILD.gn +++ b/chromium/remoting/host/mac/BUILD.gn @@ -32,12 +32,6 @@ foreach(locale, remoting_locales_with_underscores) { } } -mac_xib_bundle_data("remoting_host_xibs") { - sources = [ - "disconnect_window.xib", - ] -} - bundle_data("remoting_host_resources") { sources = [ "$root_gen_dir/remoting/CREDITS.txt", @@ -94,7 +88,6 @@ target("mac_app_bundle", "remoting_me2me_host") { } deps += [ ":remoting_host_resources", - ":remoting_host_xibs", "//remoting/host:remoting_infoplist_strings", "//remoting/resources:copy_locales", ] diff --git a/chromium/remoting/host/win/BUILD.gn b/chromium/remoting/host/win/BUILD.gn index 3f0d71a67c9..78c11d2459e 100644 --- a/chromium/remoting/host/win/BUILD.gn +++ b/chromium/remoting/host/win/BUILD.gn @@ -77,7 +77,7 @@ source_set("win") { sources = [ "audio_volume_filter_win.cc", "audio_volume_filter_win.h", - "com_imported_mstscax.tlh", + "com_imported_mstscax.h", "com_security.cc", "com_security.h", "default_audio_device_change_detector.cc", @@ -118,7 +118,7 @@ source_set("win") { if (is_clang) { # TODO(thakis): Remove this once midl.exe no longer produces nonstandard - # C++ (see the enums in com_imported_mstscax.tlh). + # C++ (see the enums in com_imported_mstscax.h). cflags = [ "-Wno-microsoft-enum-forward-reference" ] } diff --git a/chromium/remoting/ios/app/BUILD.gn b/chromium/remoting/ios/app/BUILD.gn index 65993b1bf45..ba42a57a313 100644 --- a/chromium/remoting/ios/app/BUILD.gn +++ b/chromium/remoting/ios/app/BUILD.gn @@ -94,6 +94,8 @@ source_set("common_source_set") { "//ui/resources", ] + # TODO(crbug.com/875022) fix for OpenGLES deprecation. + defines = [ "GLES_SILENCE_DEPRECATION" ] foreach(locale, remoting_locales_with_underscores) { deps += [ "//remoting/ios/app/resources:locale_${locale}_bundle_data" ] } @@ -119,6 +121,9 @@ source_set("app_source_set") { ":common_source_set", "//base", ] + + # TODO(crbug.com/875022) fix for OpenGLES deprecation. + defines = [ "GLES_SILENCE_DEPRECATION" ] configs += [ "//build/config/compiler:enable_arc" ] } diff --git a/chromium/remoting/ios/display/BUILD.gn b/chromium/remoting/ios/display/BUILD.gn index 53795749bd8..183669b8c51 100644 --- a/chromium/remoting/ios/display/BUILD.gn +++ b/chromium/remoting/ios/display/BUILD.gn @@ -45,5 +45,8 @@ source_set("display") { "OpenGLES.framework", ] + # TODO(crbug.com/875022) fix for OpenGLES deprecation. + defines = [ "GLES_SILENCE_DEPRECATION" ] + configs += [ "//build/config/compiler:enable_arc" ] } diff --git a/chromium/remoting/ios/domain/BUILD.gn b/chromium/remoting/ios/domain/BUILD.gn index 3c50440cf84..76ff8cd288a 100644 --- a/chromium/remoting/ios/domain/BUILD.gn +++ b/chromium/remoting/ios/domain/BUILD.gn @@ -19,6 +19,7 @@ source_set("domain") { ] deps = [ + "//base", "//remoting/proto/remoting/v1:directory_proto", ] diff --git a/chromium/remoting/protocol/BUILD.gn b/chromium/remoting/protocol/BUILD.gn index f4348dfb423..0bbf0d16924 100644 --- a/chromium/remoting/protocol/BUILD.gn +++ b/chromium/remoting/protocol/BUILD.gn @@ -68,8 +68,6 @@ static_library("protocol") { "host_video_dispatcher.h", "host_video_stats_dispatcher.cc", "host_video_stats_dispatcher.h", - "http_ice_config_request.cc", - "http_ice_config_request.h", "ice_config.cc", "ice_config.h", "ice_config_request.h", @@ -88,8 +86,6 @@ static_library("protocol") { "input_stub.h", "it2me_host_authenticator_factory.cc", "it2me_host_authenticator_factory.h", - "jingle_info_request.cc", - "jingle_info_request.h", "jingle_messages.cc", "jingle_messages.h", "jingle_session.cc", @@ -111,8 +107,6 @@ static_library("protocol") { "mouse_input_filter.h", "named_message_pipe_handler.cc", "named_message_pipe_handler.h", - "native_ip_synthesizer.cc", - "native_ip_synthesizer.h", "negotiating_authenticator_base.cc", "negotiating_authenticator_base.h", "negotiating_client_authenticator.cc", @@ -144,8 +138,6 @@ static_library("protocol") { "pseudotcp_channel_factory.h", "rejecting_authenticator.cc", "rejecting_authenticator.h", - "rfc7050_ip_synthesizer.cc", - "rfc7050_ip_synthesizer.h", "sdp_message.cc", "sdp_message.h", "secure_channel_factory.cc", @@ -230,8 +222,6 @@ static_library("protocol") { "chromium_socket_factory.h", "remoting_ice_config_request.cc", "remoting_ice_config_request.h", - "rfc7050_prefix_refresher.cc", - "rfc7050_prefix_refresher.h", "webrtc_audio_module.cc", "webrtc_audio_module.h", "webrtc_audio_sink_adapter.cc", @@ -266,12 +256,15 @@ static_library("protocol") { deps += [ "//remoting/proto/remoting/v1:network_traversal_grpc_library", - "//third_party/webrtc/api:create_peerconnection_factory", + "//third_party/webrtc/api:callfactory_api", "//third_party/webrtc/api/audio_codecs:audio_codecs_api", "//third_party/webrtc/api/audio_codecs/opus:audio_decoder_opus", "//third_party/webrtc/api/audio_codecs/opus:audio_encoder_opus", + "//third_party/webrtc/api/rtc_event_log:rtc_event_log_factory", "//third_party/webrtc/api/video_codecs:builtin_video_decoder_factory", + "//third_party/webrtc/media:rtc_audio_video", "//third_party/webrtc_overrides:init_webrtc", + "//third_party/webrtc_overrides:task_queue_factory", ] } @@ -351,7 +344,6 @@ source_set("unit_tests") { "content_description_unittest.cc", "data_channel_manager_unittest.cc", "frame_stats_unittest.cc", - "http_ice_config_request_unittest.cc", "ice_config_unittest.cc", "ice_transport_unittest.cc", "input_event_tracker_unittest.cc", @@ -368,7 +360,6 @@ source_set("unit_tests") { "ppapi_module_stub.cc", "pseudotcp_adapter_unittest.cc", "remoting_ice_config_request_unittest.cc", - "rfc7050_ip_synthesizer_unittest.cc", "sdp_message_unittest.cc", "session_config_unittest.cc", "spake2_authenticator_unittest.cc", diff --git a/chromium/remoting/resources/BUILD.gn b/chromium/remoting/resources/BUILD.gn index ba277c5f790..bbe591fb14b 100644 --- a/chromium/remoting/resources/BUILD.gn +++ b/chromium/remoting/resources/BUILD.gn @@ -33,7 +33,6 @@ action("verify_resources") { "../host/win/version.rc.jinja2", "../resources/play_store_resources.cc", "../webapp/crd/js/background.js", - "../webapp/crd/js/butter_bar.js", "../webapp/base/js/error.js", "../webapp/crd/js/host_list.js", "../webapp/crd/js/host_setup_dialog.js", diff --git a/chromium/remoting/signaling/BUILD.gn b/chromium/remoting/signaling/BUILD.gn index 8b683bfc446..44df316b3e0 100644 --- a/chromium/remoting/signaling/BUILD.gn +++ b/chromium/remoting/signaling/BUILD.gn @@ -29,8 +29,6 @@ static_library("signaling") { "message_tracker.cc", "message_tracker.h", "messaging_client.h", - "muxing_signal_strategy.cc", - "muxing_signal_strategy.h", "push_notification_subscriber.cc", "push_notification_subscriber.h", "registration_manager.h", @@ -44,12 +42,6 @@ static_library("signaling") { "signaling_address.h", "xmpp_log_to_server.cc", "xmpp_log_to_server.h", - "xmpp_login_handler.cc", - "xmpp_login_handler.h", - "xmpp_signal_strategy.cc", - "xmpp_signal_strategy.h", - "xmpp_stream_parser.cc", - "xmpp_stream_parser.h", ] configs += [ @@ -98,7 +90,6 @@ static_library("signaling") { "remoting_log_to_server.h", "server_log_entry.cc", "xmpp_log_to_server.cc", - "xmpp_signal_strategy.cc", ] deps -= [ "//google_apis", @@ -134,20 +125,17 @@ source_set("unit_tests") { sources = [ "ftl_message_reception_channel_unittest.cc", "ftl_messaging_client_unittest.cc", + "ftl_registration_manager_unittest.cc", "ftl_signal_strategy_unittest.cc", "iq_sender_unittest.cc", "jid_util_unittest.cc", "message_tracker_unittest.cc", - "muxing_signal_strategy_unittest.cc", "push_notification_subscriber_unittest.cc", "remoting_log_to_server_unittest.cc", "server_log_entry_unittest.cc", "server_log_entry_unittest.h", "signaling_address_unittest.cc", "xmpp_log_to_server_unittest.cc", - "xmpp_login_handler_unittest.cc", - "xmpp_signal_strategy_unittest.cc", - "xmpp_stream_parser_unittest.cc", ] deps = [ diff --git a/chromium/remoting/webapp/BUILD.gn b/chromium/remoting/webapp/BUILD.gn index b80474e2200..66cd297733b 100644 --- a/chromium/remoting/webapp/BUILD.gn +++ b/chromium/remoting/webapp/BUILD.gn @@ -37,7 +37,7 @@ action("credits") { desktop_remoting_webapp("webapp") { output_dir = "$root_build_dir/remoting/remoting-webapp.v2" zip_path = "$root_build_dir/remoting-webapp.v2.zip" - extra_files = [ "crd/remoting_client_pnacl.nmf.jinja2" ] + extra_files = [] } copy("browser_test_resources") { diff --git a/chromium/remoting/webapp/build_template.gni b/chromium/remoting/webapp/build_template.gni index d5ed9453bb0..1638c05463e 100644 --- a/chromium/remoting/webapp/build_template.gni +++ b/chromium/remoting/webapp/build_template.gni @@ -231,19 +231,6 @@ template("desktop_remoting_webapp") { "$target_gen_dir/credits.html", ] - # Windows debug builds of remoting_client_plugin_newlib.pexe trigger OOM in - # arm-nacl-ld.gold.exe - enable for release builds only on Windows. - if (enable_nacl && (!is_win || !is_debug)) { - pnacl_tc = "//build/toolchain/nacl:newlib_pnacl" - pexe_label = "//remoting/client/plugin:remoting_client_plugin_newlib" - pexe_dir = get_label_info("${pexe_label}($pnacl_tc)", "root_out_dir") - - extra_files += [ "$pexe_dir/remoting_client_plugin_newlib.pexe" ] - if (is_debug) { - extra_files += [ "$pexe_dir/remoting_client_plugin_newlib.pexe.debug" ] - } - } - inputs = [ rebase_path("crd/manifest.json.jinja2") ] + remoting_version_files + rebase_path(remoting_webapp_crd_files) + extra_files + dr_generated_html_files @@ -263,15 +250,6 @@ template("desktop_remoting_webapp") { "//remoting/webapp:credits", ] - # Windows debug builds of remoting_client_plugin_newlib.pexe trigger OOM in - # arm-nacl-ld.gold.exe - enable for release builds only on Windows. - if (enable_nacl && (!is_win || !is_debug)) { - deps += [ "${pexe_label}($pnacl_tc)" ] - if (is_debug) { - deps += [ "${pexe_label}_debug($pnacl_tc)" ] - } - } - # Create a file that contains a list of all the resource files needed # to build the webapp. This is needed to avoid problems on platforms that # limit the size of a command line. diff --git a/chromium/remoting/webapp/files.gni b/chromium/remoting/webapp/files.gni index 72fd6724fb9..1dd5e78c91f 100644 --- a/chromium/remoting/webapp/files.gni +++ b/chromium/remoting/webapp/files.gni @@ -97,7 +97,6 @@ remoting_webapp_unittests_js_files = [ "base/js/xmpp_login_handler_unittest.js", "base/js/xmpp_stream_parser_unittest.js", "crd/js/apps_v2_migration_unittest.js", - "crd/js/butter_bar_unittest.js", "crd/js/combined_host_list_api_unittest.js", "crd/js/gcd_client_unittest.js", "crd/js/gcd_client_with_mock_xhr_unittest.js", @@ -297,7 +296,6 @@ remoting_webapp_js_host_display_files = [ # The CRD-specific JavaScript files required by main.html. remoting_webapp_crd_js_ui_files = [ "crd/js/bump_scroller.js", - "crd/js/butter_bar.js", "crd/js/crd_auth_dialog.js", "crd/js/crd_event_handlers.js", "crd/js/crd_experimental.js", |