BASELINE: Update Chromium to 57.0.2987.144

Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

18 files changed, 281 insertions, 151 deletions

diff --git a/chromium/remoting/BUILD.gn b/chromium/remoting/BUILD.gn
index 5ed0fff7f83..ba7a70479c8 100644
--- a/chromium/remoting/BUILD.gn
+++ b/chromium/remoting/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("//media/media_options.gni")
 import("//remoting/build/config/remoting_build.gni")
 
 group("remoting_all") {
@@ -117,7 +118,7 @@ group("test_support") {
     "//testing/gtest",
   ]
 
-  if (enable_configuration_policy) {
+  if (!is_ios) {
     deps += [ "//components/policy/core/browser:test_support" ]
   }
 
@@ -144,6 +145,7 @@ test("remoting_unittests") {
     "//google_apis",
     "//remoting/base:unit_tests",
     "//remoting/client:unit_tests",
+    "//remoting/client/display:unit_tests",
     "//remoting/protocol:unit_tests",
     "//remoting/signaling:unit_tests",
     "//remoting/test:unit_tests",
@@ -160,7 +162,7 @@ test("remoting_unittests") {
   }
 
   if (enable_webrtc) {
-    deps += [ "//third_party/libjingle:libjingle_webrtc" ]
+    deps += [ "//third_party/libjingle/webrtc:libjingle_webrtc" ]
   }
 
   if (is_android) {
@@ -176,10 +178,6 @@ test("remoting_unittests") {
       "wtsapi32.lib",
     ]
   }
-
-  if (enable_configuration_policy) {
-    #deps += [ "//components/policy/core/browser:test_support" ]
-  }
 }
 
 if (enable_remoting_host) {
@@ -207,7 +205,7 @@ if (enable_remoting_host) {
     ]
 
     if (enable_webrtc) {
-      deps += [ "//third_party/libjingle:libjingle_webrtc" ]
+      deps += [ "//third_party/libjingle/webrtc:libjingle_webrtc" ]
     }
 
     if (is_win) {
diff --git a/chromium/remoting/android/BUILD.gn b/chromium/remoting/android/BUILD.gn
index 9478e77816f..bf0969dd08d 100644
--- a/chromium/remoting/android/BUILD.gn
+++ b/chromium/remoting/android/BUILD.gn
@@ -24,7 +24,7 @@ shared_library("remoting_client_jni") {
     "//remoting/android:jni_headers",
     "//remoting/base",
     "//remoting/client",
-    "//remoting/client:opengl_renderer",
+    "//remoting/client/display",
     "//remoting/protocol",
     "//ui/events:dom_keycode_converter",
     "//ui/gfx",
@@ -144,5 +144,6 @@ instrumentation_test_apk("remoting_test_apk") {
     ":remoting_android_client_java",
     "//base:base_java",
     "//base:base_java_test_support",
+    "//third_party/android_support_test_runner:runner_java",
   ]
 }
diff --git a/chromium/remoting/android/client_java_tmpl.gni b/chromium/remoting/android/client_java_tmpl.gni
index e2441f96879..705ce459f43 100644
--- a/chromium/remoting/android/client_java_tmpl.gni
+++ b/chromium/remoting/android/client_java_tmpl.gni
@@ -80,7 +80,8 @@ template("remoting_android_client_java_tmpl") {
       "//base:base_java",
       "//remoting/android:remoting_android_client_java_resources",
       "//third_party/android_tools:android_support_annotations_java",
-      "//third_party/android_tools:android_support_v4_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_java",
diff --git a/chromium/remoting/client/BUILD.gn b/chromium/remoting/client/BUILD.gn
index b5ff104c1f1..bb8345a710c 100644
--- a/chromium/remoting/client/BUILD.gn
+++ b/chromium/remoting/client/BUILD.gn
@@ -73,56 +73,6 @@ static_library("client") {
   }
 }
 
-source_set("opengl_renderer") {
-  sources = [
-    "gl_canvas.cc",
-    "gl_canvas.h",
-    "gl_cursor.cc",
-    "gl_cursor.h",
-    "gl_cursor_feedback.cc",
-    "gl_cursor_feedback.h",
-    "gl_cursor_feedback_texture.cc",
-    "gl_cursor_feedback_texture.h",
-    "gl_desktop.cc",
-    "gl_desktop.h",
-    "gl_helpers.cc",
-    "gl_helpers.h",
-    "gl_math.cc",
-    "gl_math.h",
-    "gl_render_layer.cc",
-    "gl_render_layer.h",
-    "gl_renderer.cc",
-    "gl_renderer.h",
-  ]
-
-  deps = [
-    "//remoting/proto",
-    "//third_party/libyuv",
-    "//third_party/webrtc/base:rtc_base",
-  ]
-
-  configs += [ "//third_party/khronos:khronos_headers" ]
-
-  if (is_linux) {
-    libs = [ "GL" ]
-  }
-
-  if (is_mac) {
-    libs = [ "OpenGL.framework" ]
-  }
-
-  if (is_ios) {
-    libs = [
-      "GLKit.framework",
-      "OpenGLES.framework",
-    ]
-  }
-
-  if (is_win) {
-    deps += [ "//third_party/angle:libGLESv2" ]
-  }
-}
-
 source_set("unit_tests") {
   testonly = true
 
@@ -159,11 +109,4 @@ source_set("unit_tests") {
     "//testing/gtest",
     "//third_party/webrtc/base:rtc_base",
   ]
-
-  if (!is_win) {
-    # Windows clang builder fails to link the test binary with ANGLE GLESv2.
-    # crbug.com/642027
-    sources += [ "gl_renderer_unittest.cc" ]
-    deps += [ ":opengl_renderer" ]
-  }
 }
diff --git a/chromium/remoting/client/display/BUILD.gn b/chromium/remoting/client/display/BUILD.gn
new file mode 100644
index 00000000000..9716d4cd084
--- /dev/null
+++ b/chromium/remoting/client/display/BUILD.gn
@@ -0,0 +1,91 @@
+# Copyright 2014 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("display") {
+  sources = [
+    "canvas.h",
+    "drawable.h",
+    "gl_canvas.cc",
+    "gl_canvas.h",
+    "gl_cursor.cc",
+    "gl_cursor.h",
+    "gl_cursor_feedback.cc",
+    "gl_cursor_feedback.h",
+    "gl_cursor_feedback_texture.cc",
+    "gl_cursor_feedback_texture.h",
+    "gl_desktop.cc",
+    "gl_desktop.h",
+    "gl_helpers.cc",
+    "gl_helpers.h",
+    "gl_math.cc",
+    "gl_math.h",
+    "gl_render_layer.cc",
+    "gl_render_layer.h",
+    "gl_renderer.cc",
+    "gl_renderer.h",
+    "sys_opengl.h",
+  ]
+
+  deps = [
+    "//remoting/proto",
+    "//third_party/libyuv",
+    "//third_party/webrtc/base:rtc_base",
+  ]
+
+  public_configs = [ "//third_party/khronos:khronos_headers" ]
+
+  if (is_android) {
+    libs = [ "GLESv2" ]
+  }
+
+  if (is_linux) {
+    libs = [ "GL" ]
+  }
+
+  if (is_mac) {
+    libs = [ "OpenGL.framework" ]
+  }
+
+  if (is_ios) {
+    libs = [
+      "GLKit.framework",
+      "OpenGLES.framework",
+    ]
+  }
+
+  if (is_win) {
+    deps += [ "//third_party/angle:libGLESv2" ]
+  }
+}
+
+if (is_win) {
+  # Windows clang builder fails to link the test binary with ANGLE GLESv2.
+  # crbug.com/642027
+  group("unit_tests") {
+    deps = []
+  }
+} else {
+  source_set("unit_tests") {
+    testonly = true
+
+    sources = [
+      "fake_canvas.cc",
+      "fake_canvas.h",
+      "gl_renderer_unittest.cc",
+    ]
+
+    configs += [
+      "//remoting/build/config:version",
+      "//remoting/build/config:enable_webrtc_remoting_client",
+    ]
+
+    deps = [
+      ":display",
+      "//remoting/proto",
+      "//testing/gmock",
+      "//testing/gtest",
+      "//third_party/webrtc/base:rtc_base",
+    ]
+  }
+}
diff --git a/chromium/remoting/client/ios/BUILD.gn b/chromium/remoting/client/ios/BUILD.gn
index 92c8a24a0e9..b2644f157dd 100644
--- a/chromium/remoting/client/ios/BUILD.gn
+++ b/chromium/remoting/client/ios/BUILD.gn
@@ -2,10 +2,14 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//remoting/build/config/remoting_build.gni")
+
 group("all") {
   testonly = true
 
   deps = [
+    ":ios_core",
+    ":main",
     "./bridge:all",
   ]
 }
@@ -14,16 +18,57 @@ group("all_test") {
   testonly = true
 
   deps = [
+    ":ios_core_unit_tests",
     "./bridge:bridge_unit_tests",
   ]
 }
 
+source_set("main") {
+  sources = [
+    "app_delegate.h",
+    "app_delegate.mm",
+    "example_view_controller.h",
+    "example_view_controller.mm",
+    "main.mm",
+  ]
+
+  deps = [
+    "//base",
+    "//remoting/base",
+    "//remoting/client",
+    "//remoting/client/ios/bridge",
+    "//remoting/protocol",
+    "//third_party/google_toolbox_for_mac",
+    "//ui/base",
+    "//ui/gfx",
+    "//ui/resources",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
 source_set("ios_core") {
   sources = [
+    "app_runtime.cc",
+    "app_runtime.h",
+    "client_gestures.h",
+    "client_gestures.mm",
+    "host.h",
+    "host.mm",
+    "host_preferences.h",
+    "host_preferences.mm",
+    "host_preferences_persistence.h",
+    "key_input.h",
+    "key_input.mm",
+    "key_map_us.h",
     "utility.h",
     "utility.mm",
   ]
 
+  if (!is_chrome_branded) {
+    sources += [ "host_preferences_persistence_chromium.mm" ]
+  }
+
   public_deps = [
     "//third_party/webrtc/base:rtc_base",
     "//third_party/webrtc/modules/desktop_capture:primitives",
@@ -31,6 +76,7 @@ source_set("ios_core") {
 
   deps = [
     "//base",
+    "//remoting/protocol",
   ]
 
   libs = [
@@ -41,3 +87,27 @@ source_set("ios_core") {
 
   configs += [ "//build/config/compiler:enable_arc" ]
 }
+
+source_set("ios_core_unit_tests") {
+  testonly = true
+
+  include_dirs = [
+    "$root_gen_dir",
+    "//third_party/protobuf/src",
+  ]
+
+  sources = [
+    #    "host_refresh_unittest.mm",
+    #    "host_refresh_unittest_helper.h",
+    "key_input_unittest.mm",
+  ]
+
+  deps = [
+    ":ios_core",
+    "//testing/gtest",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  data = []
+}
diff --git a/chromium/remoting/codec/BUILD.gn b/chromium/remoting/codec/BUILD.gn
index 5c5707bdde4..2c8d343a899 100644
--- a/chromium/remoting/codec/BUILD.gn
+++ b/chromium/remoting/codec/BUILD.gn
@@ -38,6 +38,7 @@ source_set("encoder") {
     "//third_party/libyuv",
     "//third_party/opus",
     "//third_party/webrtc/modules/desktop_capture:primitives",
+    "//ui/gfx:color_space",
   ]
 
   if (is_nacl) {
@@ -59,12 +60,14 @@ source_set("encoder") {
     deps -= [
       "//media",
       "//media:shared_memory_support",
+      "//ui/gfx:color_space",
     ]
   }
 
   # Opus depends on //media, which is not a supported include for iOS.
-  # Removing Opus for iOS builds.
-  if (is_ios) {
+  # Also disabled it on Android, to avoid dependency on //media.
+  # TODO(sergeyu): Cleanup host-only deps in client targets.
+  if (is_ios || is_android) {
     sources -= [
       "audio_encoder_opus.cc",
       "audio_encoder_opus.h",
@@ -141,9 +144,10 @@ source_set("unit_tests") {
     "//remoting/proto",
     "//testing/gtest",
     "//third_party/webrtc/modules/desktop_capture",
+    "//ui/gfx:color_space",
   ]
 
-  if (is_ios) {
+  if (is_ios || is_android) {
     sources -= [ "audio_encoder_opus_unittest.cc" ]
   }
 }
diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn
index 3fc21fae56c..eb74514729d 100644
--- a/chromium/remoting/host/BUILD.gn
+++ b/chromium/remoting/host/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/util/process_version.gni")
+import("//media/media_options.gni")
 import("//remoting/build/config/remoting_build.gni")
 
 group("all_tests") {
@@ -161,6 +162,8 @@ static_library("host") {
     "host_event_logger_win.cc",
     "host_exit_codes.cc",
     "host_exit_codes.h",
+    "host_experiment_session_plugin.cc",
+    "host_experiment_session_plugin.h",
     "host_export.h",
     "host_extension.h",
     "host_extension_session.h",
@@ -170,6 +173,8 @@ static_library("host") {
     "host_power_save_blocker.h",
     "host_secret.cc",
     "host_secret.h",
+    "host_session_options.cc",
+    "host_session_options.h",
     "host_status_logger.cc",
     "host_status_logger.h",
     "host_status_monitor.h",
@@ -197,8 +202,6 @@ static_library("host") {
     "ipc_mouse_cursor_monitor.h",
     "ipc_screen_controls.cc",
     "ipc_screen_controls.h",
-    "ipc_util.h",
-    "ipc_util_win.cc",
     "ipc_video_frame_capturer.cc",
     "ipc_video_frame_capturer.h",
     "it2me_desktop_environment.cc",
@@ -322,7 +325,7 @@ static_library("host") {
 
   public_deps = []
 
-  if (enable_configuration_policy) {
+  if (!is_ios) {
     deps += [ "//components/policy:generated" ]
   }
 
@@ -336,11 +339,7 @@ static_library("host") {
       "//build/config/linux:xrandr",
     ]
     if (is_desktop_linux) {
-      if (use_gtk3) {
-        deps += [ "//build/config/linux/gtk3" ]
-      } else {
-        deps += [ "//build/config/linux/gtk2" ]
-      }
+      deps += [ "//build/config/linux/gtk" ]
     }
   } else {
     sources -= [
@@ -473,9 +472,8 @@ static_library("test_support") {
 
   if (enable_webrtc) {
     public_deps += [
-      "//third_party/libjingle:libjingle_webrtc",
-      "//third_party/webrtc/libjingle/xmllite",
-      "//third_party/webrtc/libjingle/xmpp",
+      "//third_party/libjingle/webrtc:libjingle_webrtc",
+      "//third_party/libjingle_xmpp",
       "//third_party/webrtc/modules/desktop_capture",
     ]
   }
@@ -502,8 +500,10 @@ source_set("unit_tests") {
     "host_attributes_unittest.cc",
     "host_change_notification_listener_unittest.cc",
     "host_config_unittest.cc",
+    "host_experiment_session_plugin_unittest.cc",
     "host_extension_session_manager_unittest.cc",
     "host_power_save_blocker_unittest.cc",
+    "host_session_options_unittest.cc",
     "host_status_logger_unittest.cc",
     "ipc_desktop_environment_unittest.cc",
     "it2me/it2me_confirmation_dialog_proxy_unittest.cc",
@@ -567,7 +567,7 @@ source_set("unit_tests") {
     deps += [ "//remoting/host/win:unit_tests" ]
   }
 
-  if (enable_configuration_policy) {
+  if (!is_ios) {
     deps += [ "//components/policy/core/browser:test_support" ]
   }
 }
@@ -605,7 +605,8 @@ if (enable_remoting_host) {
     configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
     if (is_win) {
-      defines = host_predefines + [ "BINARY=BINARY_REMOTING_START_HOST" ]
+      defines = host_predefines +
+                [ "REMOTING_HOST_BINARY=BINARY_REMOTING_START_HOST" ]
 
       deps += [
         "//build/win:default_exe_manifest",
@@ -625,9 +626,8 @@ if (enable_remoting_host) {
 
     if (enable_webrtc) {
       deps += [
-        "//third_party/libjingle:libjingle_webrtc",
-        "//third_party/webrtc/libjingle/xmllite",
-        "//third_party/webrtc/libjingle/xmpp",
+        "//third_party/libjingle/webrtc:libjingle_webrtc",
+        "//third_party/libjingle_xmpp",
       ]
     }
   }
@@ -736,24 +736,19 @@ if (enable_me2me_host) {
       "//third_party/webrtc/modules/desktop_capture",
     ]
 
-    if (enable_configuration_policy) {
+    if (!is_ios) {
       deps += [ "//components/policy:generated" ]
     }
 
     if (enable_webrtc) {
       deps += [
-        "//third_party/libjingle:libjingle_webrtc",
-        "//third_party/webrtc/libjingle/xmllite",
-        "//third_party/webrtc/libjingle/xmpp",
+        "//third_party/libjingle/webrtc:libjingle_webrtc",
+        "//third_party/libjingle_xmpp",
       ]
     }
 
     if (is_desktop_linux) {
-      if (use_gtk3) {
-        deps += [ "//build/config/linux/gtk3" ]
-      } else {
-        deps += [ "//build/config/linux/gtk2" ]
-      }
+      deps += [ "//build/config/linux/gtk" ]
     }
     if ((is_linux && !is_chromeos) || is_mac) {
       libs = [ "pam" ]
diff --git a/chromium/remoting/host/installer/linux/BUILD.gn b/chromium/remoting/host/installer/linux/BUILD.gn
index f99db93a7d3..c9853c48361 100644
--- a/chromium/remoting/host/installer/linux/BUILD.gn
+++ b/chromium/remoting/host/installer/linux/BUILD.gn
@@ -80,6 +80,7 @@ action("remoting_me2me_host_deb_installer") {
     "//remoting/host:remoting_native_messaging_manifests",
     "//remoting/host:remoting_start_host",
     "//remoting/host/it2me:remote_assistance_host",
+    "//remoting/host/linux:remoting_user_session",
     "//remoting/resources",
     "//third_party/icu:icudata",
   ]
diff --git a/chromium/remoting/host/it2me/BUILD.gn b/chromium/remoting/host/it2me/BUILD.gn
index d2d84cfe657..49aa142abf9 100644
--- a/chromium/remoting/host/it2me/BUILD.gn
+++ b/chromium/remoting/host/it2me/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
+import("//media/media_options.gni")
 import("//remoting/remoting_enable.gni")
 import("//remoting/remoting_locales.gni")
 import("//remoting/remoting_version.gni")
@@ -57,12 +58,7 @@ source_set("common") {
     # disabled.
     # See crbug.com/462689 for details.
     all_dependent_configs = [ "//third_party/harfbuzz-ng:pangoft2_link_hack" ]
-
-    if (use_gtk3) {
-      deps += [ "//build/config/linux/gtk3" ]
-    } else {
-      deps += [ "//build/config/linux/gtk2" ]
-    }
+    deps += [ "//build/config/linux/gtk" ]
   }
 }
 
@@ -83,7 +79,8 @@ if (!is_chromeos && enable_remoting_host) {
         "it2me_native_messaging_host_entry_point.cc",
       ]
 
-      defines = host_predefines + [ "BINARY=BINARY_REMOTE_ASSISTANCE_HOST" ]
+      defines = host_predefines +
+                [ "REMOTING_HOST_BINARY=BINARY_REMOTE_ASSISTANCE_HOST" ]
 
       ldflags = [
         # "/NODEFAULTLIB", TODO(zijiehe): Why IgnoreAllDefaultLibraries: true in
@@ -106,7 +103,8 @@ if (!is_chromeos && enable_remoting_host) {
         "it2me_native_messaging_host_entry_point.cc",
       ]
 
-      defines = host_predefines + [ "BINARY=BINARY_HOST_IT2ME_UIACCESS" ]
+      defines = host_predefines +
+                [ "REMOTING_HOST_BINARY=BINARY_HOST_IT2ME_UIACCESS" ]
 
       ldflags = [
         # "/NODEFAULTLIB", TODO(zijiehe): Why IgnoreAllDefaultLibraries: true in
@@ -229,15 +227,11 @@ if (!is_chromeos && enable_remoting_host) {
       }
 
       if (enable_webrtc) {
-        deps += [ "//third_party/libjingle:libjingle_webrtc" ]
+        deps += [ "//third_party/libjingle/webrtc:libjingle_webrtc" ]
       }
 
       if (is_desktop_linux) {
-        if (use_gtk3) {
-          deps += [ "//build/config/linux/gtk3" ]
-        } else {
-          deps += [ "//build/config/linux/gtk2" ]
-        }
+        deps += [ "//build/config/linux/gtk" ]
       }
     }
   }
diff --git a/chromium/remoting/host/linux/BUILD.gn b/chromium/remoting/host/linux/BUILD.gn
index 0745dc5e5fd..de5bbba2873 100644
--- a/chromium/remoting/host/linux/BUILD.gn
+++ b/chromium/remoting/host/linux/BUILD.gn
@@ -9,6 +9,18 @@ group("all_tests") {
 }
 
 if (enable_me2me_host) {
+  executable("remoting_user_session") {
+    sources = [
+      "remoting_user_session.cc",
+    ]
+
+    deps = [
+      "//base",
+    ]
+
+    libs = [ "pam" ]
+  }
+
   copy("remoting_me2me_host_copy_script") {
     sources = [
       "linux_me2me_host.py",
@@ -18,23 +30,21 @@ if (enable_me2me_host) {
     ]
   }
 
-  copy("remoting_me2me_host_copy_host") {
+  copy("remoting_me2me_host_copy_host_wrapper") {
     sources = [
       "remoting_me2me_host_wrapper.sh",
     ]
     outputs = [
       "$root_build_dir/remoting/chrome-remote-desktop-host",
     ]
-
-    deps = [
-      "//remoting/host:remoting_me2me_host",
-    ]
   }
 
   group("remoting_dev_me2me_host") {
     deps = [
-      ":remoting_me2me_host_copy_host",
+      ":remoting_me2me_host_copy_host_wrapper",
       ":remoting_me2me_host_copy_script",
+      ":remoting_native_messaging_host",
+      "//remoting/host:remoting_me2me_host",
     ]
   }
 }
diff --git a/chromium/remoting/host/predefines_win.gni b/chromium/remoting/host/predefines_win.gni
index 5edbc74af07..29a031ff0cc 100644
--- a/chromium/remoting/host/predefines_win.gni
+++ b/chromium/remoting/host/predefines_win.gni
@@ -4,7 +4,7 @@
 # GN config is always executed after defines, so if we would like to generate
 # defines ordered as
 # #define BINARY_CORE=1
-# #define BINARY=BINARY_CORE
+# #define REMOTING_HOST_BINARY=BINARY_CORE
 # we need to set these predefines as a list, and append others after it.
 
 assert(is_win)
diff --git a/chromium/remoting/host/security_key/BUILD.gn b/chromium/remoting/host/security_key/BUILD.gn
index b67c5179894..ff462ab14c3 100644
--- a/chromium/remoting/host/security_key/BUILD.gn
+++ b/chromium/remoting/host/security_key/BUILD.gn
@@ -59,7 +59,8 @@ if (is_win) {
   executable("remote_security_key") {
     configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
-    defines = host_predefines + [ "BINARY=BINARY_REMOTE_SECURITY_KEY" ]
+    defines =
+        host_predefines + [ "REMOTING_HOST_BINARY=BINARY_REMOTE_SECURITY_KEY" ]
 
     deps = [
       "//build/win:default_exe_manifest",
diff --git a/chromium/remoting/host/win/BUILD.gn b/chromium/remoting/host/win/BUILD.gn
index d9f0c8a6072..80e3a380ffc 100644
--- a/chromium/remoting/host/win/BUILD.gn
+++ b/chromium/remoting/host/win/BUILD.gn
@@ -2,10 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//remoting/build/config/remoting_build.gni")
-import("//remoting/host/installer/win/generate_clsids.gni")
 import("//build/toolchain/win/midl.gni")
 import("//build/win/message_compiler.gni")
+import("//media/media_options.gni")
+import("//remoting/build/config/remoting_build.gni")
+import("//remoting/host/installer/win/generate_clsids.gni")
 
 group("all") {
   testonly = true
@@ -131,7 +132,7 @@ source_set("win") {
     "//ui/events/platform",
   ]
 
-  if (enable_configuration_policy) {
+  if (!is_ios) {
     deps += [ "//components/policy:generated" ]
   }
 
@@ -262,7 +263,7 @@ message_compiler("messages") {
 executable("remoting_console") {
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
-  defines = host_predefines + [ "BINARY=BINARY_HOST_ME2ME" ]
+  defines = host_predefines + [ "REMOTING_HOST_BINARY=BINARY_HOST_ME2ME" ]
 
   deps = [
     ":dpi_aware_exe_manifest",
@@ -275,10 +276,12 @@ executable("remoting_console") {
     "entry_point.cc",
   ]
 
-  ldflags = [
-    "/ENTRY:HostEntryPoint",
-    # "/NODEFAULTLIB",
-  ]
+  if (!is_asan) {
+    ldflags = [
+      "/ENTRY:HostEntryPoint",
+      # "/NODEFAULTLIB",
+    ]
+  }
 }
 
 executable("remoting_me2me_host") {
@@ -288,7 +291,7 @@ executable("remoting_me2me_host") {
     "//remoting/build/config:remoting_me2me_host",
   ]
 
-  defines = host_predefines + [ "BINARY=BINARY_HOST_ME2ME" ]
+  defines = host_predefines + [ "REMOTING_HOST_BINARY=BINARY_HOST_ME2ME" ]
 
   deps = [
     ":dpi_aware_exe_manifest",
@@ -303,7 +306,12 @@ executable("remoting_me2me_host") {
 
   output_name = "remoting_host"
 
-  ldflags = [ "/ENTRY:HostEntryPoint" ]
+  if (!is_asan) {
+    ldflags = [
+      "/ENTRY:HostEntryPoint",
+      # "/NODEFAULTLIB",
+    ]
+  }
 }
 
 shared_library("remoting_core") {
@@ -314,7 +322,7 @@ shared_library("remoting_core") {
               "_ATL_CSTRING_EXPLICIT_CONSTRUCTORS",
               "_ATL_NO_AUTOMATIC_NAMESPACE",
               "_ATL_NO_EXCEPTIONS",
-              "BINARY=BINARY_CORE",
+              "REMOTING_HOST_BINARY=BINARY_CORE",
               "DAEMON_CONTROLLER_CLSID=\"$daemon_controller_clsid\"",
               "RDP_DESKTOP_SESSION_CLSID=\"$rdp_desktop_session_clsid\"",
               "HOST_IMPLEMENTATION",
@@ -421,7 +429,7 @@ executable("remoting_desktop") {
     "//build/config/win:windowed",
   ]
 
-  defines = host_predefines + [ "BINARY=BINARY_DESKTOP" ]
+  defines = host_predefines + [ "REMOTING_HOST_BINARY=BINARY_DESKTOP" ]
 
   deps = [
     ":remoting_core",
@@ -439,16 +447,19 @@ executable("remoting_desktop") {
     "entry_point.cc",
   ]
 
-  ldflags = [
-    "/ENTRY:HostEntryPoint",
-    # "/NODEFAULTLIB",
-  ]
+  if (!is_asan) {
+    ldflags = [
+      "/ENTRY:HostEntryPoint",
+      # "/NODEFAULTLIB",
+    ]
+  }
 }
 
 executable("remoting_native_messaging_host") {
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
-  defines = host_predefines + [ "BINARY=BINARY_NATIVE_MESSAGING_HOST" ]
+  defines =
+      host_predefines + [ "REMOTING_HOST_BINARY=BINARY_NATIVE_MESSAGING_HOST" ]
 
   deps = [
     ":remoting_core",
diff --git a/chromium/remoting/proto/BUILD.gn b/chromium/remoting/proto/BUILD.gn
index 83c5bca944c..853267e6109 100644
--- a/chromium/remoting/proto/BUILD.gn
+++ b/chromium/remoting/proto/BUILD.gn
@@ -4,6 +4,13 @@
 
 import("//third_party/protobuf/proto_library.gni")
 
+group("proto_lite") {
+  public_deps = [
+    ":proto",
+    "//third_party/protobuf:protobuf_lite",
+  ]
+}
+
 proto_library("proto") {
   sources = [
     "audio.proto",
diff --git a/chromium/remoting/protocol/BUILD.gn b/chromium/remoting/protocol/BUILD.gn
index 3c839d91321..b6ce9eb370f 100644
--- a/chromium/remoting/protocol/BUILD.gn
+++ b/chromium/remoting/protocol/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
+import("//media/media_options.gni")
 
 static_library("protocol") {
   sources = [
@@ -137,12 +138,15 @@ static_library("protocol") {
     "pseudotcp_channel_factory.h",
     "rejecting_authenticator.cc",
     "rejecting_authenticator.h",
+    "sdp_message.cc",
+    "sdp_message.h",
     "secure_channel_factory.cc",
     "secure_channel_factory.h",
     "session.h",
     "session_config.cc",
     "session_config.h",
     "session_manager.h",
+    "session_plugin.h",
     "socket_util.cc",
     "socket_util.h",
     "spake2_authenticator.cc",
@@ -196,6 +200,13 @@ static_library("protocol") {
   ]
 
   if (!is_nacl) {
+    if (!is_android) {
+      sources += [
+        "ice_connection_to_client.cc",
+        "ice_connection_to_client.h",
+      ]
+    }
+
     sources += [
       "capture_scheduler.cc",
       "capture_scheduler.h",
@@ -203,8 +214,6 @@ static_library("protocol") {
       "chromium_port_allocator_factory.h",
       "chromium_socket_factory.cc",
       "chromium_socket_factory.h",
-      "ice_connection_to_client.cc",
-      "ice_connection_to_client.h",
       "video_frame_pump.cc",
       "video_frame_pump.h",
       "webrtc_audio_module.cc",
@@ -238,9 +247,8 @@ static_library("protocol") {
 
     if (enable_webrtc) {
       deps += [
-        "//third_party/libjingle:libjingle_webrtc",
-        "//third_party/webrtc/libjingle/xmllite",
-        "//third_party/webrtc/libjingle/xmpp",
+        "//third_party/libjingle/webrtc:libjingle_webrtc",
+        "//third_party/libjingle_xmpp",
       ]
     } else {
       sources -= [
@@ -301,7 +309,6 @@ source_set("unit_tests") {
     "clipboard_filter_unittest.cc",
     "connection_tester.cc",
     "connection_tester.h",
-    "connection_unittest.cc",
     "content_description_unittest.cc",
     "http_ice_config_request_unittest.cc",
     "ice_transport_unittest.cc",
@@ -318,6 +325,7 @@ source_set("unit_tests") {
     "port_range_unittest.cc",
     "ppapi_module_stub.cc",
     "pseudotcp_adapter_unittest.cc",
+    "sdp_message_unittest.cc",
     "session_config_unittest.cc",
     "spake2_authenticator_unittest.cc",
     "ssl_hmac_channel_authenticator_unittest.cc",
@@ -330,6 +338,10 @@ source_set("unit_tests") {
     "webrtc_transport_unittest.cc",
   ]
 
+  if (!is_android) {
+    sources += [ "connection_unittest.cc" ]
+  }
+
   deps = [
     ":test_support",
     "//net:test_support",
diff --git a/chromium/remoting/signaling/BUILD.gn b/chromium/remoting/signaling/BUILD.gn
index 7490c7ec93b..324f39dd99b 100644
--- a/chromium/remoting/signaling/BUILD.gn
+++ b/chromium/remoting/signaling/BUILD.gn
@@ -35,8 +35,7 @@ static_library("signaling") {
   public_deps = [
     "//remoting/proto",
     "//third_party/libjingle",
-    "//third_party/webrtc/libjingle/xmllite",
-    "//third_party/webrtc/libjingle/xmpp",
+    "//third_party/libjingle_xmpp",
   ]
 
   deps = [
diff --git a/chromium/remoting/test/BUILD.gn b/chromium/remoting/test/BUILD.gn
index c365bc1e253..f6525c94f44 100644
--- a/chromium/remoting/test/BUILD.gn
+++ b/chromium/remoting/test/BUILD.gn
@@ -194,21 +194,13 @@ if (enable_remoting_host && !is_android && !is_chromeos) {
       ":it2me_standalone_host",
     ]
 
-    if (is_win) {
-      deps += [ "//remoting/host/win:dpi_aware_exe_manifest" ]
-    }
-
     if (is_desktop_linux) {
-      if (use_gtk3) {
-        deps += [ "//build/config/linux/gtk3" ]
-      } else {
-        deps += [ "//build/config/linux/gtk2" ]
-      }
+      deps += [ "//build/config/linux/gtk" ]
     }
 
     if (is_win) {
       defines += [ "_ALT_NO_EXCEPTIONS" ]
-
+      deps += [ "//remoting/host/win:dpi_aware_exe_manifest" ]
       libs += [
         "rpcrt4.lib",
         "wtsapi32.lib",