BASELINE: Update Chromium to 68.0.3440.125

Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

9 files changed, 39 insertions, 53 deletions

diff --git a/chromium/remoting/BUILD.gn b/chromium/remoting/BUILD.gn
index 32bba3d6ff4..f05a26fc13e 100644
--- a/chromium/remoting/BUILD.gn
+++ b/chromium/remoting/BUILD.gn
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//components/nacl/features.gni")
-import("//media/media_options.gni")
 import("//remoting/build/config/remoting_build.gni")
 
 group("remoting_all") {
@@ -176,9 +175,7 @@ test("remoting_unittests") {
     ]
   }
 
-  if (enable_webrtc) {
-    deps += [ "//third_party/webrtc_overrides:init_webrtc" ]
-  }
+  deps += [ "//third_party/webrtc_overrides:init_webrtc" ]
 
   if (is_android) {
     deps += [ "//net/android:net_java" ]
@@ -221,9 +218,7 @@ if (enable_remoting_host) {
       "//third_party/webrtc_overrides",
     ]
 
-    if (enable_webrtc) {
-      deps += [ "//third_party/webrtc_overrides:init_webrtc" ]
-    }
+    deps += [ "//third_party/webrtc_overrides:init_webrtc" ]
 
     if (is_win) {
       defines += [ "_ALT_NO_EXCEPTIONS" ]
diff --git a/chromium/remoting/client/jni/BUILD.gn b/chromium/remoting/client/jni/BUILD.gn
index 6d097626e85..8f6a569f164 100644
--- a/chromium/remoting/client/jni/BUILD.gn
+++ b/chromium/remoting/client/jni/BUILD.gn
@@ -18,6 +18,7 @@ group("jni") {
 
 shared_library("remoting_client_jni") {
   deps = [
+    "//build/config:exe_and_shlib_deps",
     "//remoting/android:jni_headers",
     "//remoting/android:remoting_jni_registration",
     "//remoting/base",
diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn
index 08851e9cdeb..b0fca33bffe 100644
--- a/chromium/remoting/host/BUILD.gn
+++ b/chromium/remoting/host/BUILD.gn
@@ -3,7 +3,6 @@
 # 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,7 +160,6 @@ static_library("host") {
     "host_details.cc",
     "host_details.h",
     "host_event_logger.h",
-    "host_event_logger_posix.cc",
     "host_event_logger_win.cc",
     "host_exit_codes.cc",
     "host_exit_codes.h",
@@ -235,8 +233,6 @@ static_library("host") {
     "pin_hash.h",
     "policy_watcher.cc",
     "policy_watcher.h",
-    "posix/signal_handler.cc",
-    "posix/signal_handler.h",
     "process_stats_agent.h",
     "process_stats_sender.cc",
     "process_stats_sender.h",
@@ -308,6 +304,7 @@ static_library("host") {
     "//remoting/host/security_key",
     "//remoting/protocol",
     "//remoting/resources",
+    "//third_party/webrtc/modules/desktop_capture",
 
     # //remoting uses the power_save_blocker directly. See crbug.com/689423
     "//services/device/wake_lock/power_save_blocker",
@@ -320,6 +317,14 @@ static_library("host") {
     "//ipc",
   ]
 
+  if (is_posix) {
+    sources += [
+      "host_event_logger_posix.cc",
+      "posix/signal_handler.cc",
+      "posix/signal_handler.h",
+    ]
+  }
+
   if (!is_ios) {
     deps += [ "//components/policy:generated" ]
   }
@@ -406,10 +411,6 @@ static_library("host") {
 
     public_deps += [ "//remoting/host/win" ]
   }
-
-  if (enable_webrtc) {
-    deps += [ "//third_party/webrtc/modules/desktop_capture" ]
-  }
 }
 
 static_library("test_support") {
@@ -436,16 +437,11 @@ static_library("test_support") {
   public_deps = [
     ":host",
     "//remoting/base:test_support",
+    "//third_party/libjingle_xmpp",
     "//third_party/protobuf:protobuf_lite",
+    "//third_party/webrtc/modules/desktop_capture",
+    "//third_party/webrtc_overrides:init_webrtc",
   ]
-
-  if (enable_webrtc) {
-    public_deps += [
-      "//third_party/libjingle_xmpp",
-      "//third_party/webrtc/modules/desktop_capture",
-      "//third_party/webrtc_overrides:init_webrtc",
-    ]
-  }
 }
 
 # The host portions of the remoting unit tests.
@@ -578,6 +574,8 @@ if (enable_remoting_host) {
 
     deps = [
       "//build/config:exe_and_shlib_deps",
+      "//third_party/libjingle_xmpp",
+      "//third_party/webrtc_overrides:init_webrtc",
     ]
 
     configs += [ "//build/config/compiler:wexit_time_destructors" ]
@@ -605,13 +603,6 @@ if (enable_remoting_host) {
         "//remoting/host/setup",
       ]
     }
-
-    if (enable_webrtc) {
-      deps += [
-        "//third_party/libjingle_xmpp",
-        "//third_party/webrtc_overrides:init_webrtc",
-      ]
-    }
   }
 
   action_foreach("remoting_native_messaging_manifests") {
@@ -695,8 +686,6 @@ if (enable_remoting_host) {
 if (enable_me2me_host) {
   static_library("remoting_me2me_host_static") {
     sources = [
-      "pam_authorization_factory_posix.cc",
-      "pam_authorization_factory_posix.h",
       "remoting_me2me_host.cc",
     ]
     defines = []
@@ -715,18 +704,20 @@ if (enable_me2me_host) {
       "//remoting/base",
       "//remoting/host",
       "//remoting/proto",
+      "//third_party/libjingle_xmpp",
       "//third_party/webrtc/modules/desktop_capture",
+      "//third_party/webrtc_overrides:init_webrtc",
     ]
 
-    if (!is_ios) {
-      deps += [ "//components/policy:generated" ]
+    if (is_posix) {
+      sources += [
+        "pam_authorization_factory_posix.cc",
+        "pam_authorization_factory_posix.h",
+      ]
     }
 
-    if (enable_webrtc) {
-      deps += [
-        "//third_party/libjingle_xmpp",
-        "//third_party/webrtc_overrides:init_webrtc",
-      ]
+    if (!is_ios) {
+      deps += [ "//components/policy:generated" ]
     }
 
     if (is_desktop_linux) {
diff --git a/chromium/remoting/host/it2me/BUILD.gn b/chromium/remoting/host/it2me/BUILD.gn
index 69e95836075..7e2df5ce175 100644
--- a/chromium/remoting/host/it2me/BUILD.gn
+++ b/chromium/remoting/host/it2me/BUILD.gn
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
-import("//media/media_options.gni")
 import("//remoting/remoting_options.gni")
 import("//remoting/remoting_locales.gni")
 import("//remoting/remoting_version.gni")
@@ -207,6 +206,7 @@ if (!is_chromeos && enable_remoting_host) {
         "//remoting/host",
         "//remoting/host/native_messaging",
         "//remoting/proto",
+        "//third_party/webrtc_overrides:init_webrtc",
         "//ui/gfx",
       ]
       if (is_mac) {
@@ -227,10 +227,6 @@ if (!is_chromeos && enable_remoting_host) {
         }
       }
 
-      if (enable_webrtc) {
-        deps += [ "//third_party/webrtc_overrides:init_webrtc" ]
-      }
-
       if (is_desktop_linux) {
         deps += [ "//build/config/linux/gtk" ]
       }
diff --git a/chromium/remoting/host/security_key/BUILD.gn b/chromium/remoting/host/security_key/BUILD.gn
index 641103ca309..d865abebe62 100644
--- a/chromium/remoting/host/security_key/BUILD.gn
+++ b/chromium/remoting/host/security_key/BUILD.gn
@@ -7,7 +7,6 @@ import("//remoting/build/config/remoting_build.gni")
 source_set("security_key") {
   sources = [
     "security_key_auth_handler.h",
-    "security_key_auth_handler_posix.cc",
     "security_key_auth_handler_win.cc",
     "security_key_extension.cc",
     "security_key_extension.h",
@@ -41,6 +40,10 @@ source_set("security_key") {
     "//remoting/proto",
     "//third_party/webrtc/modules/desktop_capture",
   ]
+
+  if (is_posix) {
+    sources += [ "security_key_auth_handler_posix.cc" ]
+  }
 }
 
 source_set("main") {
@@ -83,7 +86,6 @@ source_set("unit_tests") {
   testonly = true
 
   sources = [
-    "security_key_auth_handler_posix_unittest.cc",
     "security_key_auth_handler_win_unittest.cc",
     "security_key_extension_session_unittest.cc",
     "security_key_ipc_client_unittest.cc",
@@ -99,6 +101,10 @@ source_set("unit_tests") {
   deps = [
     "//mojo/edk/test:test_support",
   ]
+
+  if (is_posix) {
+    sources += [ "security_key_auth_handler_posix_unittest.cc" ]
+  }
 }
 
 static_library("test_support") {
diff --git a/chromium/remoting/host/win/BUILD.gn b/chromium/remoting/host/win/BUILD.gn
index 875df9b57ac..461f190e99e 100644
--- a/chromium/remoting/host/win/BUILD.gn
+++ b/chromium/remoting/host/win/BUILD.gn
@@ -131,6 +131,7 @@ source_set("win") {
     "//remoting/protocol",
     "//remoting/resources",
     "//services/device/wake_lock/power_save_blocker",
+    "//third_party/webrtc/modules/desktop_capture",
     "//ui/base",
     "//ui/events:dom_keycode_converter",
     "//ui/events/platform",
@@ -139,10 +140,6 @@ source_set("win") {
   if (!is_ios) {
     deps += [ "//components/policy:generated" ]
   }
-
-  if (enable_webrtc) {
-    deps += [ "//third_party/webrtc/modules/desktop_capture" ]
-  }
 }
 
 source_set("unit_tests") {
diff --git a/chromium/remoting/remoting_enable.gni b/chromium/remoting/remoting_enable.gni
index 8a24badbe0c..879214d9a8d 100644
--- a/chromium/remoting/remoting_enable.gni
+++ b/chromium/remoting/remoting_enable.gni
@@ -3,12 +3,11 @@
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
-import("//media/media_options.gni")
 
 if (is_ios) {
   import("//build/config/ios/ios_sdk.gni")
 }
 
 declare_args() {
-  enable_remoting = !is_chromecast && !is_fuchsia && enable_webrtc
+  enable_remoting = !is_chromecast && !is_fuchsia
 }
diff --git a/chromium/remoting/webapp/build_template.gni b/chromium/remoting/webapp/build_template.gni
index 3e430b03af4..05790597600 100644
--- a/chromium/remoting/webapp/build_template.gni
+++ b/chromium/remoting/webapp/build_template.gni
@@ -97,7 +97,7 @@ template("build_webapp_html") {
     exclude_js = invoker.exclude_js
     instrument_js = invoker.instrument_js
 
-    script = rebase_path("//remoting/webapp/build-html.py")
+    script = "//remoting/webapp/build-html.py"
 
     # Create a file that contains a list of all the JavaScript files needed
     # to build the unit test page. This is needed to avoid problems on platforms
diff --git a/chromium/remoting/webapp/files.gni b/chromium/remoting/webapp/files.gni
index 2dfd7428ec2..786d3dcdda1 100644
--- a/chromium/remoting/webapp/files.gni
+++ b/chromium/remoting/webapp/files.gni
@@ -420,6 +420,7 @@ remoting_webapp_template_background = "crd/html/template_background.html"
 # These JS files are specific to the background page and are not part of
 # the main JS files.
 remoting_webapp_background_html_js_files = [
+  "base/js/website_usage_tracker.js",
   "crd/js/activation_handler.js",
   "crd/js/app_launcher.js",
   "crd/js/background.js",