BASELINE: Update Chromium to 70.0.3538.78

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

8 files changed, 47 insertions, 22 deletions

diff --git a/chromium/android_webview/BUILD.gn b/chromium/android_webview/BUILD.gn
index 0f1e6703107..25b7ec95e25 100644
--- a/chromium/android_webview/BUILD.gn
+++ b/chromium/android_webview/BUILD.gn
@@ -5,6 +5,7 @@
 import("//android_webview/system_webview_apk_tmpl.gni")
 import("//android_webview/webview_repack_locales.gni")
 import("//android_webview/variables.gni")
+import("//build/config/android/chrome_version.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
@@ -53,6 +54,7 @@ generate_jni("native_jni") {
     "java/src/org/chromium/android_webview/AwPdfExporter.java",
     "java/src/org/chromium/android_webview/AwPicture.java",
     "java/src/org/chromium/android_webview/AwQuotaManagerBridge.java",
+    "java/src/org/chromium/android_webview/AwRenderProcess.java",
     "java/src/org/chromium/android_webview/AwResource.java",
     "java/src/org/chromium/android_webview/AwSettings.java",
     "java/src/org/chromium/android_webview/AwTokenBindingManager.java",
@@ -267,9 +269,9 @@ grit("generate_webui_resources") {
 
   # webui/resources has way too many resources. The whitelist is trim this down
   # to a reasonable size
-  whitelist = rebase_path("ui/grit_resources_whitelist.txt")
+  whitelist = rebase_path("ui/grit_resources_whitelist.txt", root_build_dir)
   inputs = [
-    whitelist,
+    "//android_webview/ui/grit_resources_whitelist.txt",
   ]
   grit_flags = [
     "-w",
@@ -290,9 +292,9 @@ grit("generate_components_resources") {
   source_is_generated = true
 
   # See :generate_webui_resources for an explanation of the whitelist
-  whitelist = rebase_path("ui/grit_resources_whitelist.txt")
+  whitelist = rebase_path("ui/grit_resources_whitelist.txt", root_build_dir)
   inputs = [
-    whitelist,
+    "//android_webview/ui/grit_resources_whitelist.txt",
   ]
   grit_flags = [
     "-w",
@@ -315,9 +317,9 @@ grit("generate_components_strings") {
   # will never display most of them, so we try to limit the included
   # strings. This whitelist trims about 50% more than the compile-based
   # whitelist generated by :system_webview_pak_whitelist.
-  whitelist = rebase_path("ui/grit_strings_whitelist.txt")
+  whitelist = rebase_path("ui/grit_strings_whitelist.txt", root_build_dir)
   inputs = [
-    whitelist,
+    "//android_webview/ui/grit_strings_whitelist.txt",
   ]
   grit_flags = [
     "-w",
@@ -441,7 +443,7 @@ if (enable_resource_whitelist_generation) {
     deps = [
       ":libwebviewchromium",
     ]
-    input = "$root_out_dir/libwebviewchromium$shlib_extension.whitelist"
+    input = "$root_out_dir/lib.unstripped/libwebviewchromium$shlib_extension"
     output = system_webview_pak_whitelist
   }
 }
@@ -516,6 +518,8 @@ source_set("common") {
     "browser/aw_quota_manager_bridge.h",
     "browser/aw_quota_permission_context.cc",
     "browser/aw_quota_permission_context.h",
+    "browser/aw_render_process.cc",
+    "browser/aw_render_process.h",
     "browser/aw_render_process_gone_delegate.h",
     "browser/aw_render_thread_context_provider.cc",
     "browser/aw_render_thread_context_provider.h",
@@ -644,6 +648,8 @@ source_set("common") {
     "browser/tracing/aw_tracing_delegate.h",
     "common/android_webview_message_generator.cc",
     "common/android_webview_message_generator.h",
+    "common/aw_channel.cc",
+    "common/aw_channel.h",
     "common/aw_content_client.cc",
     "common/aw_content_client.h",
     "common/aw_descriptors.h",
@@ -721,6 +727,7 @@ source_set("common") {
     "//components/metrics:gpu",
     "//components/metrics:net",
     "//components/metrics:ui",
+    "//components/minidump_uploader",
     "//components/navigation_interception",
     "//components/network_session_configurator/common",
     "//components/policy:generated",
@@ -768,6 +775,7 @@ source_set("common") {
     "//net",
     "//net:extras",
     "//printing",
+    "//services/preferences/tracked:tracked",
     "//services/service_manager/public/cpp",
     "//services/viz/public/interfaces",
     "//skia",
@@ -780,6 +788,7 @@ source_set("common") {
     "//ui/gl",
     "//ui/gl/init",
     "//ui/shell_dialogs",
+    "//url",
     "//v8",
   ]
 
@@ -837,12 +846,14 @@ android_library("android_webview_java") {
     "java/src/org/chromium/android_webview/AwQuotaManagerBridge.java",
     "java/src/org/chromium/android_webview/AwRenderProcessGoneDetail.java",
     "java/src/org/chromium/android_webview/AwResource.java",
+    "java/src/org/chromium/android_webview/AwRenderProcess.java",
     "java/src/org/chromium/android_webview/AwSafeBrowsingConversionHelper.java",
     "java/src/org/chromium/android_webview/AwScrollOffsetManager.java",
     "java/src/org/chromium/android_webview/AwServiceWorkerClient.java",
     "java/src/org/chromium/android_webview/AwServiceWorkerController.java",
     "java/src/org/chromium/android_webview/AwServiceWorkerSettings.java",
     "java/src/org/chromium/android_webview/AwSettings.java",
+    "java/src/org/chromium/android_webview/AwSupportLibIsomorphic.java",
     "java/src/org/chromium/android_webview/AwSwitches.java",
     "java/src/org/chromium/android_webview/AwTokenBindingManager.java",
     "java/src/org/chromium/android_webview/AwTracingController.java",
@@ -891,7 +902,7 @@ android_library("android_webview_java") {
     "//base:base_java",
     "//components/autofill/android:autofill_java",
     "//components/autofill/android:provider_java",
-    "//components/background_task_scheduler:background_task_scheduler_java",
+    "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
     "//components/crash/android:java",
     "//components/embedder_support/android:web_contents_delegate_java",
     "//components/minidump_uploader:minidump_uploader_java",
@@ -1040,7 +1051,7 @@ android_library("android_webview_services_java") {
     ":android_webview_variations_utils_java",
     ":system_webview_manifest",
     "//base:base_java",
-    "//components/background_task_scheduler:background_task_scheduler_java",
+    "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
     "//components/minidump_uploader:minidump_uploader_java",
     "//components/version_info/android:version_constants_java",
   ]
@@ -1067,6 +1078,7 @@ android_aidl("aw_variations_seed_server_aidl") {
 
 if (public_android_sdk) {
   system_webview_apk_tmpl("system_webview_apk") {
+    version_name = chrome_version_name
     android_manifest = system_webview_android_manifest
     android_manifest_dep = ":system_webview_manifest"
     deps = [
diff --git a/chromium/android_webview/glue/BUILD.gn b/chromium/android_webview/glue/BUILD.gn
index a514a6fa379..6dcd32ab822 100644
--- a/chromium/android_webview/glue/BUILD.gn
+++ b/chromium/android_webview/glue/BUILD.gn
@@ -24,23 +24,25 @@ android_library("glue") {
       "//third_party/android_system_sdk:public_framework_system_java"
 
   java_files = [
-    "java/src/com/android/webview/chromium/ApiHelperForM.java",
-    "java/src/com/android/webview/chromium/ApiHelperForN.java",
-    "java/src/com/android/webview/chromium/ApiHelperForO.java",
-    "java/src/com/android/webview/chromium/ApiHelperForOMR1.java",
-    "java/src/com/android/webview/chromium/SharedStatics.java",
     "java/src/com/android/webview/chromium/CallbackConverter.java",
     "java/src/com/android/webview/chromium/ContentSettingsAdapter.java",
     "java/src/com/android/webview/chromium/CookieManagerAdapter.java",
     "java/src/com/android/webview/chromium/DrawGLFunctor.java",
     "java/src/com/android/webview/chromium/FontPreloadingWorkaround.java",
     "java/src/com/android/webview/chromium/GeolocationPermissionsAdapter.java",
+    "java/src/com/android/webview/chromium/GlueApiHelperForM.java",
+    "java/src/com/android/webview/chromium/GlueApiHelperForN.java",
+    "java/src/com/android/webview/chromium/GlueApiHelperForO.java",
+    "java/src/com/android/webview/chromium/GlueApiHelperForOMR1.java",
+    "java/src/com/android/webview/chromium/GlueApiHelperForP.java",
     "java/src/com/android/webview/chromium/GraphicsUtils.java",
     "java/src/com/android/webview/chromium/MonochromeLibraryPreloader.java",
     "java/src/com/android/webview/chromium/SafeBrowsingResponseAdapter.java",
     "java/src/com/android/webview/chromium/ServiceWorkerClientAdapter.java",
     "java/src/com/android/webview/chromium/ServiceWorkerControllerAdapter.java",
     "java/src/com/android/webview/chromium/ServiceWorkerSettingsAdapter.java",
+    "java/src/com/android/webview/chromium/SharedStatics.java",
+    "java/src/com/android/webview/chromium/SplitApkWorkaround.java",
     "java/src/com/android/webview/chromium/TokenBindingManagerAdapter.java",
     "java/src/com/android/webview/chromium/TracingControllerAdapter.java",
     "java/src/com/android/webview/chromium/WebBackForwardListChromium.java",
diff --git a/chromium/android_webview/glue/generate_resource_rewriter.gni b/chromium/android_webview/glue/generate_resource_rewriter.gni
index 59581df2e52..f86747744a2 100644
--- a/chromium/android_webview/glue/generate_resource_rewriter.gni
+++ b/chromium/android_webview/glue/generate_resource_rewriter.gni
@@ -39,14 +39,14 @@ template("generate_resource_rewriter") {
     deps = invoker.deps + [ ":${_build_config_target_name}" ]
     script = "//build/android/gyp/generate_resource_rewriter.py"
 
-    _rebased_build_config = rebase_path(_build_config)
+    _rebased_build_config = rebase_path(_build_config, root_build_dir)
     args = [
       "--package-name",
       invoker.package_name,
       "--dep-packages",
       "@FileArg($_rebased_build_config:resources:extra_package_names)",
       "--srcjar",
-      rebase_path(_srcjar),
+      rebase_path(_srcjar, root_build_dir),
     ]
     outputs = [
       _srcjar,
diff --git a/chromium/android_webview/support_library/BUILD.gn b/chromium/android_webview/support_library/BUILD.gn
index 6b29dd0e7fd..90b094e2a32 100644
--- a/chromium/android_webview/support_library/BUILD.gn
+++ b/chromium/android_webview/support_library/BUILD.gn
@@ -7,6 +7,7 @@ import("//build/config/android/rules.gni")
 
 android_library("support_lib_glue_java") {
   java_files = [
+    "java/src/org/chromium/support_lib_glue/IsomorphicAdapter.java",
     "java/src/org/chromium/support_lib_glue/SupportLibReflectionUtil.java",
     "java/src/org/chromium/support_lib_glue/SupportLibServiceWorkerClientAdapter.java",
     "java/src/org/chromium/support_lib_glue/SupportLibServiceWorkerControllerAdapter.java",
@@ -17,6 +18,7 @@ android_library("support_lib_glue_java") {
     "java/src/org/chromium/support_lib_glue/SupportLibWebSettingsAdapter.java",
     "java/src/org/chromium/support_lib_glue/SupportLibWebViewChromium.java",
     "java/src/org/chromium/support_lib_glue/SupportLibWebViewChromiumFactory.java",
+    "java/src/org/chromium/support_lib_glue/SupportLibWebViewRendererAdapter.java",
     "java/src/org/chromium/support_lib_glue/SupportLibWebkitToCompatConverterAdapter.java",
   ]
 
diff --git a/chromium/android_webview/support_library/boundary_interfaces/BUILD.gn b/chromium/android_webview/support_library/boundary_interfaces/BUILD.gn
index c191021fd1e..7c498312a29 100644
--- a/chromium/android_webview/support_library/boundary_interfaces/BUILD.gn
+++ b/chromium/android_webview/support_library/boundary_interfaces/BUILD.gn
@@ -8,6 +8,7 @@ import("//build/config/android/rules.gni")
 android_library("boundary_interface_java") {
   java_files = [
     "src/org/chromium/support_lib_boundary/FeatureFlagHolderBoundaryInterface.java",
+    "src/org/chromium/support_lib_boundary/IsomorphicObjectBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/SafeBrowsingResponseBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/ServiceWorkerClientBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/ServiceWorkerControllerBoundaryInterface.java",
@@ -23,6 +24,7 @@ android_library("boundary_interface_java") {
     "src/org/chromium/support_lib_boundary/WebViewClientBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/WebViewProviderFactoryBoundaryInterface.java",
+    "src/org/chromium/support_lib_boundary/WebViewRendererBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/WebkitToCompatConverterBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/util/BoundaryInterfaceReflectionUtil.java",
     "src/org/chromium/support_lib_boundary/util/Features.java",
diff --git a/chromium/android_webview/system_webview_apk_tmpl.gni b/chromium/android_webview/system_webview_apk_tmpl.gni
index 2c0f99715c8..09fd7aaf97c 100644
--- a/chromium/android_webview/system_webview_apk_tmpl.gni
+++ b/chromium/android_webview/system_webview_apk_tmpl.gni
@@ -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("//base/android/proguard/proguard.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
@@ -53,8 +54,14 @@ template("system_webview_apk_tmpl") {
         "//android_webview/apk/java/proguard.flags",
         "//base/android/proguard/chromium_apk.flags",
         "//base/android/proguard/chromium_code.flags",
-        "//base/android/proguard/disable_all_obfuscation.flags",
       ]
+      if (enable_proguard_obfuscation) {
+        proguard_configs +=
+            [ "//base/android/proguard/enable_obfuscation.flags" ]
+      } else {
+        proguard_configs +=
+            [ "//base/android/proguard/disable_all_obfuscation.flags" ]
+      }
       png_to_webp = true
     }
     command_line_flags_file = "webview-command-line"
diff --git a/chromium/android_webview/test/BUILD.gn b/chromium/android_webview/test/BUILD.gn
index 31fead04b01..e436bc4240a 100644
--- a/chromium/android_webview/test/BUILD.gn
+++ b/chromium/android_webview/test/BUILD.gn
@@ -47,7 +47,7 @@ android_apk("webview_instrumentation_apk") {
     "shell/src/org/chromium/android_webview/test/AwJUnit4ClassRunner.java",
     "shell/src/org/chromium/android_webview/test/NullContentsClient.java",
     "shell/src/org/chromium/android_webview/test/SecondBrowserProcess.java",
-    "shell/src/org/chromium/android_webview/test/SkipSingleProcessTests.java",
+    "shell/src/org/chromium/android_webview/test/OnlyRunIn.java",
     "shell/src/org/chromium/android_webview/test/TestContentProvider.java",
   ]
 
@@ -115,6 +115,7 @@ shared_library("libstandalonelibwebviewchromium") {
   deps = [
     "//android_webview:common",
     "//components/heap_profiling:test_support",
+    "//components/minidump_uploader",
   ]
   configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
   configs += [ "//build/config/android:hide_all_but_jni" ]
diff --git a/chromium/android_webview/tools/system_webview_shell/BUILD.gn b/chromium/android_webview/tools/system_webview_shell/BUILD.gn
index af852420b61..c4013a46088 100644
--- a/chromium/android_webview/tools/system_webview_shell/BUILD.gn
+++ b/chromium/android_webview/tools/system_webview_shell/BUILD.gn
@@ -28,6 +28,7 @@ android_apk("system_webview_shell_apk") {
     "apk/src/org/chromium/webview_shell/WebViewBrowserActivity.java",
     "apk/src/org/chromium/webview_shell/WebViewLayoutTestActivity.java",
     "apk/src/org/chromium/webview_shell/WebViewThreadTestActivity.java",
+    "apk/src/org/chromium/webview_shell/WebViewTracingActivity.java",
   ]
   android_manifest = "apk/AndroidManifest.xml"
   deps = [
@@ -45,18 +46,16 @@ instrumentation_test_apk("system_webview_shell_page_cycler_apk") {
   apk_name = "SystemWebViewShellPageCycler"
   apk_under_test = ":system_webview_shell_apk"
   android_manifest = "page_cycler/AndroidManifest.xml"
-  java_files = [
-    "page_cycler/src/org/chromium/webview_shell/page_cycler/PageCyclerTest.java",
-  ]
+  java_files = [ "page_cycler/src/org/chromium/webview_shell/page_cycler/PageCyclerTest.java" ]
   deps = [
     "//base:base_java",
     "//base:base_java_test_support",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//testing/android/reporter:reporter_java",
-    "//third_party/junit",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
+    "//third_party/junit",
   ]
   enable_multidex = true
 }