BASELINE: Update Chromium to 83.0.4103.122

Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

47 files changed, 314 insertions, 482 deletions

diff --git a/chromium/remoting/BUILD.gn b/chromium/remoting/BUILD.gn
index 65e61ff1d77..ceb99d97d38 100644
--- a/chromium/remoting/BUILD.gn
+++ b/chromium/remoting/BUILD.gn
@@ -7,9 +7,7 @@ import("//remoting/build/config/remoting_build.gni")
 group("remoting_all") {
   testonly = true
 
-  deps = [
-    ":remoting_unittests",
-  ]
+  deps = [ ":remoting_unittests" ]
 
   if (is_win) {
     deps += [
@@ -86,9 +84,7 @@ if (is_win) {
 
     configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
-    sources = [
-      "tools/breakpad_tester_win.cc",
-    ]
+    sources = [ "tools/breakpad_tester_win.cc" ]
 
     if (is_win) {
       libs += [
diff --git a/chromium/remoting/android/BUILD.gn b/chromium/remoting/android/BUILD.gn
index d6fd128b44e..969c3a97ac4 100644
--- a/chromium/remoting/android/BUILD.gn
+++ b/chromium/remoting/android/BUILD.gn
@@ -33,9 +33,7 @@ remoting_credits("credits_resources_raw") {
 }
 
 remoting_localize("remoting_apk_manifest") {
-  sources = [
-    "java/AndroidManifest.xml.jinja2",
-  ]
+  sources = [ "java/AndroidManifest.xml.jinja2" ]
   locales = [ "en" ]
   variables = [ rebase_path(branding_path) ]
   output = "$root_gen_dir/remoting/android/{{source_name_part}}"
@@ -43,9 +41,96 @@ remoting_localize("remoting_apk_manifest") {
 
 android_resources("remoting_android_client_java_resources") {
   custom_package = "org.chromium.chromoting"
-  resource_dirs = [ "java/res" ]
-  generated_resource_dirs = [ _raw_resources_base_dir ]
-  generated_resource_files = get_target_outputs(":credits_resources_raw")
+  sources = [
+    "java/res/drawable-hdpi/empty_host_list.png",
+    "java/res/drawable-hdpi/ic_action_full_screen.png",
+    "java/res/drawable-hdpi/ic_action_keyboard.png",
+    "java/res/drawable-hdpi/ic_announcement.png",
+    "java/res/drawable-hdpi/ic_help.png",
+    "java/res/drawable-hdpi/ic_host_offline.png",
+    "java/res/drawable-hdpi/ic_host_online.png",
+    "java/res/drawable-hdpi/ic_menu.png",
+    "java/res/drawable-hdpi/ic_mouse.png",
+    "java/res/drawable-hdpi/ic_refresh.png",
+    "java/res/drawable-hdpi/ic_touch.png",
+    "java/res/drawable-ldpi/empty_host_list.png",
+    "java/res/drawable-mdpi/empty_host_list.png",
+    "java/res/drawable-mdpi/ic_action_full_screen.png",
+    "java/res/drawable-mdpi/ic_action_keyboard.png",
+    "java/res/drawable-mdpi/ic_announcement.png",
+    "java/res/drawable-mdpi/ic_help.png",
+    "java/res/drawable-mdpi/ic_host_offline.png",
+    "java/res/drawable-mdpi/ic_host_online.png",
+    "java/res/drawable-mdpi/ic_menu.png",
+    "java/res/drawable-mdpi/ic_mouse.png",
+    "java/res/drawable-mdpi/ic_refresh.png",
+    "java/res/drawable-mdpi/ic_touch.png",
+    "java/res/drawable-xhdpi/empty_host_list.png",
+    "java/res/drawable-xhdpi/ic_action_full_screen.png",
+    "java/res/drawable-xhdpi/ic_action_keyboard.png",
+    "java/res/drawable-xhdpi/ic_announcement.png",
+    "java/res/drawable-xhdpi/ic_help.png",
+    "java/res/drawable-xhdpi/ic_host_offline.png",
+    "java/res/drawable-xhdpi/ic_host_online.png",
+    "java/res/drawable-xhdpi/ic_menu.png",
+    "java/res/drawable-xhdpi/ic_mouse.png",
+    "java/res/drawable-xhdpi/ic_refresh.png",
+    "java/res/drawable-xhdpi/ic_touch.png",
+    "java/res/drawable-xxhdpi/empty_host_list.png",
+    "java/res/drawable-xxhdpi/ic_action_full_screen.png",
+    "java/res/drawable-xxhdpi/ic_action_keyboard.png",
+    "java/res/drawable-xxhdpi/ic_announcement.png",
+    "java/res/drawable-xxhdpi/ic_help.png",
+    "java/res/drawable-xxhdpi/ic_host_offline.png",
+    "java/res/drawable-xxhdpi/ic_host_online.png",
+    "java/res/drawable-xxhdpi/ic_menu.png",
+    "java/res/drawable-xxhdpi/ic_mouse.png",
+    "java/res/drawable-xxhdpi/ic_refresh.png",
+    "java/res/drawable-xxhdpi/ic_touch.png",
+    "java/res/drawable-xxxhdpi/empty_host_list.png",
+    "java/res/drawable-xxxhdpi/ic_action_full_screen.png",
+    "java/res/drawable-xxxhdpi/ic_action_keyboard.png",
+    "java/res/drawable-xxxhdpi/ic_announcement.png",
+    "java/res/drawable-xxxhdpi/ic_help.png",
+    "java/res/drawable-xxxhdpi/ic_host_offline.png",
+    "java/res/drawable-xxxhdpi/ic_host_online.png",
+    "java/res/drawable-xxxhdpi/ic_menu.png",
+    "java/res/drawable-xxxhdpi/ic_mouse.png",
+    "java/res/drawable-xxxhdpi/ic_refresh.png",
+    "java/res/drawable-xxxhdpi/ic_touch.png",
+    "java/res/layout/account_ui.xml",
+    "java/res/layout/credits.xml",
+    "java/res/layout/desktop.xml",
+    "java/res/layout/help.xml",
+    "java/res/layout/host_offline.xml",
+    "java/res/layout/host_online.xml",
+    "java/res/layout/main.xml",
+    "java/res/layout/navigation_list.xml",
+    "java/res/layout/navigation_list_item.xml",
+    "java/res/layout/navigation_list_separator.xml",
+    "java/res/layout/notification_dialog.xml",
+    "java/res/layout/pin_dialog.xml",
+    "java/res/menu/chromoting_actionbar.xml",
+    "java/res/menu/desktop_actionbar.xml",
+    "java/res/menu/help_actionbar.xml",
+    "java/res/menu/host_context_menu.xml",
+    "java/res/mipmap-anydpi-v26/ic_launcher.xml",
+    "java/res/mipmap-hdpi/ic_launcher.png",
+    "java/res/mipmap-hdpi/ic_launcher_foreground.png",
+    "java/res/mipmap-mdpi/ic_launcher.png",
+    "java/res/mipmap-mdpi/ic_launcher_foreground.png",
+    "java/res/mipmap-xhdpi/ic_launcher.png",
+    "java/res/mipmap-xhdpi/ic_launcher_foreground.png",
+    "java/res/mipmap-xxhdpi/ic_launcher.png",
+    "java/res/mipmap-xxhdpi/ic_launcher_foreground.png",
+    "java/res/mipmap-xxxhdpi/ic_launcher.png",
+    "java/res/mipmap-xxxhdpi/ic_launcher_foreground.png",
+    "java/res/values-sw600dp/dimens.xml",
+    "java/res/values-v17/styles.xml",
+    "java/res/values/dimens.xml",
+    "java/res/values/ic_launcher_background.xml",
+  ]
+  sources += get_target_outputs(":credits_resources_raw")
   deps = [
     ":credits_resources_raw",
     "//remoting/resources:strings_java",
@@ -62,7 +147,7 @@ remoting_android_client_java_tmpl("remoting_android_client_java") {
 
 remoting_apk_tmpl("remoting_apk") {
   apk_name = "Chromoting"
-  java_files = [ "//remoting/android/apk/src/org/chromium/chromoting/RemotingApplication.java" ]
+  sources = [ "//remoting/android/apk/src/org/chromium/chromoting/RemotingApplication.java" ]
   deps = [
     ":remoting_android_client_java",
     "//base:base_java",
@@ -71,9 +156,7 @@ remoting_apk_tmpl("remoting_apk") {
 }
 
 remoting_localize("remoting_test_apk_manifest") {
-  sources = [
-    "javatests/AndroidManifest.xml.jinja2",
-  ]
+  sources = [ "javatests/AndroidManifest.xml.jinja2" ]
   locales = [ "en" ]
   variables = [ rebase_path(branding_path) ]
   output = "$root_gen_dir/remoting/android_test/{{source_name_part}}"
@@ -85,7 +168,7 @@ instrumentation_test_apk("remoting_test_apk") {
   target_sdk_version = 23
   apk_name = "ChromotingTest"
   apk_under_test = ":remoting_apk"
-  java_files = [
+  sources = [
     "javatests/src/org/chromium/chromoting/EventTest.java",
     "javatests/src/org/chromium/chromoting/MockInputStub.java",
     "javatests/src/org/chromium/chromoting/SwipePinchDetectorTest.java",
diff --git a/chromium/remoting/android/client_java_tmpl.gni b/chromium/remoting/android/client_java_tmpl.gni
index 7f75b422653..f22f0ae1419 100644
--- a/chromium/remoting/android/client_java_tmpl.gni
+++ b/chromium/remoting/android/client_java_tmpl.gni
@@ -7,8 +7,8 @@ import("//remoting/remoting_options.gni")
 
 template("remoting_android_client_java_tmpl") {
   android_library(target_name) {
-    _java_file_prefix = "//remoting/android/java/src/org/chromium/chromoting"
-    _java_files = [
+    _sources_prefix = "//remoting/android/java/src/org/chromium/chromoting"
+    _sources = [
       "ActivityLifecycleListener.java",
       "AnimationJob.java",
       "Capabilities.java",
@@ -46,6 +46,7 @@ template("remoting_android_client_java_tmpl") {
       "SizeChangedEventParameter.java",
       "SwipePinchDetector.java",
       "SystemUiVisibilityChangedEventParameter.java",
+      "TapEventParameter.java",
       "TapGestureDetector.java",
       "TermsOfServiceActivity.java",
       "ThirdPartyTokenFetcher.java",
@@ -53,7 +54,6 @@ template("remoting_android_client_java_tmpl") {
       "TouchInputHandler.java",
       "TouchInputStrategy.java",
       "TrackpadInputStrategy.java",
-      "TapEventParameter.java",
       "TwoPointsEventParameter.java",
       "WebViewActivity.java",
       "accountswitcher/AccountManagerCompat.java",
@@ -71,15 +71,15 @@ template("remoting_android_client_java_tmpl") {
       "help/HelpSingleton.java",
       "jni/Client.java",
       "jni/ConnectionListener.java",
-      "jni/GlDisplay.java",
       "jni/DirectoryService.java",
+      "jni/GlDisplay.java",
       "jni/JniInterface.java",
       "jni/JniOAuthTokenGetter.java",
       "jni/NotificationPresenter.java",
       "jni/TouchEventData.java",
     ]
 
-    java_files = rebase_path(_java_files, ".", _java_file_prefix)
+    sources = rebase_path(_sources, ".", _sources_prefix)
 
     deps = [
       "//base:base_java",
@@ -87,12 +87,12 @@ template("remoting_android_client_java_tmpl") {
       "//remoting/android:remoting_android_client_java_resources",
       "//remoting/android:remoting_apk_manifest",
       "//remoting/proto/remoting/v1:directory_proto_java",
-      "//third_party/android_deps:android_arch_lifecycle_common_java",
       "//third_party/android_deps:android_support_v7_appcompat_java",
+      "//third_party/android_deps:androidx_annotation_annotation_java",
+      "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
       "//third_party/android_deps:com_android_support_drawerlayout_java",
       "//third_party/android_deps:com_android_support_mediarouter_v7_java",
-      "//third_party/android_deps:com_android_support_support_annotations_java",
-      "//third_party/android_deps:com_google_protobuf_protobuf_lite_java",
+      "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
       "//ui/android:ui_utils_java",
     ]
 
diff --git a/chromium/remoting/base/BUILD.gn b/chromium/remoting/base/BUILD.gn
index a2a2cea96eb..a2b12b6909c 100644
--- a/chromium/remoting/base/BUILD.gn
+++ b/chromium/remoting/base/BUILD.gn
@@ -114,9 +114,7 @@ source_set("authorization") {
     "//net",
   ]
 
-  deps = [
-    "//remoting/proto/remoting/v1:directory_grpc_library",
-  ]
+  deps = [ "//remoting/proto/remoting/v1:directory_grpc_library" ]
 }
 
 source_set("breakpad") {
@@ -129,9 +127,7 @@ source_set("breakpad") {
 
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
-  deps = [
-    "//base",
-  ]
+  deps = [ "//base" ]
 
   if (is_mac) {
     deps += [ "//third_party/breakpad" ]
@@ -151,9 +147,7 @@ static_library("test_support") {
     "test_rsa_key_pair.h",
   ]
 
-  deps = [
-    "//remoting/proto",
-  ]
+  deps = [ "//remoting/proto" ]
   public_deps = [
     ":authorization",
     ":base",
diff --git a/chromium/remoting/base/grpc_support/BUILD.gn b/chromium/remoting/base/grpc_support/BUILD.gn
index 99e57dbce34..c41e21bf080 100644
--- a/chromium/remoting/base/grpc_support/BUILD.gn
+++ b/chromium/remoting/base/grpc_support/BUILD.gn
@@ -33,9 +33,7 @@ static_library("grpc_support") {
 }
 
 cc_grpc_library("unit_tests_grpc_library") {
-  sources = [
-    "grpc_support_test_services.proto",
-  ]
+  sources = [ "grpc_support_test_services.proto" ]
 }
 
 source_set("unit_tests") {
diff --git a/chromium/remoting/client/BUILD.gn b/chromium/remoting/client/BUILD.gn
index 835723d55df..ab381ff5ab1 100644
--- a/chromium/remoting/client/BUILD.gn
+++ b/chromium/remoting/client/BUILD.gn
@@ -41,9 +41,7 @@ static_library("client") {
     "//remoting/build/config:enable_webrtc_remoting_client",
   ]
 
-  public_deps = [
-    "//remoting/base",
-  ]
+  public_deps = [ "//remoting/base" ]
 
   deps = [
     "//mojo/core/embedder",
diff --git a/chromium/remoting/client/audio/BUILD.gn b/chromium/remoting/client/audio/BUILD.gn
index 684a1b67b21..4fbc75baced 100644
--- a/chromium/remoting/client/audio/BUILD.gn
+++ b/chromium/remoting/client/audio/BUILD.gn
@@ -44,9 +44,7 @@ source_set("test_support") {
     "fake_async_audio_data_supplier.h",
   ]
 
-  deps = [
-    "//base",
-  ]
+  deps = [ "//base" ]
 }
 
 source_set("unit_tests") {
diff --git a/chromium/remoting/client/display/BUILD.gn b/chromium/remoting/client/display/BUILD.gn
index 1aebe485781..925f3da354d 100644
--- a/chromium/remoting/client/display/BUILD.gn
+++ b/chromium/remoting/client/display/BUILD.gn
@@ -30,9 +30,7 @@ source_set("display") {
     "sys_opengl.h",
   ]
 
-  public_deps = [
-    "//remoting/proto",
-  ]
+  public_deps = [ "//remoting/proto" ]
   deps = [
     "//third_party/libyuv",
     "//third_party/protobuf:protobuf_lite",
diff --git a/chromium/remoting/client/jni/BUILD.gn b/chromium/remoting/client/jni/BUILD.gn
index a39da40b7ac..56d792dee1a 100644
--- a/chromium/remoting/client/jni/BUILD.gn
+++ b/chromium/remoting/client/jni/BUILD.gn
@@ -11,9 +11,7 @@ import("//remoting/remoting_options.gni")
 group("jni") {
   testonly = true
 
-  deps = [
-    ":remoting_client_jni",
-  ]
+  deps = [ ":remoting_client_jni" ]
 }
 
 shared_library("remoting_client_jni") {
diff --git a/chromium/remoting/client/ui/BUILD.gn b/chromium/remoting/client/ui/BUILD.gn
index 9cbda24458d..cffd7cac68b 100644
--- a/chromium/remoting/client/ui/BUILD.gn
+++ b/chromium/remoting/client/ui/BUILD.gn
@@ -10,9 +10,7 @@ source_set("ui") {
     "fling_tracker.h",
   ]
 
-  deps = [
-    ":ui_manipulation",
-  ]
+  deps = [ ":ui_manipulation" ]
 
   public_deps = [
     "//remoting/proto",
diff --git a/chromium/remoting/codec/BUILD.gn b/chromium/remoting/codec/BUILD.gn
index 486ed1f04da..f6ff1abda41 100644
--- a/chromium/remoting/codec/BUILD.gn
+++ b/chromium/remoting/codec/BUILD.gn
@@ -105,9 +105,7 @@ source_set("vpx_codec") {
 
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
-  public_deps = [
-    "//third_party/libvpx",
-  ]
+  public_deps = [ "//third_party/libvpx" ]
 
   deps = [
     "//base/third_party/dynamic_annotations",
diff --git a/chromium/remoting/credits/credits.gni b/chromium/remoting/credits/credits.gni
index c75b299670c..aa4e87c060a 100644
--- a/chromium/remoting/credits/credits.gni
+++ b/chromium/remoting/credits/credits.gni
@@ -23,9 +23,7 @@ template("remoting_credits") {
       _credits_template,
       _credits_entry_template,
     ]
-    outputs = [
-      _credits_html_file,
-    ]
+    outputs = [ _credits_html_file ]
     args = [
       "credits",
       rebase_path(_credits_html_file, root_build_dir),
@@ -53,11 +51,7 @@ template("remoting_credits") {
                 "$_credits_source_dir/credits_css.css",
                 "$_credits_source_dir/credits_js.js",
               ] + get_target_outputs(_generate_target)
-    outputs = [
-      "$_credits_gen_dir/{{source_file_part}}",
-    ]
-    deps = [
-      _generate_target,
-    ]
+    outputs = [ "$_credits_gen_dir/{{source_file_part}}" ]
+    deps = [ _generate_target ]
   }
 }
diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn
index e7ea946b458..a620c1ac5e0 100644
--- a/chromium/remoting/host/BUILD.gn
+++ b/chromium/remoting/host/BUILD.gn
@@ -8,17 +8,13 @@ import("//remoting/build/config/remoting_build.gni")
 group("all_tests") {
   testonly = true
 
-  deps = [
-    ":unit_tests",
-  ]
+  deps = [ ":unit_tests" ]
 }
 
 group("all") {
   testonly = true
 
-  deps = [
-    ":host",
-  ]
+  deps = [ ":host" ]
   if (enable_me2me_host) {
     deps += [ "//remoting/host:remoting_me2me_host" ]
   }
@@ -39,19 +35,13 @@ group("all") {
 
 process_version("remoting_version") {
   template_file = "//remoting/host/version.h.in"
-  sources = [
-    branding_path,
-  ]
+  sources = [ branding_path ]
   output = "$target_gen_dir/version.h"
 }
 
 source_set("host") {
-  public_deps = [
-    ":common",
-  ]
-  deps = [
-    "//remoting/host/file_transfer",
-  ]
+  public_deps = [ ":common" ]
+  deps = [ "//remoting/host/file_transfer" ]
 }
 
 source_set("base") {
@@ -139,6 +129,8 @@ static_library("common") {
     "daemon_process.cc",
     "daemon_process.h",
     "daemon_process_win.cc",
+    "desktop_and_cursor_conditional_composer.cc",
+    "desktop_and_cursor_conditional_composer.h",
     "desktop_capturer_checker.cc",
     "desktop_capturer_checker.h",
     "desktop_capturer_proxy.cc",
@@ -228,6 +220,8 @@ static_library("common") {
     "ipc_host_event_logger.h",
     "ipc_input_injector.cc",
     "ipc_input_injector.h",
+    "ipc_keyboard_layout_monitor.cc",
+    "ipc_keyboard_layout_monitor.h",
     "ipc_mouse_cursor_monitor.cc",
     "ipc_mouse_cursor_monitor.h",
     "ipc_screen_controls.cc",
@@ -236,6 +230,12 @@ static_library("common") {
     "ipc_video_frame_capturer.h",
     "it2me_desktop_environment.cc",
     "it2me_desktop_environment.h",
+    "keyboard_layout_monitor.cc",
+    "keyboard_layout_monitor.h",
+    "keyboard_layout_monitor_chromeos.cc",
+    "keyboard_layout_monitor_linux.cc",
+    "keyboard_layout_monitor_mac.cc",
+    "keyboard_layout_monitor_win.cc",
     "me2me_desktop_environment.cc",
     "me2me_desktop_environment.h",
     "mouse_cursor_monitor_proxy.cc",
@@ -251,6 +251,8 @@ static_library("common") {
     "pairing_registry_delegate_win.h",
     "pin_hash.cc",
     "pin_hash.h",
+    "pointer_lock_detector.cc",
+    "pointer_lock_detector.h",
     "policy_watcher.cc",
     "policy_watcher.h",
     "process_stats_agent.h",
@@ -392,6 +394,7 @@ static_library("common") {
       "continue_window_linux.cc",
       "curtain_mode_linux.cc",
       "disconnect_window_linux.cc",
+      "keyboard_layout_monitor_linux.cc",
       "me2me_desktop_environment.cc",
       "me2me_desktop_environment.h",
       "xsession_chooser_linux.cc",
@@ -447,6 +450,8 @@ static_library("test_support") {
     "fake_desktop_environment.h",
     "fake_host_extension.cc",
     "fake_host_extension.h",
+    "fake_keyboard_layout_monitor.cc",
+    "fake_keyboard_layout_monitor.h",
     "fake_mouse_cursor_monitor.cc",
     "fake_mouse_cursor_monitor.h",
     "host_mock_objects.cc",
@@ -568,9 +573,7 @@ source_set("unit_tests") {
 
   if (enable_me2me_host) {
     sources += [ "evaluate_capability_unittest.cc" ]
-    data_deps = [
-      "//remoting/test:capability_test_stub",
-    ]
+    data_deps = [ "//remoting/test:capability_test_stub" ]
   }
 }
 
@@ -596,9 +599,7 @@ if (enable_remoting_host) {
 
 if (enable_remoting_host) {
   executable("remoting_start_host") {
-    sources = [
-      "setup/start_host_entry_point.cc",
-    ]
+    sources = [ "setup/start_host_entry_point.cc" ]
 
     deps = [
       "//third_party/libjingle_xmpp",
@@ -656,13 +657,9 @@ if (enable_remoting_host) {
       "setup/com.google.chrome.remote_desktop.json.jinja2",
     ]
 
-    inputs = [
-      branding_path,
-    ]
+    inputs = [ branding_path ]
 
-    outputs = [
-      "$root_build_dir/remoting/{{source_name_part}}",
-    ]
+    outputs = [ "$root_build_dir/remoting/{{source_name_part}}" ]
 
     args = [
       "--define",
@@ -715,9 +712,7 @@ if (enable_remoting_host) {
 
 if (enable_me2me_host) {
   static_library("remoting_me2me_host_static") {
-    sources = [
-      "remoting_me2me_host.cc",
-    ]
+    sources = [ "remoting_me2me_host.cc" ]
     defines = []
 
     configs += [
@@ -764,14 +759,10 @@ if (enable_me2me_host) {
 
   if (is_win) {
     group("remoting_me2me_host") {
-      deps = [
-        "//remoting/host/win:remoting_me2me_host",
-      ]
+      deps = [ "//remoting/host/win:remoting_me2me_host" ]
     }
     group("remoting_native_messaging_host") {
-      deps = [
-        "//remoting/host/win:remoting_native_messaging_host",
-      ]
+      deps = [ "//remoting/host/win:remoting_native_messaging_host" ]
     }
   } else {
     source_set("main") {
@@ -786,9 +777,7 @@ if (enable_me2me_host) {
     }
     if (is_mac) {
       group("remoting_me2me_host") {
-        deps = [
-          "//remoting/host/mac:remoting_me2me_host",
-        ]
+        deps = [ "//remoting/host/mac:remoting_me2me_host" ]
       }
     } else {
       target("executable", "remoting_me2me_host") {
@@ -811,35 +800,25 @@ if (enable_me2me_host) {
 
     if (is_mac) {
       group("remoting_native_messaging_host") {
-        deps = [
-          "//remoting/host/mac:remoting_native_messaging_host",
-        ]
+        deps = [ "//remoting/host/mac:remoting_native_messaging_host" ]
       }
     } else {
       group("remoting_native_messaging_host") {
-        deps = [
-          "//remoting/host/linux:remoting_native_messaging_host",
-        ]
+        deps = [ "//remoting/host/linux:remoting_native_messaging_host" ]
       }
     }
   }
   if (is_chrome_branded && enable_me2me_host && is_linux && !is_chromeos) {
     group("remoting_me2me_host_archive") {
-      deps = [
-        "//remoting/host/installer/linux:remoting_me2me_host_archive",
-      ]
+      deps = [ "//remoting/host/installer/linux:remoting_me2me_host_archive" ]
     }
   } else if (is_win) {
     group("remoting_me2me_host_archive") {
-      deps = [
-        "//remoting/host/installer/win:remoting_me2me_host_archive",
-      ]
+      deps = [ "//remoting/host/installer/win:remoting_me2me_host_archive" ]
     }
   } else if (is_mac) {
     group("remoting_me2me_host_archive") {
-      deps = [
-        "//remoting/host/installer/mac:remoting_me2me_host_archive",
-      ]
+      deps = [ "//remoting/host/installer/mac:remoting_me2me_host_archive" ]
     }
   } else {
     group("remoting_me2me_host_archive") {
diff --git a/chromium/remoting/host/chromeos/BUILD.gn b/chromium/remoting/host/chromeos/BUILD.gn
index c6924ba7ae4..8a650eda0ef 100644
--- a/chromium/remoting/host/chromeos/BUILD.gn
+++ b/chromium/remoting/host/chromeos/BUILD.gn
@@ -29,10 +29,13 @@ source_set("chromeos") {
     "//skia",
     "//third_party/webrtc_overrides:webrtc_component",
     "//ui/aura",
+    "//ui/base/cursor",
     "//ui/compositor",
     "//ui/events",
     "//ui/views",
   ]
+
+  deps = [ "//ui/base/mojom:cursor_type" ]
 }
 
 # The host portions of the remoting unit tests.
diff --git a/chromium/remoting/host/file_transfer/BUILD.gn b/chromium/remoting/host/file_transfer/BUILD.gn
index 06c1395c5e4..22e913be162 100644
--- a/chromium/remoting/host/file_transfer/BUILD.gn
+++ b/chromium/remoting/host/file_transfer/BUILD.gn
@@ -18,9 +18,7 @@ source_set("file_transfer") {
     "get_desktop_directory_win.cc",
   ]
 
-  public_deps = [
-    ":common",
-  ]
+  public_deps = [ ":common" ]
 
   deps = [
     "//base",
diff --git a/chromium/remoting/host/input_monitor/BUILD.gn b/chromium/remoting/host/input_monitor/BUILD.gn
index 14d12cd2a43..c25d0c5cb09 100644
--- a/chromium/remoting/host/input_monitor/BUILD.gn
+++ b/chromium/remoting/host/input_monitor/BUILD.gn
@@ -5,9 +5,7 @@
 import("//remoting/build/config/remoting_build.gni")
 
 source_set("input_monitor") {
-  public = [
-    "local_input_monitor.h",
-  ]
+  public = [ "local_input_monitor.h" ]
 
   sources = [
     "local_hotkey_input_monitor.h",
@@ -33,12 +31,17 @@ source_set("input_monitor") {
   deps = [
     "//remoting/proto",
     "//third_party/webrtc_overrides:webrtc_component",
+    "//ui/events",
   ]
 
   if (use_ozone) {
     deps += [ "//ui/ozone" ]
   }
 
+  if (is_mac) {
+    deps += [ "//third_party/google_toolbox_for_mac" ]
+  }
+
   if (!use_x11 || (is_chromeos && !use_ozone)) {
     sources -= [
       "local_hotkey_input_monitor_x11.cc",
diff --git a/chromium/remoting/host/installer/BUILD.gn b/chromium/remoting/host/installer/BUILD.gn
index fc19aa790b7..d50709ef58f 100644
--- a/chromium/remoting/host/installer/BUILD.gn
+++ b/chromium/remoting/host/installer/BUILD.gn
@@ -18,9 +18,7 @@ action("credits") {
     "credits_entry.tmpl",
   ]
 
-  outputs = [
-    about_credits_file,
-  ]
+  outputs = [ about_credits_file ]
 
   args = [
     "credits",
diff --git a/chromium/remoting/host/installer/linux/BUILD.gn b/chromium/remoting/host/installer/linux/BUILD.gn
index e27c7ddc937..4db0701c5de 100644
--- a/chromium/remoting/host/installer/linux/BUILD.gn
+++ b/chromium/remoting/host/installer/linux/BUILD.gn
@@ -31,23 +31,15 @@ zip("remoting_me2me_host_archive") {
   # package handling in other build/signing scripts.
   inputs = packaging_outputs
   output = "$root_build_dir/remoting-me2me-host-linux.zip"
-  deps = [
-    ":remoting_me2me_host_copy",
-  ]
+  deps = [ ":remoting_me2me_host_copy" ]
 }
 
 copy("remoting_me2me_host_copy") {
   # Copy the debian package file, which has version info in it,
   # to a consistewnt filename for use on Chromoting swarming bots.
-  sources = [
-    deb_filename,
-  ]
-  outputs = [
-    "$root_build_dir/remoting-me2me-host.deb",
-  ]
-  public_deps = [
-    ":remoting_me2me_host_deb_installer",
-  ]
+  sources = [ deb_filename ]
+  outputs = [ "$root_build_dir/remoting-me2me-host.deb" ]
+  public_deps = [ ":remoting_me2me_host_deb_installer" ]
 }
 
 action("remoting_me2me_host_deb_installer") {
@@ -65,9 +57,7 @@ action("remoting_me2me_host_deb_installer") {
     "debian/rules",
   ]
   outputs = packaging_outputs
-  sources = [
-    "build-deb.sh",
-  ]
+  sources = [ "build-deb.sh" ]
   args = [
     "-s",
     rebase_path("//", root_build_dir),
diff --git a/chromium/remoting/host/installer/mac/BUILD.gn b/chromium/remoting/host/installer/mac/BUILD.gn
index 22d32f3c5bf..d0eced64c7b 100644
--- a/chromium/remoting/host/installer/mac/BUILD.gn
+++ b/chromium/remoting/host/installer/mac/BUILD.gn
@@ -31,9 +31,7 @@ action("remoting_me2me_host_archive") {
 
   zip_path = "$root_build_dir/remoting-me2me-host-mac.zip"
 
-  outputs = [
-    "$root_build_dir/remoting-me2me-host-mac.zip",
-  ]
+  outputs = [ "$root_build_dir/remoting-me2me-host-mac.zip" ]
 
   script = "//remoting/host/installer/build-installer-archive.py"
 
@@ -104,15 +102,9 @@ _uninstaller_plist = "uninstaller/remoting_uninstaller-Info.plist"
 # remoting_uninstaller-InfoPlist.strings
 foreach(locale, remoting_locales_with_underscores) {
   bundle_data("remoting_uninstaller_strings_${locale}_bundle_data") {
-    sources = [
-      "$root_gen_dir/remoting/host/remoting_uninstaller-InfoPlist.strings/$locale.lproj/InfoPlist.strings",
-    ]
-    outputs = [
-      "{{bundle_resources_dir}}/$locale.lproj/{{source_file_part}}",
-    ]
-    deps = [
-      "//remoting/host:remoting_infoplist_strings",
-    ]
+    sources = [ "$root_gen_dir/remoting/host/remoting_uninstaller-InfoPlist.strings/$locale.lproj/InfoPlist.strings" ]
+    outputs = [ "{{bundle_resources_dir}}/$locale.lproj/{{source_file_part}}" ]
+    deps = [ "//remoting/host:remoting_infoplist_strings" ]
   }
 }
 
@@ -151,11 +143,7 @@ mac_app_bundle("remoting_host_uninstaller") {
 }
 
 bundle_data("remoting_host_uninstaller_resources") {
-  sources = [
-    "uninstaller/remoting_uninstaller.icns",
-  ]
+  sources = [ "uninstaller/remoting_uninstaller.icns" ]
 
-  outputs = [
-    "{{bundle_resources_dir}}/{{source_file_part}}",
-  ]
+  outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
 }
diff --git a/chromium/remoting/host/installer/win/BUILD.gn b/chromium/remoting/host/installer/win/BUILD.gn
index 62d22934bb8..b4eaec9a5c1 100644
--- a/chromium/remoting/host/installer/win/BUILD.gn
+++ b/chromium/remoting/host/installer/win/BUILD.gn
@@ -8,9 +8,7 @@ import("//remoting/host/installer/win/generate_clsids.gni")
 action("remoting_me2me_host_archive") {
   script = "//remoting/host/installer/build-installer-archive.py"
 
-  sources = [
-    "//build/android/gyp/util/build_utils.py",
-  ]
+  sources = [ "//build/android/gyp/util/build_utils.py" ]
 
   deps = [
     "//remoting/host:remoting_native_messaging_manifests",
@@ -25,9 +23,7 @@ action("remoting_me2me_host_archive") {
     "//third_party/icu:icudata",
   ]
 
-  public_deps = [
-    "//remoting/host/security_key:remote_security_key",
-  ]
+  public_deps = [ "//remoting/host/security_key:remote_security_key" ]
 
   if (target_cpu == "x86") {
     _output = "$root_out_dir/remoting-me2me-host-$target_os.zip"
@@ -35,9 +31,7 @@ action("remoting_me2me_host_archive") {
     _output = "$root_out_dir/remoting-me2me-host-$target_os-unsupported.zip"
   }
 
-  outputs = [
-    _output,
-  ]
+  outputs = [ _output ]
   if (is_chrome_branded) {
     _branding = "Chrome"
   } else {
@@ -137,13 +131,9 @@ if (is_chrome_branded && !is_component_build && target_cpu == "x86") {
   msi_script_arch = "ia32"
 
   action("remoting_host_installation") {
-    deps = [
-      "//remoting/host:remoting_me2me_host_archive",
-    ]
+    deps = [ "//remoting/host:remoting_me2me_host_archive" ]
     script = "//remoting/tools/zip2msi.py"
-    outputs = [
-      "$root_out_dir/chromoting.msi",
-    ]
+    outputs = [ "$root_out_dir/chromoting.msi" ]
     args = [
       "--wix_path",
       rebase_path("//third_party/wix", root_build_dir),
@@ -159,8 +149,6 @@ if (is_chrome_branded && !is_component_build && target_cpu == "x86") {
 } else {
   group("remoting_host_installation") {
     # We still want to build host archive under other configurations.
-    deps = [
-      "//remoting/host:remoting_me2me_host_archive",
-    ]
+    deps = [ "//remoting/host:remoting_me2me_host_archive" ]
   }
 }
diff --git a/chromium/remoting/host/it2me/BUILD.gn b/chromium/remoting/host/it2me/BUILD.gn
index 9db27513758..a63a8a3a94d 100644
--- a/chromium/remoting/host/it2me/BUILD.gn
+++ b/chromium/remoting/host/it2me/BUILD.gn
@@ -151,39 +151,26 @@ if (!is_chromeos && enable_remoting_host) {
           "//remoting/resources/chromoting128.png",
         ]
 
-        outputs = [
-          "{{bundle_resources_dir}}/{{source_file_part}}",
-        ]
+        outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
       }
 
       # remote_assistance_host-InfoPlist.strings
       foreach(locale, remoting_locales_with_underscores) {
         bundle_data("remote_assistance_host_strings_${locale}_bundle_data") {
-          sources = [
-            "$root_gen_dir/remoting/host/remote_assistance_host-InfoPlist.strings/$locale.lproj/InfoPlist.strings",
-          ]
-          outputs = [
-            "{{bundle_resources_dir}}/$locale.lproj/{{source_file_part}}",
-          ]
-          deps = [
-            "//remoting/host:remoting_infoplist_strings",
-          ]
+          sources = [ "$root_gen_dir/remoting/host/remote_assistance_host-InfoPlist.strings/$locale.lproj/InfoPlist.strings" ]
+          outputs =
+              [ "{{bundle_resources_dir}}/$locale.lproj/{{source_file_part}}" ]
+          deps = [ "//remoting/host:remoting_infoplist_strings" ]
         }
       }
 
       if (icu_use_data_file) {
         bundle_data("remote_assistance_host_resources") {
-          sources = [
-            "$root_out_dir/icudtl.dat",
-          ]
+          sources = [ "$root_out_dir/icudtl.dat" ]
 
-          outputs = [
-            "{{bundle_resources_dir}}/{{source_file_part}}",
-          ]
+          outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
 
-          public_deps = [
-            "//third_party/icu:icudata",
-          ]
+          public_deps = [ "//third_party/icu:icudata" ]
         }
       }
     } else {
diff --git a/chromium/remoting/host/linux/BUILD.gn b/chromium/remoting/host/linux/BUILD.gn
index 88803413ea9..31b97a4745d 100644
--- a/chromium/remoting/host/linux/BUILD.gn
+++ b/chromium/remoting/host/linux/BUILD.gn
@@ -11,54 +11,32 @@ group("all_tests") {
 
 if (enable_me2me_host) {
   executable("remoting_user_session") {
-    sources = [
-      "remoting_user_session.cc",
-    ]
+    sources = [ "remoting_user_session.cc" ]
 
-    deps = [
-      "//base",
-    ]
+    deps = [ "//base" ]
 
     libs = [ "pam" ]
   }
 
   copy("remoting_me2me_host_copy_script") {
-    sources = [
-      "linux_me2me_host.py",
-    ]
-    outputs = [
-      "$root_build_dir/remoting/chrome-remote-desktop",
-    ]
+    sources = [ "linux_me2me_host.py" ]
+    outputs = [ "$root_build_dir/remoting/chrome-remote-desktop" ]
   }
 
   copy("remoting_me2me_host_copy_host_wrapper") {
-    sources = [
-      "remoting_me2me_host_wrapper.sh",
-    ]
-    outputs = [
-      "$root_build_dir/remoting/chrome-remote-desktop-host",
-    ]
+    sources = [ "remoting_me2me_host_wrapper.sh" ]
+    outputs = [ "$root_build_dir/remoting/chrome-remote-desktop-host" ]
   }
 
   copy("remoting_me2me_host_copy_user_session_wrapper") {
-    sources = [
-      "remoting_user_session_wrapper.sh",
-    ]
-    outputs = [
-      "$root_build_dir/remoting/user-session",
-    ]
+    sources = [ "remoting_user_session_wrapper.sh" ]
+    outputs = [ "$root_build_dir/remoting/user-session" ]
   }
 
   copy("remoting_me2me_host_copy_user_session") {
-    sources = [
-      "$root_build_dir/remoting_user_session",
-    ]
-    outputs = [
-      "$root_build_dir/remoting/{{source_file_part}}",
-    ]
-    deps = [
-      ":remoting_user_session",
-    ]
+    sources = [ "$root_build_dir/remoting_user_session" ]
+    outputs = [ "$root_build_dir/remoting/{{source_file_part}}" ]
+    deps = [ ":remoting_user_session" ]
     if (is_component_build) {
       sources += [
         "$root_build_dir/libbase.so",
@@ -120,9 +98,7 @@ if (use_x11) {
       "x_server_clipboard.cc",
       "x_server_clipboard.h",
     ]
-    deps = [
-      "//third_party/webrtc_overrides:webrtc_component",
-    ]
+    deps = [ "//third_party/webrtc_overrides:webrtc_component" ]
   }
 }
 
diff --git a/chromium/remoting/host/mac/BUILD.gn b/chromium/remoting/host/mac/BUILD.gn
index 971ec123f24..a8e6129a8e0 100644
--- a/chromium/remoting/host/mac/BUILD.gn
+++ b/chromium/remoting/host/mac/BUILD.gn
@@ -6,17 +6,11 @@ import("//remoting/build/config/remoting_build.gni")
 
 if (icu_use_data_file) {
   bundle_data("icu_data") {
-    sources = [
-      "$root_out_dir/icudtl.dat",
-    ]
+    sources = [ "$root_out_dir/icudtl.dat" ]
 
-    outputs = [
-      "{{bundle_resources_dir}}/{{source_file_part}}",
-    ]
+    outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
 
-    public_deps = [
-      "//third_party/icu:icudata",
-    ]
+    public_deps = [ "//third_party/icu:icudata" ]
   }
 }
 
@@ -31,9 +25,7 @@ source_set("constants") {
     "constants_mac.h",
   ]
 
-  deps = [
-    "//remoting/host:remoting_version",
-  ]
+  deps = [ "//remoting/host:remoting_version" ]
 }
 
 source_set("permission_checking") {
@@ -55,9 +47,7 @@ source_set("permission_checking") {
 }
 
 executable("remoting_me2me_host_service") {
-  sources = [
-    "host_service_main.cc",
-  ]
+  sources = [ "host_service_main.cc" ]
   configs += [ "//remoting/build/config:version" ]
   deps = [
     ":constants",
@@ -68,29 +58,17 @@ executable("remoting_me2me_host_service") {
 }
 
 bundle_data("remoting_me2me_host_service_bundle_data") {
-  sources = [
-    "$root_out_dir/remoting_me2me_host_service",
-  ]
-  outputs = [
-    "{{bundle_executable_dir}}/{{source_file_part}}",
-  ]
-  public_deps = [
-    ":remoting_me2me_host_service",
-  ]
+  sources = [ "$root_out_dir/remoting_me2me_host_service" ]
+  outputs = [ "{{bundle_executable_dir}}/{{source_file_part}}" ]
+  public_deps = [ ":remoting_me2me_host_service" ]
 }
 
 # remoting_me2me_host-InfoPlist.strings
 foreach(locale, remoting_locales_with_underscores) {
   bundle_data("remoting_me2me_host_strings_${locale}_bundle_data") {
-    sources = [
-      "$root_gen_dir/remoting/host/remoting_me2me_host-InfoPlist.strings/$locale.lproj/InfoPlist.strings",
-    ]
-    outputs = [
-      "{{bundle_resources_dir}}/$locale.lproj/{{source_file_part}}",
-    ]
-    deps = [
-      "//remoting/host:remoting_infoplist_strings",
-    ]
+    sources = [ "$root_gen_dir/remoting/host/remoting_me2me_host-InfoPlist.strings/$locale.lproj/InfoPlist.strings" ]
+    outputs = [ "{{bundle_resources_dir}}/$locale.lproj/{{source_file_part}}" ]
+    deps = [ "//remoting/host:remoting_infoplist_strings" ]
   }
 }
 
@@ -100,13 +78,9 @@ bundle_data("remoting_host_resources") {
     "remoting_host.icns",
   ]
 
-  outputs = [
-    "{{bundle_resources_dir}}/{{source_file_part}}",
-  ]
+  outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
 
-  public_deps = [
-    "//remoting/host/installer:credits",
-  ]
+  public_deps = [ "//remoting/host/installer:credits" ]
 }
 
 target("mac_app_bundle", "remoting_me2me_host") {
@@ -153,30 +127,18 @@ target("mac_app_bundle", "remoting_me2me_host") {
 
 foreach(locale, remoting_locales_with_underscores) {
   bundle_data("remoting_host_locale_${locale}_bundle_data") {
-    sources = [
-      "$root_build_dir/remoting/resources/$locale.lproj/locale.pak",
-    ]
-    outputs = [
-      "{{bundle_resources_dir}}/$locale.lproj/{{source_file_part}}",
-    ]
-    deps = [
-      "//remoting/resources:copy_locales",
-    ]
+    sources = [ "$root_build_dir/remoting/resources/$locale.lproj/locale.pak" ]
+    outputs = [ "{{bundle_resources_dir}}/$locale.lproj/{{source_file_part}}" ]
+    deps = [ "//remoting/resources:copy_locales" ]
   }
 }
 
 # native_messaging_host-InfoPlist.strings
 foreach(locale, remoting_locales_with_underscores) {
   bundle_data("native_messaging_host_strings_${locale}_bundle_data") {
-    sources = [
-      "$root_gen_dir/remoting/host/native_messaging_host-InfoPlist.strings/$locale.lproj/InfoPlist.strings",
-    ]
-    outputs = [
-      "{{bundle_resources_dir}}/$locale.lproj/{{source_file_part}}",
-    ]
-    deps = [
-      "//remoting/host:remoting_infoplist_strings",
-    ]
+    sources = [ "$root_gen_dir/remoting/host/native_messaging_host-InfoPlist.strings/$locale.lproj/InfoPlist.strings" ]
+    outputs = [ "{{bundle_resources_dir}}/$locale.lproj/{{source_file_part}}" ]
+    deps = [ "//remoting/host:remoting_infoplist_strings" ]
   }
 }
 
@@ -192,14 +154,10 @@ bundle_data("remoting_native_messaging_host_resources") {
     # uses. Also, Authorization Services can't deal with .icns files.
     "//remoting/resources/product_logo_32.png",
   ]
-  outputs = [
-    "{{bundle_resources_dir}}/{{source_file_part}}",
-  ]
+  outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
 
   if (icu_use_data_file) {
-    deps = [
-      ":icu_data",
-    ]
+    deps = [ ":icu_data" ]
   }
 }
 
diff --git a/chromium/remoting/host/native_messaging/BUILD.gn b/chromium/remoting/host/native_messaging/BUILD.gn
index 965eb958fa7..865f995ff63 100644
--- a/chromium/remoting/host/native_messaging/BUILD.gn
+++ b/chromium/remoting/host/native_messaging/BUILD.gn
@@ -18,7 +18,5 @@ source_set("native_messaging") {
 
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
-  deps = [
-    "//base",
-  ]
+  deps = [ "//base" ]
 }
diff --git a/chromium/remoting/host/security_key/BUILD.gn b/chromium/remoting/host/security_key/BUILD.gn
index 1a56b42f357..3575159f296 100644
--- a/chromium/remoting/host/security_key/BUILD.gn
+++ b/chromium/remoting/host/security_key/BUILD.gn
@@ -97,9 +97,7 @@ source_set("unit_tests") {
     "security_key_message_writer_impl_unittest.cc",
   ]
 
-  public_deps = [
-    ":test_support",
-  ]
+  public_deps = [ ":test_support" ]
   deps = [
     "//mojo/core/test:test_support",
     "//remoting:test_support",
diff --git a/chromium/remoting/host/setup/BUILD.gn b/chromium/remoting/host/setup/BUILD.gn
index bf4035d2410..e22c8c59d2b 100644
--- a/chromium/remoting/host/setup/BUILD.gn
+++ b/chromium/remoting/host/setup/BUILD.gn
@@ -3,12 +3,8 @@
 # found in the LICENSE file.
 
 source_set("setup") {
-  public_deps = [
-    ":common",
-  ]
-  deps = [
-    "//remoting/host",
-  ]
+  public_deps = [ ":common" ]
+  deps = [ "//remoting/host" ]
 }
 
 source_set("common") {
diff --git a/chromium/remoting/host/win/BUILD.gn b/chromium/remoting/host/win/BUILD.gn
index e1e6f2a9f09..633055dd334 100644
--- a/chromium/remoting/host/win/BUILD.gn
+++ b/chromium/remoting/host/win/BUILD.gn
@@ -178,12 +178,8 @@ source_set("unit_tests") {
 action("generate_idl") {
   script = "//build/util/version.py"
 
-  inputs = [
-    "chromoting_lib_idl.templ",
-  ]
-  outputs = [
-    "$target_gen_dir/chromoting_lib.idl",
-  ]
+  inputs = [ "chromoting_lib_idl.templ" ]
+  outputs = [ "$target_gen_dir/chromoting_lib.idl" ]
 
   args = [
     "-e",
@@ -196,9 +192,7 @@ action("generate_idl") {
 midl("remoting_lib_idl") {
   sources = get_target_outputs(":generate_idl")
   dynamic_guid = rdp_desktop_session_clsid
-  deps = [
-    ":generate_idl",
-  ]
+  deps = [ ":generate_idl" ]
   writes_tlb = true
 }
 
@@ -241,16 +235,12 @@ static_library("remoting_lib_ps") {
     "REGISTER_PROXY_DLL",
   ]
 
-  deps = [
-    ":remoting_lib_idl",
-  ]
+  deps = [ ":remoting_lib_idl" ]
 }
 
 # Makes the .mc file from the .mc.jinja file.
 remoting_localize("messages_localizing") {
-  sources = [
-    "host_messages.mc.jinja2",
-  ]
+  sources = [ "host_messages.mc.jinja2" ]
   locales = remoting_locales
   locale_dir = resources_locale_dir
   encoding = "utf-16"
@@ -269,9 +259,7 @@ remoting_localize("messages_localizing") {
 message_compiler("messages") {
   compile_generated_code = false
   sources = get_target_outputs(":messages_localizing")
-  deps = [
-    ":messages_localizing",
-  ]
+  deps = [ ":messages_localizing" ]
 }
 
 executable("remoting_console") {
@@ -496,9 +484,7 @@ executable("remoting_native_messaging_host") {
 }
 
 remoting_localize("remoting_windows_resources") {
-  deps = [
-    "//remoting/resources",
-  ]
+  deps = [ "//remoting/resources" ]
 
   sources = [
     "core.rc.jinja2",
diff --git a/chromium/remoting/ios/BUILD.gn b/chromium/remoting/ios/BUILD.gn
index 2dceb627797..9f0191e3f15 100644
--- a/chromium/remoting/ios/BUILD.gn
+++ b/chromium/remoting/ios/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//ios/third_party/features.gni")
 import("//remoting/build/config/remoting_build.gni")
 import("//remoting/remoting_locales.gni")
 
@@ -10,16 +11,14 @@ group("all") {
 
   deps = [
     ":ios_core",
-    "./app:all",
+    "app:all",
   ]
 }
 
 group("all_test") {
   testonly = true
 
-  deps = [
-    ":ios_core_unit_tests",
-  ]
+  deps = [ ":ios_core_unit_tests" ]
 }
 
 source_set("ios_core") {
@@ -85,18 +84,20 @@ test("ios_remoting_unittests") {
   foreach(locale, remoting_locales_with_underscores) {
     deps += [ ":unittests_locale_${locale}_bundle_data" ]
   }
+
+  if (ios_third_party_material_components_built_as_framework) {
+    deps += [
+      "//ios/third_party/material_components_ios:material_components_ios+link",
+    ]
+
+    bundle_deps = [ "//ios/third_party/material_components_ios:material_components_ios+bundle" ]
+  }
 }
 
 foreach(locale, remoting_locales_with_underscores) {
   bundle_data("unittests_locale_${locale}_bundle_data") {
-    sources = [
-      "$root_out_dir/remoting/resources/$locale.lproj/locale.pak",
-    ]
-    outputs = [
-      "{{bundle_resources_dir}}/$locale.lproj/{{source_file_part}}",
-    ]
-    public_deps = [
-      "//remoting/resources:copy_locales",
-    ]
+    sources = [ "$root_out_dir/remoting/resources/$locale.lproj/locale.pak" ]
+    outputs = [ "{{bundle_resources_dir}}/$locale.lproj/{{source_file_part}}" ]
+    public_deps = [ "//remoting/resources:copy_locales" ]
   }
 }
diff --git a/chromium/remoting/ios/app/BUILD.gn b/chromium/remoting/ios/app/BUILD.gn
index d4a55c8946a..6212045fae2 100644
--- a/chromium/remoting/ios/app/BUILD.gn
+++ b/chromium/remoting/ios/app/BUILD.gn
@@ -2,15 +2,14 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//ios/third_party/features.gni")
 import("//remoting/build/config/remoting_build.gni")
 import("//remoting/ios/app/remoting_ios_tmpl.gni")
 
 group("all") {
   testonly = true
 
-  deps = [
-    ":ios_remoting_app",
-  ]
+  deps = [ ":ios_remoting_app" ]
 }
 
 # source set to be used by both external and internal app.
@@ -98,6 +97,14 @@ source_set("common_source_set") {
     "//ui/resources",
   ]
 
+  libs = [
+    "UIKit.framework",
+    "AVFoundation.framework",
+    "Foundation.framework",
+    "WebKit.framework",
+    "QuartzCore.framework",
+  ]
+
   # TODO(crbug.com/875022) fix for OpenGLES deprecation.
   defines = [ "GLES_SILENCE_DEPRECATION" ]
   foreach(locale, remoting_locales_with_underscores) {
@@ -125,6 +132,7 @@ source_set("app_source_set") {
     ":common_source_set",
     "//base",
   ]
+  libs = [ "UIKit.framework" ]
 
   # TODO(crbug.com/875022) fix for OpenGLES deprecation.
   defines = [ "GLES_SILENCE_DEPRECATION" ]
@@ -140,4 +148,11 @@ ios_remoting_app_tmpl("ios_remoting_app") {
     "//remoting/ios/app/resources:launchscreen_assets",
     "//remoting/ios/app/resources:remoting_icons",
   ]
+
+  if (ios_third_party_material_components_built_as_framework) {
+    deps += [
+      "//ios/third_party/material_components_ios:material_components_ios+bundle",
+      "//ios/third_party/material_components_ios:material_components_ios+link",
+    ]
+  }
 }
diff --git a/chromium/remoting/ios/app/remoting_ios_tmpl.gni b/chromium/remoting/ios/app/remoting_ios_tmpl.gni
index 212880d1885..c6af1d34e4e 100644
--- a/chromium/remoting/ios/app/remoting_ios_tmpl.gni
+++ b/chromium/remoting/ios/app/remoting_ios_tmpl.gni
@@ -58,12 +58,8 @@ template("ios_remoting_app_tmpl") {
   _credits_bundle_target_name = "${target_name}_credits_bundle"
   bundle_data(_credits_bundle_target_name) {
     sources = get_target_outputs(":$_credits_resources_target_name")
-    public_deps = [
-      ":$_credits_resources_target_name",
-    ]
-    outputs = [
-      "{{bundle_resources_dir}}/{{source_file_part}}",
-    ]
+    public_deps = [ ":$_credits_resources_target_name" ]
+    outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
   }
 
   ios_app_bundle(target_name) {
@@ -96,7 +92,7 @@ template("ios_remoting_app_tmpl") {
       "CoreVideo.framework",
       "GLKit.framework",
       "OpenGLES.framework",
-      "Webkit.framework",
+      "WebKit.framework",
       "SafariServices.framework",
       "SystemConfiguration.framework",
     ]
@@ -104,8 +100,8 @@ template("ios_remoting_app_tmpl") {
     deps = invoker.deps
 
     bundle_deps = [
-      ":$_launchscreen_storyboard_target_name",
       ":$_credits_bundle_target_name",
+      ":$_launchscreen_storyboard_target_name",
     ]
 
     assert_no_deps = [ "//third_party/ffmpeg:*" ]
diff --git a/chromium/remoting/ios/app/resources/BUILD.gn b/chromium/remoting/ios/app/resources/BUILD.gn
index 31e04307fcc..0e1d763be0b 100644
--- a/chromium/remoting/ios/app/resources/BUILD.gn
+++ b/chromium/remoting/ios/app/resources/BUILD.gn
@@ -89,9 +89,7 @@ appiconset("remoting_icons") {
 
 action("infoplist_strings") {
   _source = "InfoPlist.strings.jinja2"
-  sources = [
-    _source,
-  ]
+  sources = [ _source ]
 
   script = "//remoting/tools/build/remoting_localize.py"
   args = [
@@ -124,9 +122,7 @@ foreach(locale, remoting_locales_with_underscores) {
       "$root_gen_dir/remoting/ios/app/InfoPlist_Strings/$locale.lproj/InfoPlist.strings",
       "$root_out_dir/remoting/resources/$locale.lproj/locale.pak",
     ]
-    outputs = [
-      "{{bundle_resources_dir}}/$locale.lproj/{{source_file_part}}",
-    ]
+    outputs = [ "{{bundle_resources_dir}}/$locale.lproj/{{source_file_part}}" ]
     public_deps = [
       ":infoplist_strings",
       "//remoting/resources:copy_locales",
diff --git a/chromium/remoting/ios/app/settings/BUILD.gn b/chromium/remoting/ios/app/settings/BUILD.gn
index ebb799f4a81..6ae9b30dc74 100644
--- a/chromium/remoting/ios/app/settings/BUILD.gn
+++ b/chromium/remoting/ios/app/settings/BUILD.gn
@@ -27,9 +27,7 @@ source_set("settings") {
     "//ui/resources",
   ]
 
-  public_deps = [
-    "//ios/third_party/material_components_ios",
-  ]
+  public_deps = [ "//ios/third_party/material_components_ios" ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
 }
diff --git a/chromium/remoting/ios/audio/BUILD.gn b/chromium/remoting/ios/audio/BUILD.gn
index fb57d010bcb..d0ad2af932f 100644
--- a/chromium/remoting/ios/audio/BUILD.gn
+++ b/chromium/remoting/ios/audio/BUILD.gn
@@ -18,9 +18,7 @@ source_set("audio") {
     "//remoting/client/audio",
   ]
 
-  public_deps = [
-    "//remoting/proto",
-  ]
+  public_deps = [ "//remoting/proto" ]
 
   libs = [ "AudioToolbox.framework" ]
 
@@ -29,9 +27,7 @@ source_set("audio") {
 
 source_set("unit_tests") {
   testonly = true
-  sources = [
-    "audio_playback_sink_ios_unittest.cc",
-  ]
+  sources = [ "audio_playback_sink_ios_unittest.cc" ]
   deps = [
     ":audio",
     "//remoting/client/audio:test_support",
diff --git a/chromium/remoting/ios/display/BUILD.gn b/chromium/remoting/ios/display/BUILD.gn
index 9180fd9c6ff..2026126f5a9 100644
--- a/chromium/remoting/ios/display/BUILD.gn
+++ b/chromium/remoting/ios/display/BUILD.gn
@@ -5,9 +5,7 @@
 group("all") {
   testonly = true
 
-  deps = [
-    ":display",
-  ]
+  deps = [ ":display" ]
 }
 
 group("all_test") {
diff --git a/chromium/remoting/ios/facade/BUILD.gn b/chromium/remoting/ios/facade/BUILD.gn
index 980b49f2553..f80665afbb6 100644
--- a/chromium/remoting/ios/facade/BUILD.gn
+++ b/chromium/remoting/ios/facade/BUILD.gn
@@ -36,6 +36,8 @@ source_set("facade") {
     "//ui/base",
   ]
 
+  libs = [ "CoreFoundation.framework" ]
+
   public_deps = [
     "//remoting/base",
     "//remoting/proto/remoting/v1:directory_proto",
@@ -46,9 +48,7 @@ source_set("facade") {
 
 source_set("unit_tests") {
   testonly = true
-  sources = [
-    "host_list_service_unittest.mm",
-  ]
+  sources = [ "host_list_service_unittest.mm" ]
   deps = [
     ":facade",
     "//remoting/base/grpc_test_support",
diff --git a/chromium/remoting/ios/mdc/BUILD.gn b/chromium/remoting/ios/mdc/BUILD.gn
index a283c214f11..69b4883e428 100644
--- a/chromium/remoting/ios/mdc/BUILD.gn
+++ b/chromium/remoting/ios/mdc/BUILD.gn
@@ -12,9 +12,9 @@ source_set("mdc") {
     "MDCActionImageView.m",
   ]
 
-  deps = [
-    "//ios/third_party/material_components_ios",
-  ]
+  libs = [ "UIKit.framework" ]
+
+  deps = [ "//ios/third_party/material_components_ios" ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
 }
diff --git a/chromium/remoting/ios/persistence/BUILD.gn b/chromium/remoting/ios/persistence/BUILD.gn
index 1991d4682bd..99796613a2d 100644
--- a/chromium/remoting/ios/persistence/BUILD.gn
+++ b/chromium/remoting/ios/persistence/BUILD.gn
@@ -35,9 +35,7 @@ source_set("test_support") {
     "mock_keychain.h",
   ]
 
-  public_deps = [
-    "//testing/gmock",
-  ]
+  public_deps = [ "//testing/gmock" ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
 }
diff --git a/chromium/remoting/ios/session/BUILD.gn b/chromium/remoting/ios/session/BUILD.gn
index 03131b50011..3a964265ba9 100644
--- a/chromium/remoting/ios/session/BUILD.gn
+++ b/chromium/remoting/ios/session/BUILD.gn
@@ -25,5 +25,7 @@ source_set("session") {
     "//remoting/protocol",
   ]
 
+  libs = [ "CoreGraphics.framework" ]
+
   configs += [ "//build/config/compiler:enable_arc" ]
 }
diff --git a/chromium/remoting/proto/ftl/v1/BUILD.gn b/chromium/remoting/proto/ftl/v1/BUILD.gn
index 7441b62529f..23ec08ea62c 100644
--- a/chromium/remoting/proto/ftl/v1/BUILD.gn
+++ b/chromium/remoting/proto/ftl/v1/BUILD.gn
@@ -13,10 +13,6 @@ proto_library("ftl_messages") {
 }
 
 cc_grpc_library("ftl_grpc_library") {
-  sources = [
-    "ftl_services.proto",
-  ]
-  deps = [
-    ":ftl_messages",
-  ]
+  sources = [ "ftl_services.proto" ]
+  deps = [ ":ftl_messages" ]
 }
diff --git a/chromium/remoting/proto/remoting/v1/BUILD.gn b/chromium/remoting/proto/remoting/v1/BUILD.gn
index d5eab71667e..a329a1bfcb8 100644
--- a/chromium/remoting/proto/remoting/v1/BUILD.gn
+++ b/chromium/remoting/proto/remoting/v1/BUILD.gn
@@ -6,27 +6,17 @@ import("//third_party/grpc/grpc_library.gni")
 import("//third_party/protobuf/proto_library.gni")
 
 proto_library("host_info_proto") {
-  sources = [
-    "host_info.proto",
-  ]
+  sources = [ "host_info.proto" ]
 }
 
 proto_library("directory_proto") {
-  sources = [
-    "directory_messages.proto",
-  ]
-  deps = [
-    ":host_info_proto",
-  ]
+  sources = [ "directory_messages.proto" ]
+  deps = [ ":host_info_proto" ]
 }
 
 cc_grpc_library("directory_grpc_library") {
-  sources = [
-    "directory_service.proto",
-  ]
-  deps = [
-    ":directory_proto",
-  ]
+  sources = [ "directory_service.proto" ]
+  deps = [ ":directory_proto" ]
 }
 
 if (is_android) {
@@ -42,18 +32,12 @@ if (is_android) {
 }
 
 proto_library("network_traversal_proto") {
-  sources = [
-    "network_traversal_messages.proto",
-  ]
+  sources = [ "network_traversal_messages.proto" ]
 }
 
 cc_grpc_library("network_traversal_grpc_library") {
-  sources = [
-    "network_traversal_service.proto",
-  ]
-  deps = [
-    ":network_traversal_proto",
-  ]
+  sources = [ "network_traversal_service.proto" ]
+  deps = [ ":network_traversal_proto" ]
 }
 
 cc_grpc_library("remote_support_host_grpc_library") {
@@ -61,15 +45,11 @@ cc_grpc_library("remote_support_host_grpc_library") {
     "remote_support_host_messages.proto",
     "remote_support_host_service.proto",
   ]
-  deps = [
-    ":host_info_proto",
-  ]
+  deps = [ ":host_info_proto" ]
 }
 
 proto_library("chromoting_event_proto") {
-  sources = [
-    "chromoting_event.proto",
-  ]
+  sources = [ "chromoting_event.proto" ]
 }
 
 proto_library("telemetry_messages") {
@@ -77,16 +57,10 @@ proto_library("telemetry_messages") {
     "generic_log_entry.proto",
     "telemetry_messages.proto",
   ]
-  deps = [
-    ":chromoting_event_proto",
-  ]
+  deps = [ ":chromoting_event_proto" ]
 }
 
 cc_grpc_library("telemetry_grpc_library") {
-  sources = [
-    "telemetry_service.proto",
-  ]
-  deps = [
-    ":telemetry_messages",
-  ]
+  sources = [ "telemetry_service.proto" ]
+  deps = [ ":telemetry_messages" ]
 }
diff --git a/chromium/remoting/protocol/BUILD.gn b/chromium/remoting/protocol/BUILD.gn
index 9e9897579f4..f4471607d1e 100644
--- a/chromium/remoting/protocol/BUILD.gn
+++ b/chromium/remoting/protocol/BUILD.gn
@@ -94,6 +94,7 @@ static_library("protocol") {
     "jingle_session.h",
     "jingle_session_manager.cc",
     "jingle_session_manager.h",
+    "keyboard_layout_stub.h",
     "me2me_host_authenticator_factory.cc",
     "me2me_host_authenticator_factory.h",
     "message_decoder.cc",
diff --git a/chromium/remoting/remoting_options.gni b/chromium/remoting/remoting_options.gni
index 63c527702a0..7cd564c97da 100644
--- a/chromium/remoting/remoting_options.gni
+++ b/chromium/remoting/remoting_options.gni
@@ -9,18 +9,6 @@ enable_remoting_host =
     is_win || (is_linux && (is_chromeos || use_x11)) || is_mac
 enable_me2me_host = is_win || (is_linux && !is_chromeos && use_x11) || is_mac
 
-# These arguments can be overridden from the command line (see "gn help args").
-declare_args() {
-  # Set this to run the jscompile checks after building the webapp.
-  enable_remoting_jscompile = false
-
-  # Set this to enable building internal AppRemoting apps.
-  enable_internal_app_remoting_targets = false
-}
-
-# Set this to use GCD instead of the remoting directory service.
-remoting_use_gcd = 0
-
 # Enable the multi-process host on Windows by default.
 if (is_win) {
   remoting_multi_process = 1
@@ -36,14 +24,4 @@ if (is_chrome_branded) {
   branding_path = "//remoting/branding_Chromium"
 }
 
-# The ar_service_environment variable is used to define the target
-# environment for the app being built.
-# The allowed values are dev and prod.
-if (is_debug) {
-  ar_service_environment = "dev"
-} else {
-  # Non-dev builds should default to 'prod'.
-  ar_service_environment = "prod"
-}
-
 rdp_desktop_session_guid = "6a7699f0-ee43-43e7-aa30-a6738f9bd470"
diff --git a/chromium/remoting/resources/BUILD.gn b/chromium/remoting/resources/BUILD.gn
index 56d2afa25db..286a08b2b4c 100644
--- a/chromium/remoting/resources/BUILD.gn
+++ b/chromium/remoting/resources/BUILD.gn
@@ -32,9 +32,7 @@ action("verify_resources") {
   inputs = [ "remoting_strings.grd" ] + sources_to_verify
 
   stampfile = "$root_out_dir/remoting_resources_verified_stamp"
-  outputs = [
-    stampfile,
-  ]
+  outputs = [ stampfile ]
 
   args = [
            "-t",
@@ -60,9 +58,7 @@ grit("strings") {
   # generated file root.
   output_dir = root_gen_dir
 
-  outputs = [
-    "remoting/base/string_resources.h",
-  ]
+  outputs = [ "remoting/base/string_resources.h" ]
 
   # The grd produces a *.pak file and a messages.json file (this one uses
   # underscores instead of hyphens) for each locale.
@@ -86,9 +82,7 @@ if (is_android) {
     grit_output_dir = "$root_gen_dir/remoting/android/res"
     generated_files =
         rebase_path(android_string_outputs, "remoting/android/res", ".")
-    deps = [
-      ":strings",
-    ]
+    deps = [ ":strings" ]
   }
 }
 
@@ -125,7 +119,5 @@ action("copy_locales") {
            rebase_path(root_out_dir, root_build_dir),
          ] + remoting_locales
 
-  deps = [
-    ":strings",
-  ]
+  deps = [ ":strings" ]
 }
diff --git a/chromium/remoting/signaling/BUILD.gn b/chromium/remoting/signaling/BUILD.gn
index f78337da05d..0bf227c02b2 100644
--- a/chromium/remoting/signaling/BUILD.gn
+++ b/chromium/remoting/signaling/BUILD.gn
@@ -38,6 +38,10 @@ static_library("signaling") {
     "signaling_address.h",
     "signaling_id_util.cc",
     "signaling_id_util.h",
+    "signaling_tracker.cc",
+    "signaling_tracker.h",
+    "signaling_tracker_impl.cc",
+    "signaling_tracker_impl.h",
     "xmpp_log_to_server.cc",
     "xmpp_log_to_server.h",
   ]
@@ -109,6 +113,8 @@ static_library("test_support") {
     "fake_signal_strategy.h",
     "mock_signal_strategy.cc",
     "mock_signal_strategy.h",
+    "mock_signaling_tracker.cc",
+    "mock_signaling_tracker.h",
   ]
 
   public_deps = [
diff --git a/chromium/remoting/test/BUILD.gn b/chromium/remoting/test/BUILD.gn
index b54191ab3f9..3d04281a932 100644
--- a/chromium/remoting/test/BUILD.gn
+++ b/chromium/remoting/test/BUILD.gn
@@ -132,13 +132,9 @@ if (enable_remoting_host && !is_android && !is_chromeos) {
     defines = []
     libs = []
 
-    sources = [
-      "it2me_standalone_host_main.cc",
-    ]
+    sources = [ "it2me_standalone_host_main.cc" ]
 
-    deps = [
-      ":it2me_standalone_host",
-    ]
+    deps = [ ":it2me_standalone_host" ]
 
     if (is_desktop_linux) {
       deps += [ "//build/config/linux/gtk" ]
@@ -158,13 +154,9 @@ if (enable_remoting_host && !is_android && !is_chromeos) {
   # purpose only.
   executable("capability_test_stub") {
     testonly = true
-    sources = [
-      "capability_test_stub_main.cc",
-    ]
+    sources = [ "capability_test_stub_main.cc" ]
 
-    deps = [
-      "//base",
-    ]
+    deps = [ "//base" ]
   }
 }
 
diff --git a/chromium/remoting/tools/BUILD.gn b/chromium/remoting/tools/BUILD.gn
index b0d72bebfdf..6d6cf26ec72 100644
--- a/chromium/remoting/tools/BUILD.gn
+++ b/chromium/remoting/tools/BUILD.gn
@@ -28,8 +28,6 @@ if (is_win) {
 
     configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
-    sources = [
-      "breakpad_tester_win.cc",
-    ]
+    sources = [ "breakpad_tester_win.cc" ]
   }
 }
diff --git a/chromium/remoting/tools/build/remoting_localize.gni b/chromium/remoting/tools/build/remoting_localize.gni
index 53e802380bc..a0dbb8cc277 100644
--- a/chromium/remoting/tools/build/remoting_localize.gni
+++ b/chromium/remoting/tools/build/remoting_localize.gni
@@ -43,13 +43,9 @@ template("remoting_localize") {
     sources = invoker.sources
 
     if (defined(invoker.output)) {
-      outputs = [
-        invoker.output,
-      ]
+      outputs = [ invoker.output ]
     } else {
-      outputs = [
-        "$target_gen_dir/{{source_name_part}}",
-      ]
+      outputs = [ "$target_gen_dir/{{source_name_part}}" ]
     }
 
     args = []