diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-03 13:42:47 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:27:51 +0000 |
commit | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (patch) | |
tree | d29d987c4d7b173cf853279b79a51598f104b403 /chromium/remoting | |
parent | 830c9e163d31a9180fadca926b3e1d7dfffb5021 (diff) | |
download | qtwebengine-chromium-8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec.tar.gz |
BASELINE: Update Chromium to 66.0.3359.156
Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/remoting')
-rw-r--r-- | chromium/remoting/BUILD.gn | 5 | ||||
-rw-r--r-- | chromium/remoting/android/client_java_tmpl.gni | 2 | ||||
-rw-r--r-- | chromium/remoting/client/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/remoting/client/input/BUILD.gn | 3 | ||||
-rw-r--r-- | chromium/remoting/host/BUILD.gn | 3 | ||||
-rw-r--r-- | chromium/remoting/host/security_key/BUILD.gn | 3 | ||||
-rw-r--r-- | chromium/remoting/ios/BUILD.gn | 10 | ||||
-rw-r--r-- | chromium/remoting/ios/app/settings/BUILD.gn | 2 | ||||
-rw-r--r-- | chromium/remoting/ios/persistence/BUILD.gn | 40 | ||||
-rw-r--r-- | chromium/remoting/protocol/BUILD.gn | 2 |
10 files changed, 69 insertions, 5 deletions
diff --git a/chromium/remoting/BUILD.gn b/chromium/remoting/BUILD.gn index a0bd2958820..32bba3d6ff4 100644 --- a/chromium/remoting/BUILD.gn +++ b/chromium/remoting/BUILD.gn @@ -39,7 +39,10 @@ group("remoting_all") { } if (is_ios) { - deps += [ "//remoting/ios:all" ] + deps += [ + "//remoting/ios:all", + "//remoting/ios:ios_remoting_unittests", + ] } if (enable_remoting_host) { diff --git a/chromium/remoting/android/client_java_tmpl.gni b/chromium/remoting/android/client_java_tmpl.gni index 4db1dea68b9..0832e85312c 100644 --- a/chromium/remoting/android/client_java_tmpl.gni +++ b/chromium/remoting/android/client_java_tmpl.gni @@ -83,8 +83,6 @@ template("remoting_android_client_java_tmpl") { "//remoting/android:remoting_apk_manifest", "//third_party/android_tools:android_arch_lifecycle_common_java", "//third_party/android_tools:android_support_annotations_java", - "//third_party/android_tools:android_support_compat_java", - "//third_party/android_tools:android_support_core_ui_java", "//third_party/android_tools:android_support_v7_appcompat_java", "//third_party/android_tools:android_support_v7_mediarouter_java", "//ui/android:ui_utils_java", diff --git a/chromium/remoting/client/BUILD.gn b/chromium/remoting/client/BUILD.gn index 9dca80f169b..b7708f6068a 100644 --- a/chromium/remoting/client/BUILD.gn +++ b/chromium/remoting/client/BUILD.gn @@ -19,8 +19,12 @@ static_library("client") { "cursor_shape_stub_proxy.h", "empty_cursor_filter.cc", "empty_cursor_filter.h", + "feedback_data.cc", + "feedback_data.h", "host_experiment_sender.cc", "host_experiment_sender.h", + "in_memory_log_handler.cc", + "in_memory_log_handler.h", "queued_task_poster.cc", "queued_task_poster.h", "software_video_renderer.cc", diff --git a/chromium/remoting/client/input/BUILD.gn b/chromium/remoting/client/input/BUILD.gn index b7a4367c59e..a76375a1b12 100644 --- a/chromium/remoting/client/input/BUILD.gn +++ b/chromium/remoting/client/input/BUILD.gn @@ -12,6 +12,8 @@ source_set("input") { "keyboard_input_strategy.h", "keyboard_interpreter.cc", "keyboard_interpreter.h", + "keycode_map.cc", + "keycode_map.h", "native_device_keymap.cc", "native_device_keymap.h", "native_device_keymap_android.cc", @@ -65,6 +67,7 @@ source_set("unit_tests") { sources = [ "key_event_mapper_unittest.cc", + "keycode_map_unittest.cc", "touch_input_scaler_unittest.cc", ] diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn index 0f40b7d47f6..6d6ecd1704a 100644 --- a/chromium/remoting/host/BUILD.gn +++ b/chromium/remoting/host/BUILD.gn @@ -765,6 +765,9 @@ if (enable_me2me_host) { "host_main.cc", "host_main.h", ] + deps = [ + "//base:debugging_buildflags", + ] } if (is_mac) { group("remoting_me2me_host") { diff --git a/chromium/remoting/host/security_key/BUILD.gn b/chromium/remoting/host/security_key/BUILD.gn index 422dd84e87a..33160c1d940 100644 --- a/chromium/remoting/host/security_key/BUILD.gn +++ b/chromium/remoting/host/security_key/BUILD.gn @@ -54,6 +54,9 @@ source_set("main") { "remote_security_key_main.cc", "remote_security_key_main.h", ] + deps = [ + "//base:debugging_buildflags", + ] } if (is_win) { diff --git a/chromium/remoting/ios/BUILD.gn b/chromium/remoting/ios/BUILD.gn index d3108aedbea..bd2b63c8b5f 100644 --- a/chromium/remoting/ios/BUILD.gn +++ b/chromium/remoting/ios/BUILD.gn @@ -27,8 +27,6 @@ source_set("ios_core") { "client_gestures.mm", "client_keyboard.h", "client_keyboard.mm", - "keychain_wrapper.h", - "keychain_wrapper.mm", ] public_deps = [ @@ -72,3 +70,11 @@ source_set("ios_core_unit_tests") { data = [] } + +test("ios_remoting_unittests") { + deps = [ + "//base/test:run_all_unittests", + "//base/test:test_support", + "//remoting/ios/persistence:unit_tests", + ] +} diff --git a/chromium/remoting/ios/app/settings/BUILD.gn b/chromium/remoting/ios/app/settings/BUILD.gn index 66dcdb08509..ebb799f4a81 100644 --- a/chromium/remoting/ios/app/settings/BUILD.gn +++ b/chromium/remoting/ios/app/settings/BUILD.gn @@ -14,6 +14,8 @@ source_set("settings") { "remoting_settings_view_controller.mm", "setting_option.h", "setting_option.mm", + "settings_view_cell.h", + "settings_view_cell.mm", ] deps = [ diff --git a/chromium/remoting/ios/persistence/BUILD.gn b/chromium/remoting/ios/persistence/BUILD.gn index 54afc44a65f..1991d4682bd 100644 --- a/chromium/remoting/ios/persistence/BUILD.gn +++ b/chromium/remoting/ios/persistence/BUILD.gn @@ -8,6 +8,12 @@ import("//remoting/build/config/remoting_build.gni") source_set("persistence") { sources = [ + "host_pairing_info.cc", + "host_pairing_info.h", + "keychain.cc", + "keychain.h", + "remoting_keychain.cc", + "remoting_keychain.h", "remoting_preferences.h", "remoting_preferences.mm", ] @@ -19,3 +25,37 @@ source_set("persistence") { configs += [ "//build/config/compiler:enable_arc" ] } + +source_set("test_support") { + testonly = true + sources = [ + "fake_keychain.cc", + "fake_keychain.h", + "mock_keychain.cc", + "mock_keychain.h", + ] + + public_deps = [ + "//testing/gmock", + ] + + configs += [ "//build/config/compiler:enable_arc" ] +} + +source_set("unit_tests") { + testonly = true + sources = [ + "host_pairing_info_unittest.cc", + "remoting_keychain_unittest.mm", + ] + deps = [ + ":persistence", + ":test_support", + "//testing/gmock", + "//testing/gtest", + ] + + libs = [ "Security.framework" ] + + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/remoting/protocol/BUILD.gn b/chromium/remoting/protocol/BUILD.gn index 1398402549c..71846a6161c 100644 --- a/chromium/remoting/protocol/BUILD.gn +++ b/chromium/remoting/protocol/BUILD.gn @@ -109,6 +109,8 @@ 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", |