BASELINE: Update Chromium to 64.0.3282.139

Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

12 files changed, 64 insertions, 30 deletions

diff --git a/chromium/remoting/android/BUILD.gn b/chromium/remoting/android/BUILD.gn
index e4d49ab7c6d..620ca018937 100644
--- a/chromium/remoting/android/BUILD.gn
+++ b/chromium/remoting/android/BUILD.gn
@@ -16,6 +16,7 @@ generate_jni("jni_headers") {
     "java/src/org/chromium/chromoting/jni/Client.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",
     "java/src/org/chromium/chromoting/jni/TouchEventData.java",
   ]
   jni_package = "remoting"
diff --git a/chromium/remoting/android/client_java_tmpl.gni b/chromium/remoting/android/client_java_tmpl.gni
index 2da32881f50..57f64067bbf 100644
--- a/chromium/remoting/android/client_java_tmpl.gni
+++ b/chromium/remoting/android/client_java_tmpl.gni
@@ -71,6 +71,7 @@ template("remoting_android_client_java_tmpl") {
       "jni/ConnectionListener.java",
       "jni/GlDisplay.java",
       "jni/JniInterface.java",
+      "jni/JniOAuthTokenGetter.java",
       "jni/TouchEventData.java",
     ]
 
@@ -80,6 +81,7 @@ template("remoting_android_client_java_tmpl") {
       "//base:base_java",
       "//remoting/android:remoting_android_client_java_resources",
       "//remoting/android:remoting_apk_manifest",
+      "//third_party/android_tools:android_arch_lifecycle_common_java",
       "//third_party/android_tools:android_support_annotations_java",
       "//third_party/android_tools:android_support_compat_java",
       "//third_party/android_tools:android_support_core_ui_java",
@@ -88,6 +90,8 @@ template("remoting_android_client_java_tmpl") {
       "//ui/android:ui_utils_java",
     ]
 
+    srcjar_deps = [ "//remoting/client/jni:jni_enums" ]
+
     if (defined(invoker.play_services_package)) {
       deps += [
         "${invoker.play_services_package}:google_play_services_auth_base_java",
diff --git a/chromium/remoting/base/BUILD.gn b/chromium/remoting/base/BUILD.gn
index 3cc1e9b114a..305d1adf7ec 100644
--- a/chromium/remoting/base/BUILD.gn
+++ b/chromium/remoting/base/BUILD.gn
@@ -20,6 +20,8 @@ source_set("base") {
     "compound_buffer.h",
     "constants.cc",
     "constants.h",
+    "weighted_samples.cc",
+    "weighted_samples.h",
     "leaky_bucket.cc",
     "leaky_bucket.h",
     "name_value_map.h",
@@ -34,6 +36,8 @@ source_set("base") {
     "scoped_sc_handle_win.h",
     "service_urls.cc",
     "service_urls.h",
+    "session_options.cc",
+    "session_options.h",
     "socket_reader.cc",
     "socket_reader.h",
     "telemetry_log_writer.cc",
@@ -159,11 +163,13 @@ source_set("unit_tests") {
     "buffered_socket_writer_unittest.cc",
     "capabilities_unittest.cc",
     "compound_buffer_unittest.cc",
+    "weighted_samples_unittest.cc",
     "oauth_helper_unittest.cc",
     "rate_counter_unittest.cc",
     "rsa_key_pair_unittest.cc",
     "run_all_unittests.cc",
     "running_samples_unittest.cc",
+    "session_options_unittest.cc",
     "telemetry_log_writer_unittest.cc",
     "typed_buffer_unittest.cc",
     "util_unittest.cc",
diff --git a/chromium/remoting/client/BUILD.gn b/chromium/remoting/client/BUILD.gn
index 6192de7c63e..9dca80f169b 100644
--- a/chromium/remoting/client/BUILD.gn
+++ b/chromium/remoting/client/BUILD.gn
@@ -17,8 +17,6 @@ static_library("client") {
     "connect_to_host_info.h",
     "cursor_shape_stub_proxy.cc",
     "cursor_shape_stub_proxy.h",
-    "dual_buffer_frame_consumer.cc",
-    "dual_buffer_frame_consumer.h",
     "empty_cursor_filter.cc",
     "empty_cursor_filter.h",
     "host_experiment_sender.cc",
@@ -53,8 +51,12 @@ static_library("client") {
     sources += [
       "chromoting_client_runtime.cc",
       "chromoting_client_runtime.h",
+      "dual_buffer_frame_consumer.cc",
+      "dual_buffer_frame_consumer.h",
       "gesture_interpreter.cc",
       "gesture_interpreter.h",
+      "oauth_token_getter_proxy.cc",
+      "oauth_token_getter_proxy.h",
     ]
     deps += [
       "//remoting/client/display",
@@ -75,6 +77,7 @@ 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/jni/BUILD.gn b/chromium/remoting/client/jni/BUILD.gn
index bc665fbbbac..b6f3eb0dcc3 100644
--- a/chromium/remoting/client/jni/BUILD.gn
+++ b/chromium/remoting/client/jni/BUILD.gn
@@ -33,6 +33,8 @@ shared_library("remoting_client_jni") {
     "jni_client.h",
     "jni_gl_display_handler.cc",
     "jni_gl_display_handler.h",
+    "jni_oauth_token_getter.cc",
+    "jni_oauth_token_getter.h",
     "jni_pairing_secret_fetcher.cc",
     "jni_pairing_secret_fetcher.h",
     "jni_runtime_delegate.cc",
@@ -48,3 +50,9 @@ shared_library("remoting_client_jni") {
   configs += [ "//remoting/build/config:enable_webrtc_remoting_client" ]
   assert_no_deps = [ "//third_party/ffmpeg:*" ]
 }
+
+java_cpp_enum("jni_enums") {
+  sources = [
+    "jni_oauth_token_getter.h",
+  ]
+}
diff --git a/chromium/remoting/codec/BUILD.gn b/chromium/remoting/codec/BUILD.gn
index 9c07fccc3aa..15c181d5fc3 100644
--- a/chromium/remoting/codec/BUILD.gn
+++ b/chromium/remoting/codec/BUILD.gn
@@ -5,8 +5,10 @@
 source_set("encoder") {
   sources = [
     "audio_encoder.h",
-    "audio_encoder_opus.cc",
-    "audio_encoder_opus.h",
+    "encoder_bitrate_filter.cc",
+    "encoder_bitrate_filter.h",
+    "frame_processing_time_estimator.cc",
+    "frame_processing_time_estimator.h",
     "video_encoder.cc",
     "video_encoder.h",
     "video_encoder_helper.cc",
@@ -17,6 +19,8 @@ source_set("encoder") {
     "video_encoder_vpx.h",
     "webrtc_video_encoder_proxy.cc",
     "webrtc_video_encoder_proxy.h",
+    "webrtc_video_encoder_selector.cc",
+    "webrtc_video_encoder_selector.h",
     "webrtc_video_encoder_vpx.cc",
     "webrtc_video_encoder_vpx.h",
   ]
@@ -26,14 +30,13 @@ source_set("encoder") {
   deps = [
     ":vpx_codec",
     "//base/third_party/dynamic_annotations",
-    "//media",
-    "//media:shared_memory_support",
     "//remoting/proto",
     "//third_party/libvpx",
     "//third_party/libyuv",
     "//third_party/opus",
     "//third_party/webrtc/modules/desktop_capture:primitives",
     "//ui/gfx:color_space",
+    "//ui/gfx/geometry",
   ]
 
   # Currently, building WebrtcVideoEncoderGpu is only supported on Windows and
@@ -55,14 +58,17 @@ source_set("encoder") {
   # Opus depends on //media, which is not a supported include for 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 -= [
+  if (!is_ios && !is_android) {
+    sources += [
       "audio_encoder_opus.cc",
       "audio_encoder_opus.h",
+      "cast_software_video_encoder_adapter.cc",
+      "cast_software_video_encoder_adapter.h",
     ]
-    deps -= [
+    deps += [
       "//media",
       "//media:shared_memory_support",
+      "//media/cast:sender",
     ]
   }
 }
@@ -120,10 +126,13 @@ source_set("unit_tests") {
     "audio_encoder_opus_unittest.cc",
     "codec_test.cc",
     "codec_test.h",
+    "encoder_bitrate_filter_unittest.cc",
+    "frame_processing_time_estimator_unittest.cc",
     "video_decoder_vpx_unittest.cc",
     "video_encoder_helper_unittest.cc",
     "video_encoder_verbatim_unittest.cc",
     "video_encoder_vpx_unittest.cc",
+    "webrtc_video_encoder_selector_unittest.cc",
   ]
 
   deps = [
diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn
index 26f1853edf8..0f40b7d47f6 100644
--- a/chromium/remoting/host/BUILD.gn
+++ b/chromium/remoting/host/BUILD.gn
@@ -176,8 +176,6 @@ 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.cc",
@@ -476,7 +474,6 @@ source_set("unit_tests") {
     "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",
@@ -744,7 +741,10 @@ if (enable_me2me_host) {
     }
 
     if (remoting_multi_process != 0) {
-      deps += [ "//mojo/edk/system" ]
+      deps += [
+        "//mojo/edk/embedder:headers",
+        "//mojo/edk/system",
+      ]
     }
   }
 
diff --git a/chromium/remoting/host/installer/linux/BUILD.gn b/chromium/remoting/host/installer/linux/BUILD.gn
index c9853c48361..e27c7ddc937 100644
--- a/chromium/remoting/host/installer/linux/BUILD.gn
+++ b/chromium/remoting/host/installer/linux/BUILD.gn
@@ -7,14 +7,15 @@ import("//remoting/build/config/remoting_build.gni")
 import("//build/config/zip.gni")
 
 build_deb_script = "build_deb.py"
-deb_filename = "$root_build_dir/" + exec_script(build_deb_script,
-                                                [
-                                                  "-p",
-                                                  "-s",
-                                                  rebase_path("//"),
-                                                ],
-                                                "string",
-                                                [ "build-deb.sh" ])
+deb_filename =
+    "$root_build_dir/" + exec_script(build_deb_script,
+                                     [
+                                       "-p",
+                                       "-s",
+                                       rebase_path("//", root_build_dir),
+                                     ],
+                                     "string",
+                                     [ "build-deb.sh" ])
 changes_filename =
     "$root_build_dir/" + get_path_info(deb_filename, "name") + ".changes"
 
@@ -69,9 +70,9 @@ action("remoting_me2me_host_deb_installer") {
   ]
   args = [
     "-s",
-    rebase_path("//"),
+    rebase_path("//", root_build_dir),
     "-o",
-    rebase_path("$root_build_dir"),
+    ".",
   ]
 
   deps = [
diff --git a/chromium/remoting/ios/app/resources/BUILD.gn b/chromium/remoting/ios/app/resources/BUILD.gn
index da227d7dbd2..b1e7137ceb2 100644
--- a/chromium/remoting/ios/app/resources/BUILD.gn
+++ b/chromium/remoting/ios/app/resources/BUILD.gn
@@ -43,13 +43,6 @@ imageset("Background") {
   ]
 }
 
-# TODO(yuweih): This target is used to exclude material design imagesets from
-# the internal app's source set, that are already pulled-in by other deps of the
-# internal app. We will need to redesign these once crbug.com/734054 is
-# resolved.
-group("system_icons") {
-}
-
 group("launchscreen_assets") {
   public_deps = [
     ":launchscreen_app_logo",
diff --git a/chromium/remoting/ios/facade/BUILD.gn b/chromium/remoting/ios/facade/BUILD.gn
index c2f6623e429..c0b83150489 100644
--- a/chromium/remoting/ios/facade/BUILD.gn
+++ b/chromium/remoting/ios/facade/BUILD.gn
@@ -14,6 +14,8 @@ source_set("facade") {
     "host_list_fetcher.h",
     "ios_client_runtime_delegate.h",
     "ios_client_runtime_delegate.mm",
+    "ios_oauth_token_getter.h",
+    "ios_oauth_token_getter.mm",
     "remoting_authentication.h",
     "remoting_oauth_authentication.h",
     "remoting_oauth_authentication.mm",
diff --git a/chromium/remoting/protocol/BUILD.gn b/chromium/remoting/protocol/BUILD.gn
index 7b5dbb0294a..1398402549c 100644
--- a/chromium/remoting/protocol/BUILD.gn
+++ b/chromium/remoting/protocol/BUILD.gn
@@ -17,6 +17,7 @@ static_library("protocol") {
     "auth_util.h",
     "authenticator.cc",
     "authenticator.h",
+    "bandwidth_estimator.h",
     "capability_names.h",
     "channel_authenticator.h",
     "channel_dispatcher_base.cc",
@@ -176,6 +177,8 @@ static_library("protocol") {
     "video_renderer.h",
     "video_stats_stub.h",
     "video_stub.h",
+    "webrtc_bandwidth_estimator.cc",
+    "webrtc_bandwidth_estimator.h",
   ]
 
   configs += [
diff --git a/chromium/remoting/remoting_enable.gni b/chromium/remoting/remoting_enable.gni
index ceb5331027e..8a24badbe0c 100644
--- a/chromium/remoting/remoting_enable.gni
+++ b/chromium/remoting/remoting_enable.gni
@@ -5,6 +5,10 @@
 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
 }