BASELINE: Update Chromium to 76.0.3809.94

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

22 files changed, 282 insertions, 59 deletions

diff --git a/chromium/remoting/android/BUILD.gn b/chromium/remoting/android/BUILD.gn
index 0821d130965..88838950300 100644
--- a/chromium/remoting/android/BUILD.gn
+++ b/chromium/remoting/android/BUILD.gn
@@ -13,6 +13,7 @@ import("//remoting/tools/build/remoting_localize.gni")
 generate_jni("jni_headers") {
   sources = [
     "java/src/org/chromium/chromoting/jni/Client.java",
+    "java/src/org/chromium/chromoting/jni/DirectoryService.java",
     "java/src/org/chromium/chromoting/jni/GlDisplay.java",
     "java/src/org/chromium/chromoting/jni/JniInterface.java",
     "java/src/org/chromium/chromoting/jni/JniOAuthTokenGetter.java",
diff --git a/chromium/remoting/android/client_java_tmpl.gni b/chromium/remoting/android/client_java_tmpl.gni
index 7c37778d56c..92dc7eca06e 100644
--- a/chromium/remoting/android/client_java_tmpl.gni
+++ b/chromium/remoting/android/client_java_tmpl.gni
@@ -26,7 +26,6 @@ template("remoting_android_client_java_tmpl") {
       "FlingAnimationJob.java",
       "HostInfo.java",
       "HostListAdapter.java",
-      "HostListManager.java",
       "InputEventSender.java",
       "InputFeedbackRadiusMapper.java",
       "InputModeChangedEventParameter.java",
@@ -73,6 +72,7 @@ template("remoting_android_client_java_tmpl") {
       "jni/Client.java",
       "jni/ConnectionListener.java",
       "jni/GlDisplay.java",
+      "jni/DirectoryService.java",
       "jni/JniInterface.java",
       "jni/JniOAuthTokenGetter.java",
       "jni/TouchEventData.java",
@@ -82,15 +82,20 @@ template("remoting_android_client_java_tmpl") {
 
     deps = [
       "//base:base_java",
+      "//base:jni_java",
       "//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: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",
       "//ui/android:ui_utils_java",
     ]
 
+    annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+
     srcjar_deps = [ "//remoting/client/jni:jni_enums" ]
 
     if (defined(invoker.play_services_package)) {
diff --git a/chromium/remoting/android/remoting_apk_tmpl.gni b/chromium/remoting/android/remoting_apk_tmpl.gni
index 7519a76918b..1921cec9701 100644
--- a/chromium/remoting/android/remoting_apk_tmpl.gni
+++ b/chromium/remoting/android/remoting_apk_tmpl.gni
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/android/rules.gni")
+import("//build/util/version.gni")
 import("//remoting/remoting_options.gni")
 
 template("remoting_apk_tmpl") {
@@ -14,5 +15,7 @@ template("remoting_apk_tmpl") {
     android_manifest = "$root_gen_dir/remoting/android/AndroidManifest.xml"
     android_manifest_dep = "//remoting/android:remoting_apk_manifest"
     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 16a71c56bdc..9173c4a0180 100644
--- a/chromium/remoting/base/BUILD.gn
+++ b/chromium/remoting/base/BUILD.gn
@@ -64,6 +64,7 @@ source_set("base") {
     "//base",
     "//net",
     "//remoting/proto",
+    "//remoting/proto/remoting/v1:telemetry_grpc_library",
     "//third_party/protobuf:protobuf_lite",
   ]
   deps = [
@@ -82,6 +83,7 @@ source_set("base") {
       "telemetry_log_writer.cc",
       "url_request_context_getter.cc",
     ]
+    public_deps -= [ "//remoting/proto/remoting/v1:telemetry_grpc_library" ]
     deps -= [ "//google_apis" ]
   }
 }
@@ -91,10 +93,16 @@ source_set("authorization") {
     "gaia_oauth_client.cc",
     "gaia_oauth_client.h",
     "oauth_client.h",
+    "oauth_token_exchanger.cc",
+    "oauth_token_exchanger.h",
     "oauth_token_getter.cc",
     "oauth_token_getter.h",
     "oauth_token_getter_impl.cc",
     "oauth_token_getter_impl.h",
+    "oauth_token_getter_proxy.cc",
+    "oauth_token_getter_proxy.h",
+    "offline_token_exchanger.cc",
+    "offline_token_exchanger.h",
   ]
 
   configs += [
@@ -107,6 +115,10 @@ source_set("authorization") {
     "//google_apis",
     "//net",
   ]
+
+  deps = [
+    "//remoting/proto/remoting/v1:directory_grpc_library",
+  ]
 }
 
 source_set("breakpad") {
@@ -165,13 +177,17 @@ source_set("unit_tests") {
     "buffered_socket_writer_unittest.cc",
     "capabilities_unittest.cc",
     "compound_buffer_unittest.cc",
+    "oauth_token_getter_proxy_unittest.cc",
     "rate_counter_unittest.cc",
     "result_unittest.cc",
     "rsa_key_pair_unittest.cc",
     "run_all_unittests.cc",
     "running_samples_unittest.cc",
     "session_options_unittest.cc",
-    "telemetry_log_writer_unittest.cc",
+
+    # TODO(https://crbug.com/968640): Fix and reenable tests once we have some
+    # breathing room.
+    # "telemetry_log_writer_unittest.cc",
     "typed_buffer_unittest.cc",
     "util_unittest.cc",
     "weighted_samples_unittest.cc",
diff --git a/chromium/remoting/base/grpc_support/BUILD.gn b/chromium/remoting/base/grpc_support/BUILD.gn
index b71884ee7a3..99e57dbce34 100644
--- a/chromium/remoting/base/grpc_support/BUILD.gn
+++ b/chromium/remoting/base/grpc_support/BUILD.gn
@@ -18,7 +18,8 @@ static_library("grpc_support") {
     "grpc_channel.cc",
     "grpc_channel.h",
     "grpc_executor.h",
-    "root_certs_prod.inc",
+    "grpc_util.cc",
+    "grpc_util.h",
     "scoped_grpc_server_stream.cc",
     "scoped_grpc_server_stream.h",
     "using_grpc_channel_shared_ptr.inc",
@@ -26,6 +27,7 @@ static_library("grpc_support") {
 
   deps = [
     "//base",
+    "//third_party/google_trust_services",
     "//third_party/grpc:grpcpp",
   ]
 }
@@ -36,22 +38,6 @@ cc_grpc_library("unit_tests_grpc_library") {
   ]
 }
 
-source_set("test_support") {
-  testonly = true
-
-  sources = [
-    "grpc_async_test_server.cc",
-    "grpc_async_test_server.h",
-    "grpc_test_util.cc",
-    "grpc_test_util.h",
-  ]
-
-  deps = [
-    "//base",
-    "//third_party/grpc:grpcpp",
-  ]
-}
-
 source_set("unit_tests") {
   testonly = true
 
@@ -61,8 +47,8 @@ source_set("unit_tests") {
   ]
   deps = [
     ":grpc_support",
-    ":test_support",
     ":unit_tests_grpc_library",
+    "//remoting/base/grpc_test_support",
     "//testing/gmock",
     "//testing/gtest",
   ]
diff --git a/chromium/remoting/base/grpc_test_support/BUILD.gn b/chromium/remoting/base/grpc_test_support/BUILD.gn
new file mode 100644
index 00000000000..3838abace72
--- /dev/null
+++ b/chromium/remoting/base/grpc_test_support/BUILD.gn
@@ -0,0 +1,21 @@
+# Copyright 2019 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("grpc_test_support") {
+  testonly = true
+
+  sources = [
+    "grpc_async_test_server.cc",
+    "grpc_async_test_server.h",
+    "grpc_test_server.h",
+    "grpc_test_util.cc",
+    "grpc_test_util.h",
+  ]
+
+  deps = [
+    "//base",
+    "//remoting/base/grpc_support",
+    "//third_party/grpc:grpcpp",
+  ]
+}
diff --git a/chromium/remoting/client/BUILD.gn b/chromium/remoting/client/BUILD.gn
index df05c6f12b5..127220e6bf7 100644
--- a/chromium/remoting/client/BUILD.gn
+++ b/chromium/remoting/client/BUILD.gn
@@ -35,8 +35,11 @@ static_library("client") {
     "//remoting/build/config:enable_webrtc_remoting_client",
   ]
 
-  deps = [
+  public_deps = [
     "//remoting/base",
+  ]
+
+  deps = [
     "//remoting/client/audio",
     "//remoting/codec:decoder",
     "//remoting/protocol",
@@ -57,11 +60,10 @@ static_library("client") {
       "chromoting_session.h",
       "dual_buffer_frame_consumer.cc",
       "dual_buffer_frame_consumer.h",
-      "oauth_token_getter_proxy.cc",
-      "oauth_token_getter_proxy.h",
     ]
     deps += [
       "//mojo/core/embedder",
+      "//remoting/base:authorization",
       "//remoting/client/input",
       "//remoting/client/ui",
       "//services/network:network_service",
@@ -92,7 +94,6 @@ source_set("unit_tests") {
     "client_telemetry_logger_unittest.cc",
     "dual_buffer_frame_consumer_unittest.cc",
     "empty_cursor_filter_unittest.cc",
-    "oauth_token_getter_proxy_unittest.cc",
     "queued_task_poster_unittest.cc",
     "software_video_renderer_unittest.cc",
   ]
diff --git a/chromium/remoting/client/audio/BUILD.gn b/chromium/remoting/client/audio/BUILD.gn
index 892e2a020f4..684a1b67b21 100644
--- a/chromium/remoting/client/audio/BUILD.gn
+++ b/chromium/remoting/client/audio/BUILD.gn
@@ -38,10 +38,15 @@ source_set("audio") {
 
 source_set("test_support") {
   testonly = true
+
   sources = [
     "fake_async_audio_data_supplier.cc",
     "fake_async_audio_data_supplier.h",
   ]
+
+  deps = [
+    "//base",
+  ]
 }
 
 source_set("unit_tests") {
diff --git a/chromium/remoting/client/jni/BUILD.gn b/chromium/remoting/client/jni/BUILD.gn
index 34c0896571d..30ff03e76cf 100644
--- a/chromium/remoting/client/jni/BUILD.gn
+++ b/chromium/remoting/client/jni/BUILD.gn
@@ -22,6 +22,7 @@ shared_library("remoting_client_jni") {
     "//remoting/base",
     "//remoting/client",
     "//remoting/client/display",
+    "//remoting/proto/remoting/v1:directory_grpc_library",
     "//remoting/protocol",
     "//ui/gfx",
   ]
@@ -30,6 +31,8 @@ shared_library("remoting_client_jni") {
     "egl_thread_context.h",
     "jni_client.cc",
     "jni_client.h",
+    "jni_directory_service.cc",
+    "jni_directory_service.h",
     "jni_gl_display_handler.cc",
     "jni_gl_display_handler.h",
     "jni_oauth_token_getter.cc",
@@ -54,6 +57,7 @@ shared_library("remoting_client_jni") {
 
 java_cpp_enum("jni_enums") {
   sources = [
+    "jni_directory_service.h",
     "jni_oauth_token_getter.h",
   ]
 }
diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn
index 229a7cb37e3..e8445db3e6e 100644
--- a/chromium/remoting/host/BUILD.gn
+++ b/chromium/remoting/host/BUILD.gn
@@ -155,6 +155,8 @@ static_library("common") {
     "evaluate_capability.h",
     "forward_process_stats_agent.cc",
     "forward_process_stats_agent.h",
+    "ftl_host_change_notification_listener.cc",
+    "ftl_host_change_notification_listener.h",
     "ftl_signaling_connector.cc",
     "ftl_signaling_connector.h",
     "gcd_rest_client.cc",
@@ -169,6 +171,8 @@ static_library("common") {
     "host_change_notification_listener.h",
     "host_config.cc",
     "host_config.h",
+    "host_config_upgrader.cc",
+    "host_config_upgrader.h",
     "host_details.cc",
     "host_details.h",
     "host_event_logger.h",
@@ -245,10 +249,11 @@ static_library("common") {
     "process_stats_agent.h",
     "process_stats_sender.cc",
     "process_stats_sender.h",
-    "register_support_host_request.cc",
     "register_support_host_request.h",
     "remote_input_filter.cc",
     "remote_input_filter.h",
+    "remoting_register_support_host_request.cc",
+    "remoting_register_support_host_request.h",
     "resizing_host_observer.cc",
     "resizing_host_observer.h",
     "resources.h",
@@ -291,6 +296,10 @@ 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",
   ]
 
   libs = []
@@ -310,9 +319,12 @@ static_library("common") {
     "//media",
     "//remoting/base",
     "//remoting/base:authorization",
+    "//remoting/base/grpc_support",
     "//remoting/host/file_transfer:common",
     "//remoting/host/input_monitor",
     "//remoting/host/security_key",
+    "//remoting/proto/remoting/v1:directory_grpc_library",
+    "//remoting/proto/remoting/v1:remote_support_host_grpc_library",
     "//remoting/protocol",
     "//remoting/resources",
     "//services/network:network_service",
@@ -473,6 +485,7 @@ source_set("unit_tests") {
     "desktop_display_info_unittest.cc",
     "desktop_process_unittest.cc",
     "desktop_session_agent_unittest.cc",
+    "ftl_host_change_notification_listener_unittest.cc",
     "gcd_rest_client_unittest.cc",
     "gcd_state_updater_unittest.cc",
     "heartbeat_sender_unittest.cc",
@@ -497,8 +510,8 @@ source_set("unit_tests") {
     "pin_hash_unittest.cc",
     "policy_watcher_unittest.cc",
     "process_stats_sender_unittest.cc",
-    "register_support_host_request_unittest.cc",
     "remote_input_filter_unittest.cc",
+    "remoting_register_support_host_request_unittest.cc",
     "resizing_host_observer_unittest.cc",
     "resources_unittest.cc",
     "screen_resolution_unittest.cc",
@@ -509,6 +522,8 @@ 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",
   ]
 
   if (use_ozone || is_chromeos) {
@@ -530,6 +545,7 @@ source_set("unit_tests") {
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
+    "//third_party/grpc:grpcpp",
   ]
 
   if (is_linux && !is_chromeos) {
@@ -767,6 +783,7 @@ if (enable_me2me_host) {
         "host_main.h",
       ]
       deps = [
+        "//base",
         "//base:debugging_buildflags",
       ]
     }
@@ -787,6 +804,7 @@ if (enable_me2me_host) {
 
         deps = [
           ":remoting_me2me_host_static",
+          "//base",
           "//remoting/base:breakpad",
           "//remoting/host/installer:credits",
           "//remoting/resources",
diff --git a/chromium/remoting/host/input_monitor/BUILD.gn b/chromium/remoting/host/input_monitor/BUILD.gn
index 28d56bf7b78..829366869ad 100644
--- a/chromium/remoting/host/input_monitor/BUILD.gn
+++ b/chromium/remoting/host/input_monitor/BUILD.gn
@@ -23,11 +23,11 @@ source_set("input_monitor") {
     "local_keyboard_input_monitor_mac.mm",
     "local_keyboard_input_monitor_win.cc",
     "local_keyboard_input_monitor_x11.cc",
-    "local_mouse_input_monitor.h",
-    "local_mouse_input_monitor_chromeos.cc",
     "local_mouse_input_monitor_mac.mm",
     "local_mouse_input_monitor_win.cc",
     "local_mouse_input_monitor_x11.cc",
+    "local_pointer_input_monitor.h",
+    "local_pointer_input_monitor_chromeos.cc",
   ]
 
   deps = [
diff --git a/chromium/remoting/host/linux/BUILD.gn b/chromium/remoting/host/linux/BUILD.gn
index a07f8b0254a..bbfd2825304 100644
--- a/chromium/remoting/host/linux/BUILD.gn
+++ b/chromium/remoting/host/linux/BUILD.gn
@@ -60,7 +60,10 @@ if (enable_me2me_host) {
       ":remoting_user_session",
     ]
     if (is_component_build) {
-      sources += [ "$root_build_dir/libbase.so" ]
+      sources += [
+        "$root_build_dir/libbase.so",
+        "$root_build_dir/libboringssl.so",
+      ]
       deps += [ "//base:base" ]
       if (use_custom_libcxx) {
         sources += [ "$root_build_dir/libc++.so" ]
diff --git a/chromium/remoting/host/setup/BUILD.gn b/chromium/remoting/host/setup/BUILD.gn
index b5809f615e0..539cfd1353b 100644
--- a/chromium/remoting/host/setup/BUILD.gn
+++ b/chromium/remoting/host/setup/BUILD.gn
@@ -45,6 +45,7 @@ source_set("common") {
     "//remoting/base:authorization",
     "//remoting/host:common",
     "//remoting/host/native_messaging",
+    "//remoting/proto/remoting/v1:directory_grpc_library",
     "//services/network/public/cpp",
     "//services/network/public/mojom",
   ]
diff --git a/chromium/remoting/host/win/BUILD.gn b/chromium/remoting/host/win/BUILD.gn
index 1354dab3aa1..3f0d71a67c9 100644
--- a/chromium/remoting/host/win/BUILD.gn
+++ b/chromium/remoting/host/win/BUILD.gn
@@ -199,6 +199,7 @@ midl("remoting_lib_idl") {
   deps = [
     ":generate_idl",
   ]
+  writes_tlb = true
 }
 
 config("MIDL_config") {
diff --git a/chromium/remoting/ios/app/BUILD.gn b/chromium/remoting/ios/app/BUILD.gn
index 7bff7e9e469..65993b1bf45 100644
--- a/chromium/remoting/ios/app/BUILD.gn
+++ b/chromium/remoting/ios/app/BUILD.gn
@@ -100,6 +100,7 @@ source_set("common_source_set") {
 
   public_deps = [
     "//ios/third_party/material_components_ios",
+    "//remoting/ios/facade",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/remoting/ios/domain/BUILD.gn b/chromium/remoting/ios/domain/BUILD.gn
index 238f6fc34ac..3c50440cf84 100644
--- a/chromium/remoting/ios/domain/BUILD.gn
+++ b/chromium/remoting/ios/domain/BUILD.gn
@@ -18,5 +18,9 @@ source_set("domain") {
     "user_info.mm",
   ]
 
+  deps = [
+    "//remoting/proto/remoting/v1:directory_proto",
+  ]
+
   configs += [ "//build/config/compiler:enable_arc" ]
 }
diff --git a/chromium/remoting/ios/facade/BUILD.gn b/chromium/remoting/ios/facade/BUILD.gn
index 4ea43147050..980b49f2553 100644
--- a/chromium/remoting/ios/facade/BUILD.gn
+++ b/chromium/remoting/ios/facade/BUILD.gn
@@ -8,10 +8,8 @@ import("//remoting/build/config/remoting_build.gni")
 
 source_set("facade") {
   sources = [
-    "host_info.cc",
-    "host_info.h",
-    "host_list_fetcher.cc",
-    "host_list_fetcher.h",
+    "directory_client.cc",
+    "directory_client.h",
     "host_list_service.h",
     "host_list_service.mm",
     "ios_client_runtime_delegate.h",
@@ -32,18 +30,15 @@ source_set("facade") {
     "//remoting/client",
     "//remoting/ios/domain",
     "//remoting/ios/persistence",
+    "//remoting/proto/remoting/v1:directory_grpc_library",
     "//remoting/resources",
+    "//remoting/signaling",
     "//ui/base",
   ]
 
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
-source_set("test_support") {
-  testonly = true
-  sources = [
-    "fake_host_list_fetcher.cc",
-    "fake_host_list_fetcher.h",
+  public_deps = [
+    "//remoting/base",
+    "//remoting/proto/remoting/v1:directory_proto",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -56,7 +51,8 @@ source_set("unit_tests") {
   ]
   deps = [
     ":facade",
-    ":test_support",
+    "//remoting/base/grpc_test_support",
+    "//remoting/proto/remoting/v1:directory_grpc_library",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/ocmock",
diff --git a/chromium/remoting/proto/ftl/v1/BUILD.gn b/chromium/remoting/proto/ftl/v1/BUILD.gn
new file mode 100644
index 00000000000..7441b62529f
--- /dev/null
+++ b/chromium/remoting/proto/ftl/v1/BUILD.gn
@@ -0,0 +1,22 @@
+# Copyright 2019 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("//third_party/grpc/grpc_library.gni")
+import("//third_party/protobuf/proto_library.gni")
+
+proto_library("ftl_messages") {
+  sources = [
+    "chromoting_message.proto",
+    "ftl_messages.proto",
+  ]
+}
+
+cc_grpc_library("ftl_grpc_library") {
+  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
new file mode 100644
index 00000000000..d5eab71667e
--- /dev/null
+++ b/chromium/remoting/proto/remoting/v1/BUILD.gn
@@ -0,0 +1,92 @@
+# Copyright 2019 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("//third_party/grpc/grpc_library.gni")
+import("//third_party/protobuf/proto_library.gni")
+
+proto_library("host_info_proto") {
+  sources = [
+    "host_info.proto",
+  ]
+}
+
+proto_library("directory_proto") {
+  sources = [
+    "directory_messages.proto",
+  ]
+  deps = [
+    ":host_info_proto",
+  ]
+}
+
+cc_grpc_library("directory_grpc_library") {
+  sources = [
+    "directory_service.proto",
+  ]
+  deps = [
+    ":directory_proto",
+  ]
+}
+
+if (is_android) {
+  import("///build/config/android/rules.gni")
+
+  proto_java_library("directory_proto_java") {
+    proto_path = "."
+    sources = [
+      "directory_messages.proto",
+      "host_info.proto",
+    ]
+  }
+}
+
+proto_library("network_traversal_proto") {
+  sources = [
+    "network_traversal_messages.proto",
+  ]
+}
+
+cc_grpc_library("network_traversal_grpc_library") {
+  sources = [
+    "network_traversal_service.proto",
+  ]
+  deps = [
+    ":network_traversal_proto",
+  ]
+}
+
+cc_grpc_library("remote_support_host_grpc_library") {
+  sources = [
+    "remote_support_host_messages.proto",
+    "remote_support_host_service.proto",
+  ]
+  deps = [
+    ":host_info_proto",
+  ]
+}
+
+proto_library("chromoting_event_proto") {
+  sources = [
+    "chromoting_event.proto",
+  ]
+}
+
+proto_library("telemetry_messages") {
+  sources = [
+    "generic_log_entry.proto",
+    "telemetry_messages.proto",
+  ]
+  deps = [
+    ":chromoting_event_proto",
+  ]
+}
+
+cc_grpc_library("telemetry_grpc_library") {
+  sources = [
+    "telemetry_service.proto",
+  ]
+  deps = [
+    ":telemetry_messages",
+  ]
+}
diff --git a/chromium/remoting/protocol/BUILD.gn b/chromium/remoting/protocol/BUILD.gn
index 2e9e7892cda..f4348dfb423 100644
--- a/chromium/remoting/protocol/BUILD.gn
+++ b/chromium/remoting/protocol/BUILD.gn
@@ -204,6 +204,7 @@ static_library("protocol") {
     "//net",
     "//remoting/base",
     "//remoting/codec:decoder",
+    "//remoting/proto/remoting/v1:network_traversal_proto",
     "//remoting/signaling",
     "//third_party/boringssl",
     "//third_party/libyuv",
@@ -227,6 +228,8 @@ static_library("protocol") {
       "chromium_port_allocator_factory.h",
       "chromium_socket_factory.cc",
       "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",
@@ -262,6 +265,7 @@ static_library("protocol") {
     }
 
     deps += [
+      "//remoting/proto/remoting/v1:network_traversal_grpc_library",
       "//third_party/webrtc/api:create_peerconnection_factory",
       "//third_party/webrtc/api/audio_codecs:audio_codecs_api",
       "//third_party/webrtc/api/audio_codecs/opus:audio_decoder_opus",
@@ -363,6 +367,7 @@ source_set("unit_tests") {
     "port_range_unittest.cc",
     "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",
@@ -388,6 +393,7 @@ source_set("unit_tests") {
   deps = [
     ":test_support",
     "//net:test_support",
+    "//remoting/proto/remoting/v1:network_traversal_grpc_library",
     "//testing/gmock",
     "//testing/gtest",
   ]
diff --git a/chromium/remoting/signaling/BUILD.gn b/chromium/remoting/signaling/BUILD.gn
index d3d31505123..8b683bfc446 100644
--- a/chromium/remoting/signaling/BUILD.gn
+++ b/chromium/remoting/signaling/BUILD.gn
@@ -2,12 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//third_party/grpc/grpc_library.gni")
-
 static_library("signaling") {
   sources = [
     "delegating_signal_strategy.cc",
     "delegating_signal_strategy.h",
+    "ftl_client_uuid_device_id_provider.cc",
+    "ftl_client_uuid_device_id_provider.h",
     "ftl_device_id_provider.h",
     "ftl_grpc_context.cc",
     "ftl_grpc_context.h",
@@ -25,17 +25,25 @@ static_library("signaling") {
     "iq_sender.h",
     "jid_util.cc",
     "jid_util.h",
-    "log_to_server.cc",
-    "log_to_server.h",
     "message_reception_channel.h",
+    "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",
+    "remoting_log_to_server.cc",
+    "remoting_log_to_server.h",
     "server_log_entry.cc",
     "server_log_entry.h",
+    "signal_strategy.cc",
     "signal_strategy.h",
     "signaling_address.cc",
     "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",
@@ -51,8 +59,9 @@ static_library("signaling") {
   ]
 
   public_deps = [
-    ":ftl_grpc_library",
     "//remoting/proto",
+    "//remoting/proto/ftl/v1:ftl_grpc_library",
+    "//remoting/proto/remoting/v1:telemetry_grpc_library",
     "//third_party/libjingle_xmpp",
     "//third_party/webrtc_overrides",
   ]
@@ -61,15 +70,18 @@ static_library("signaling") {
     "//base",
     "//crypto",
     "//google_apis",
-    "//jingle:jingle_glue",
+    "//jingle:webrtc_glue",
     "//net",
     "//remoting/base",
     "//remoting/base/grpc_support",
+    "//remoting/proto/remoting/v1:telemetry_messages",
     "//third_party/grpc:grpcpp",
   ]
 
   if (is_nacl) {
     sources -= [
+      "ftl_client_uuid_device_id_provider.cc",
+      "ftl_client_uuid_device_id_provider.h",
       "ftl_grpc_context.cc",
       "ftl_grpc_context.h",
       "ftl_host_device_id_provider.cc",
@@ -82,8 +94,10 @@ static_library("signaling") {
       "ftl_registration_manager.h",
       "ftl_signal_strategy.cc",
       "ftl_signal_strategy.h",
-      "log_to_server.cc",
+      "remoting_log_to_server.cc",
+      "remoting_log_to_server.h",
       "server_log_entry.cc",
+      "xmpp_log_to_server.cc",
       "xmpp_signal_strategy.cc",
     ]
     deps -= [
@@ -91,18 +105,13 @@ static_library("signaling") {
       "//remoting/base/grpc_support",
       "//third_party/grpc:grpcpp",
     ]
-    public_deps -= [ ":ftl_grpc_library" ]
+    public_deps -= [
+      "//remoting/proto/ftl/v1:ftl_grpc_library",
+      "//remoting/proto/remoting/v1:telemetry_grpc_library",
+    ]
   }
 }
 
-cc_grpc_library("ftl_grpc_library") {
-  sources = [
-    "chromoting_message.proto",
-    "ftl.proto",
-    "ftl_services.proto",
-  ]
-}
-
 static_library("test_support") {
   testonly = true
 
@@ -125,13 +134,17 @@ source_set("unit_tests") {
   sources = [
     "ftl_message_reception_channel_unittest.cc",
     "ftl_messaging_client_unittest.cc",
+    "ftl_signal_strategy_unittest.cc",
     "iq_sender_unittest.cc",
     "jid_util_unittest.cc",
-    "log_to_server_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",
diff --git a/chromium/remoting/test/BUILD.gn b/chromium/remoting/test/BUILD.gn
index 57b7f3b4e50..4078d3ddee1 100644
--- a/chromium/remoting/test/BUILD.gn
+++ b/chromium/remoting/test/BUILD.gn
@@ -24,6 +24,8 @@ static_library("test_support") {
     "fake_access_token_fetcher.h",
     "fake_host_list_fetcher.cc",
     "fake_host_list_fetcher.h",
+    "fake_ice_connection.cc",
+    "fake_ice_connection.h",
     "fake_network_dispatcher.cc",
     "fake_network_dispatcher.h",
     "fake_network_manager.cc",
@@ -34,6 +36,8 @@ static_library("test_support") {
     "fake_socket_factory.h",
     "fake_test_token_storage.cc",
     "fake_test_token_storage.h",
+    "fake_webrtc_connection.cc",
+    "fake_webrtc_connection.h",
     "frame_generator_util.cc",
     "frame_generator_util.h",
     "host_info.cc",
@@ -125,6 +129,26 @@ if (enable_remoting_host && !is_android && !is_chromeos) {
     ]
   }
 
+  if (!is_win) {
+    # A binary for starting an IT2ME host from command line.
+    executable("it2me_cli_host") {
+      testonly = true
+      sources = [
+        "it2me_cli_host.cc",
+        "it2me_cli_host.h",
+        "it2me_cli_host_main.cc",
+      ]
+      deps = [
+        ":test_support",
+        "//mojo/core/embedder",
+        "//remoting/base",
+        "//remoting/host",
+        "//remoting/host/it2me:common",
+        "//remoting/host/native_messaging",
+      ]
+    }
+  }
+
   static_library("it2me_standalone_host") {
     testonly = true