BASELINE: Update Chromium to 73.0.3683.37

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

9 files changed, 102 insertions, 54 deletions

diff --git a/chromium/android_webview/BUILD.gn b/chromium/android_webview/BUILD.gn
index 535f0b9bbe9..bbfe5cc5368 100644
--- a/chromium/android_webview/BUILD.gn
+++ b/chromium/android_webview/BUILD.gn
@@ -5,10 +5,11 @@
 import("//android_webview/system_webview_apk_tmpl.gni")
 import("//android_webview/variables.gni")
 import("//android_webview/webview_repack_locales.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")
+import("//chrome/android/chrome_common_shared_library.gni")
+import("//chrome/android/chrome_public_apk_tmpl.gni")
 import("//chrome/android/trichrome.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
 import("//tools/grit/repack.gni")
@@ -47,6 +48,7 @@ generate_jni("native_jni") {
     "java/src/org/chromium/android_webview/AwCookieManager.java",
     "java/src/org/chromium/android_webview/AwDebug.java",
     "java/src/org/chromium/android_webview/AwDevToolsServer.java",
+    "java/src/org/chromium/android_webview/AwDrawFnImpl.java",
     "java/src/org/chromium/android_webview/AwFeatureList.java",
     "java/src/org/chromium/android_webview/AwFormDatabase.java",
     "java/src/org/chromium/android_webview/AwGLFunctor.java",
@@ -55,11 +57,11 @@ generate_jni("native_jni") {
     "java/src/org/chromium/android_webview/AwMetricsServiceClient.java",
     "java/src/org/chromium/android_webview/AwPdfExporter.java",
     "java/src/org/chromium/android_webview/AwPicture.java",
+    "java/src/org/chromium/android_webview/AwProxyController.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",
     "java/src/org/chromium/android_webview/AwTracingController.java",
     "java/src/org/chromium/android_webview/AwVariationsSeedBridge.java",
     "java/src/org/chromium/android_webview/AwWebContentsDelegate.java",
@@ -425,27 +427,26 @@ if (android_64bit_target_cpu) {
       "//v8($android_secondary_abi_toolchain)",
     ]
   }
+}
 
-  shared_library("monochrome") {
-    deps = [
-      ":webview_entry_point",
-    ]
-    configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
-    configs += [ "//build/config/android:hide_all_but_jni" ]
-    if (use_lld) {
-      configs += [ "//build/config/android:lld_pack_relocations" ]
+if (current_abi_is_webview_only) {
+  template("webview_library") {
+    chrome_common_shared_library(target_name) {
+      forward_variables_from(invoker, "*")
+      deps = [
+        ":webview_entry_point",
+      ]
+      is_webview = true
     }
+  }
 
-    if (target_cpu != "mipsel" && target_cpu != "mips64el") {
-      # .gnu.hash support added in Android M. Without this flag, library will also
-      # contain an unused .hash section. (http://crbug.com/742525#c28)
-      # Not to be used for MIPS arhitecture since MIPS does not
-      # support hashstyle gnu: http://crbug.com/811306
-      ldflags = [ "-Wl,--hash-style=gnu" ]
-    }
+  # The webview-only library needs the same library name as the browser
+  # library, since the system webview factory will differentiate only by ABI.
+  webview_library("monochrome") {
+  }
 
-    public_configs = extra_chrome_shared_library_configs
-    deps += extra_chrome_shared_library_deps
+  # Bundle-specific webview library. Currently identical, but may diverge.
+  webview_library("monochrome_base") {
   }
 }
 
@@ -476,6 +477,12 @@ source_set("common") {
     "browser/aw_browser_terminator.h",
     "browser/aw_content_browser_client.cc",
     "browser/aw_content_browser_client.h",
+    "browser/aw_content_browser_overlay_manifest.cc",
+    "browser/aw_content_browser_overlay_manifest.h",
+    "browser/aw_content_renderer_overlay_manifest.cc",
+    "browser/aw_content_renderer_overlay_manifest.h",
+    "browser/aw_content_utility_overlay_manifest.cc",
+    "browser/aw_content_utility_overlay_manifest.h",
     "browser/aw_contents.cc",
     "browser/aw_contents.h",
     "browser/aw_contents_client_bridge.cc",
@@ -494,6 +501,8 @@ source_set("common") {
     "browser/aw_devtools_server.h",
     "browser/aw_download_manager_delegate.cc",
     "browser/aw_download_manager_delegate.h",
+    "browser/aw_draw_fn_impl.cc",
+    "browser/aw_draw_fn_impl.h",
     "browser/aw_feature_list.cc",
     "browser/aw_feature_list.h",
     "browser/aw_feature_list_creator.cc",
@@ -525,8 +534,7 @@ source_set("common") {
     "browser/aw_picture.h",
     "browser/aw_print_manager.cc",
     "browser/aw_print_manager.h",
-    "browser/aw_printing_message_filter.cc",
-    "browser/aw_printing_message_filter.h",
+    "browser/aw_proxy_controller.cc",
     "browser/aw_proxying_url_loader_factory.cc",
     "browser/aw_proxying_url_loader_factory.h",
     "browser/aw_quota_manager_bridge.cc",
@@ -557,6 +565,8 @@ source_set("common") {
     "browser/aw_ssl_host_state_delegate.h",
     "browser/aw_url_checker_delegate_impl.cc",
     "browser/aw_url_checker_delegate_impl.h",
+    "browser/aw_url_loader_throttle.cc",
+    "browser/aw_url_loader_throttle.h",
     "browser/aw_variations_seed_bridge.cc",
     "browser/aw_variations_seed_bridge.h",
     "browser/aw_variations_service_client.cc",
@@ -583,8 +593,6 @@ source_set("common") {
     "browser/deferred_gpu_command_service.h",
     "browser/find_helper.cc",
     "browser/find_helper.h",
-    "browser/gl_view_renderer_manager.cc",
-    "browser/gl_view_renderer_manager.h",
     "browser/hardware_renderer.cc",
     "browser/hardware_renderer.h",
     "browser/icon_helper.cc",
@@ -621,10 +629,10 @@ source_set("common") {
     "browser/net/init_native_callback.h",
     "browser/net/input_stream_reader.cc",
     "browser/net/input_stream_reader.h",
-    "browser/net/token_binding_manager.cc",
-    "browser/net/token_binding_manager.h",
     "browser/net_helpers.cc",
     "browser/net_helpers.h",
+    "browser/net_network_service/android_stream_reader_url_loader.cc",
+    "browser/net_network_service/android_stream_reader_url_loader.h",
     "browser/parent_compositor_draw_constraints.cc",
     "browser/parent_compositor_draw_constraints.h",
     "browser/parent_output_surface.cc",
@@ -645,7 +653,6 @@ source_set("common") {
     "browser/popup_touch_handle_drawable.h",
     "browser/render_thread_manager.cc",
     "browser/render_thread_manager.h",
-    "browser/render_thread_manager_client.h",
     "browser/renderer_host/auto_login_parser.cc",
     "browser/renderer_host/auto_login_parser.h",
     "browser/renderer_host/aw_render_view_host_ext.cc",
@@ -658,7 +665,6 @@ source_set("common") {
     "browser/state_serializer.h",
     "browser/surfaces_instance.cc",
     "browser/surfaces_instance.h",
-    "browser/token_binding_manager_bridge.cc",
     "browser/tracing/aw_trace_event_args_whitelist.cc",
     "browser/tracing/aw_trace_event_args_whitelist.h",
     "browser/tracing/aw_tracing_controller.cc",
@@ -697,6 +703,7 @@ source_set("common") {
     "lib/aw_main_delegate.h",
     "lib/webview_jni_onload.cc",
     "lib/webview_jni_onload.h",
+    "public/browser/draw_fn.h",
     "public/browser/draw_gl.h",
     "public/browser/draw_sw.h",
     "renderer/aw_content_renderer_client.cc",
@@ -732,11 +739,14 @@ source_set("common") {
     "//base/third_party/dynamic_annotations:dynamic_annotations",
     "//components/autofill/android:provider",
     "//components/autofill/content/browser",
+    "//components/autofill/content/common:mojo_interfaces",
     "//components/autofill/content/renderer",
     "//components/cdm/browser",
     "//components/cdm/renderer",
+    "//components/crash/android:crashpad_main",
     "//components/crash/content/app",
     "//components/crash/content/browser",
+    "//components/crash/core/common",
     "//components/download/public/common:public",
     "//components/embedder_support/android:web_contents_delegate",
     "//components/google/core/browser",
@@ -769,6 +779,7 @@ source_set("common") {
     "//components/services/heap_profiling/public/cpp",
     "//components/services/heap_profiling/public/mojom",
     "//components/spellcheck:buildflags",
+    "//components/spellcheck/common:interfaces",
     "//components/supervised_user_error_page",
     "//components/supervised_user_error_page:gin",
     "//components/url_matcher",
@@ -779,9 +790,11 @@ source_set("common") {
     "//components/visitedlink/renderer",
     "//components/viz/service",
     "//components/web_restrictions:browser",
+    "//components/web_restrictions:interfaces",
     "//content",
     "//content/public/app:both",
     "//content/public/browser",
+    "//content/public/common",
     "//content/public/common:content_descriptor_keys",
     "//content/public/common:service_names",
     "//crypto",
@@ -789,7 +802,10 @@ source_set("common") {
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/command_buffer/service",
     "//gpu/ipc:gl_in_process_context",
+    "//gpu/ipc/common:common",
     "//gpu/skia_bindings",
+    "//gpu/vulkan:vulkan",
+    "//gpu/vulkan/init",
     "//media",
     "//media/midi",
     "//net",
@@ -802,6 +818,8 @@ source_set("common") {
     "//storage/browser",
     "//storage/common",
     "//third_party/blink/public:blink",
+    "//third_party/blink/public/common",
+    "//third_party/crashpad/crashpad/client",
     "//ui/base",
     "//ui/events:gesture_detection",
     "//ui/gfx",
@@ -850,6 +868,7 @@ android_library("android_webview_java") {
     "java/src/org/chromium/android_webview/AwCookieManager.java",
     "java/src/org/chromium/android_webview/AwDebug.java",
     "java/src/org/chromium/android_webview/AwDevToolsServer.java",
+    "java/src/org/chromium/android_webview/AwDrawFnImpl.java",
     "java/src/org/chromium/android_webview/AwFeatureList.java",
     "java/src/org/chromium/android_webview/AwFormDatabase.java",
     "java/src/org/chromium/android_webview/AwFunctor.java",
@@ -863,6 +882,7 @@ android_library("android_webview_java") {
     "java/src/org/chromium/android_webview/AwPdfExporter.java",
     "java/src/org/chromium/android_webview/AwPicture.java",
     "java/src/org/chromium/android_webview/AwPrintDocumentAdapter.java",
+    "java/src/org/chromium/android_webview/AwProxyController.java",
     "java/src/org/chromium/android_webview/AwSafeBrowsingConfigHelper.java",
     "java/src/org/chromium/android_webview/AwSafeBrowsingResponse.java",
     "java/src/org/chromium/android_webview/AwQuotaManagerBridge.java",
@@ -877,7 +897,6 @@ android_library("android_webview_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",
     "java/src/org/chromium/android_webview/AwViewMethods.java",
     "java/src/org/chromium/android_webview/AwViewAndroidDelegate.java",
@@ -925,6 +944,7 @@ android_library("android_webview_java") {
     "//components/autofill/android:autofill_java",
     "//components/autofill/android:provider_java",
     "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
+    "//components/crash/android:handler_java",
     "//components/crash/android:java",
     "//components/embedder_support/android:web_contents_delegate_java",
     "//components/minidump_uploader:minidump_uploader_java",
@@ -965,7 +985,7 @@ android_library("android_webview_variations_utils_java") {
     "//android_webview/proto:aw_variations_seed_proto_java",
     "//base:base_java",
     "//components/variations/android:variations_java",
-    "//third_party/protobuf:protobuf_lite_javalib",
+    "//third_party/android_deps:com_google_protobuf_protobuf_lite_java",
   ]
 }
 
@@ -1104,7 +1124,6 @@ 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 = upstream_only_webview_deps
@@ -1112,7 +1131,6 @@ if (public_android_sdk) {
   }
 
   system_webview_apk_tmpl("trichrome_webview_apk") {
-    version_name = chrome_version_name
     android_manifest = trichrome_webview_android_manifest
     android_manifest_dep = ":trichrome_webview_manifest"
     deps = upstream_only_webview_deps
diff --git a/chromium/android_webview/glue/BUILD.gn b/chromium/android_webview/glue/BUILD.gn
index e97103ba352..884c91c6cd8 100644
--- a/chromium/android_webview/glue/BUILD.gn
+++ b/chromium/android_webview/glue/BUILD.gn
@@ -27,8 +27,8 @@ android_library("glue") {
     "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/DrawFunctor.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",
@@ -44,7 +44,6 @@ android_library("glue") {
     "java/src/com/android/webview/chromium/SharedStatics.java",
     "java/src/com/android/webview/chromium/SharedTracingControllerAdapter.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",
     "java/src/com/android/webview/chromium/WebHistoryItemChromium.java",
@@ -62,6 +61,8 @@ android_library("glue") {
     "java/src/com/android/webview/chromium/WebViewChromiumFactoryProviderForOMR1.java",
     "java/src/com/android/webview/chromium/WebViewChromiumFactoryProviderForP.java",
     "java/src/com/android/webview/chromium/SharedWebViewChromium.java",
+    "java/src/com/android/webview/chromium/SharedWebViewContentsClientAdapter.java",
+    "java/src/com/android/webview/chromium/SharedWebViewRendererClientAdapter.java",
     "java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java",
     "java/src/com/android/webview/chromium/WebViewDatabaseAdapter.java",
     "java/src/com/android/webview/chromium/WebViewDelegateFactory.java",
diff --git a/chromium/android_webview/glue/generate_resource_rewriter.gni b/chromium/android_webview/glue/generate_resource_rewriter.gni
index f86747744a2..4d9a23337e6 100644
--- a/chromium/android_webview/glue/generate_resource_rewriter.gni
+++ b/chromium/android_webview/glue/generate_resource_rewriter.gni
@@ -23,7 +23,7 @@ template("generate_resource_rewriter") {
 
   _final_target_name = target_name
   _build_config = "$target_gen_dir/${target_name}.build_config"
-  _build_config_target_name = "${target_name}__build_config"
+  _build_config_target_name = "$target_name$build_config_target_suffix"
   _srcjar = "$target_gen_dir/${target_name}.srcjar"
   write_build_config(_build_config_target_name) {
     possible_config_deps = invoker.deps
diff --git a/chromium/android_webview/glue/glue.gni b/chromium/android_webview/glue/glue.gni
index 0581c9bb5f5..72a44aeed05 100644
--- a/chromium/android_webview/glue/glue.gni
+++ b/chromium/android_webview/glue/glue.gni
@@ -14,6 +14,7 @@ glue_library_deps = [
   "//base:base_java",
   "//components/autofill/android:autofill_java",
   "//components/autofill/android:provider_java",
+  "//components/embedder_support/android:application_java",
   "//content/public/android:content_java",
   "//net/android:net_java",
   "//ui/android:ui_java",
diff --git a/chromium/android_webview/support_library/BUILD.gn b/chromium/android_webview/support_library/BUILD.gn
index 0dcebcb73f7..48f79337a4e 100644
--- a/chromium/android_webview/support_library/BUILD.gn
+++ b/chromium/android_webview/support_library/BUILD.gn
@@ -8,6 +8,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/SupportLibProxyControllerAdapter.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",
@@ -20,6 +21,7 @@ android_library("support_lib_glue_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/SupportLibWebViewRendererClientAdapter.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 c43edc3df9a..211185413d6 100644
--- a/chromium/android_webview/support_library/boundary_interfaces/BUILD.gn
+++ b/chromium/android_webview/support_library/boundary_interfaces/BUILD.gn
@@ -9,6 +9,7 @@ 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/ProxyControllerBoundaryInterface.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",
@@ -16,6 +17,7 @@ android_library("boundary_interface_java") {
     "src/org/chromium/support_lib_boundary/StaticsBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/TracingControllerBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/VisualStateCallbackBoundaryInterface.java",
+    "src/org/chromium/support_lib_boundary/WebkitToCompatConverterBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/WebMessageBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/WebMessageCallbackBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/WebMessagePortBoundaryInterface.java",
@@ -26,7 +28,7 @@ android_library("boundary_interface_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/WebViewRendererClientBoundaryInterface.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 819907a3a9f..83552c7e7a2 100644
--- a/chromium/android_webview/system_webview_apk_tmpl.gni
+++ b/chromium/android_webview/system_webview_apk_tmpl.gni
@@ -3,9 +3,11 @@
 # found in the LICENSE file.
 
 import("//base/android/proguard/proguard.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")
+import("//chrome/android/chrome_public_apk_tmpl.gni")
 
 template("system_webview_apk_tmpl") {
   android_apk(target_name) {
@@ -26,26 +28,39 @@ template("system_webview_apk_tmpl") {
 
     shared_resources = true
 
-    if (!defined(use_trichrome_library) || !use_trichrome_library) {
+    _use_trichrome_library =
+        defined(use_trichrome_library) && use_trichrome_library
+
+    if (!_use_trichrome_library) {
       shared_libraries = [ "//android_webview:libwebviewchromium" ]
       if (build_apk_secondary_abi && android_64bit_target_cpu) {
         secondary_abi_shared_libraries = [ "//android_webview:libwebviewchromium($android_secondary_abi_toolchain)" ]
       }
     } else {
+      uncompress_shared_libraries = true
+
       # Include placeholder libraries to ensure we are treated as the desired
       # architecture.
       if (android_64bit_target_cpu) {
-        shared_libraries = [ "//android_webview:monochrome" ]
-        if (build_apk_secondary_abi) {
-          secondary_native_lib_placeholders = [ "libdummy.so" ]
+        if (android_64bit_browser) {
+          native_lib_placeholders = [ "libdummy.so" ]
+          if (build_apk_secondary_abi) {
+            secondary_abi_shared_libraries = [
+              "//android_webview:monochrome($android_secondary_abi_toolchain)",
+            ]
+          }
+        } else {
+          shared_libraries = [ "//android_webview:monochrome" ]
+          if (build_apk_secondary_abi) {
+            secondary_native_lib_placeholders = [ "libdummy.so" ]
+          }
         }
       } else {
         native_lib_placeholders = [ "libdummy.so" ]
       }
     }
 
-    if (!defined(use_trichrome_library) || !use_trichrome_library ||
-        android_64bit_target_cpu) {
+    if (!_use_trichrome_library || android_64bit_target_cpu) {
       # 32-bit TrichromeWebView doesn't have a native library, so only do this
       # for other configs.
       native_lib_version_rule = "//build/util:chrome_version_json"
@@ -89,5 +104,16 @@ template("system_webview_apk_tmpl") {
       png_to_webp = true
     }
     command_line_flags_file = "webview-command-line"
+
+    if (!defined(version_code)) {
+      if (_use_trichrome_library) {
+        version_code = trichrome_version_code
+      } else {
+        version_code = webview_version_code
+      }
+    }
+    if (!defined(version_name)) {
+      version_name = chrome_version_name
+    }
   }
 }
diff --git a/chromium/android_webview/test/BUILD.gn b/chromium/android_webview/test/BUILD.gn
index 49e22ae1778..f9519e6196b 100644
--- a/chromium/android_webview/test/BUILD.gn
+++ b/chromium/android_webview/test/BUILD.gn
@@ -28,6 +28,7 @@ if (public_android_sdk) {
     data_deps = [
       "//build/android:logdog_wrapper_py",
       "//build/android:test_runner_py",
+      "//testing/buildbot/filters:webview_cts_tests_filters",
     ]
 
     # Filter out comments.
@@ -63,7 +64,7 @@ android_apk("webview_instrumentation_apk") {
     "shell/src/org/chromium/android_webview/shell/AwShellApplication.java",
     "shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java",
     "shell/src/org/chromium/android_webview/shell/AwShellSwitches.java",
-    "shell/src/org/chromium/android_webview/shell/DrawGL.java",
+    "shell/src/org/chromium/android_webview/shell/DrawFn.java",
     "shell/src/org/chromium/android_webview/test/AwTestContainerView.java",
     "shell/src/org/chromium/android_webview/test/AwTestRunnerActivity.java",
     "shell/src/org/chromium/android_webview/test/AwJUnit4ClassRunner.java",
@@ -73,10 +74,7 @@ android_apk("webview_instrumentation_apk") {
     "shell/src/org/chromium/android_webview/test/TestContentProvider.java",
   ]
 
-  shared_libraries = [
-    ":libdrawgl",
-    ":libstandalonelibwebviewchromium",
-  ]
+  shared_libraries = [ ":libstandalonelibwebviewchromium" ]
 
   native_lib_version_rule = "//build/util:chrome_version_json"
   _native_lib_file =
@@ -132,10 +130,12 @@ shared_library("libstandalonelibwebviewchromium") {
   testonly = true
   sources = [
     "../lib/webview_entry_point.cc",
+    "shell/src/draw_gl/draw_fn.cc",
   ]
   ldflags = [ "-Wl,-shared,-Bsymbolic" ]
   deps = [
     "//android_webview:common",
+    "//base",
     "//components/heap_profiling:test_support",
     "//components/minidump_uploader",
     "//content/public/test/android:content_native_test_support",
@@ -211,7 +211,9 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
     "../javatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwLayoutSizerTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwNetworkConfigurationTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwPermissionManagerTest.java",
+    "../javatests/src/org/chromium/android_webview/test/AwProxyControllerTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwSecondBrowserProcessTest.java",
@@ -254,6 +256,7 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
     "../javatests/src/org/chromium/android_webview/test/SaveRestoreStateTest.java",
     "../javatests/src/org/chromium/android_webview/test/SafeBrowsingTest.java",
     "../javatests/src/org/chromium/android_webview/test/AwUncaughtExceptionTest.java",
+    "../javatests/src/org/chromium/android_webview/test/SslPreferencesTest.java",
     "../javatests/src/org/chromium/android_webview/test/StandaloneAwQuotaManagerBridgeTest.java",
     "../javatests/src/org/chromium/android_webview/test/TestAwContents.java",
     "../javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java",
@@ -342,6 +345,7 @@ test("android_webview_unittests") {
     "../browser/net/aw_cookie_store_wrapper_unittest.cc",
     "../browser/net/aw_url_request_context_getter_unittest.cc",
     "../browser/net/input_stream_reader_unittest.cc",
+    "../browser/net_network_service/android_stream_reader_url_loader_unittest.cc",
     "../browser/permission/media_access_permission_request_unittest.cc",
     "../browser/permission/permission_request_handler_unittest.cc",
     "../browser/renderer_host/auto_login_parser_unittest.cc",
@@ -380,10 +384,3 @@ generate_jni("android_webview_unittests_jni") {
     "../unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java",
   ]
 }
-
-shared_library("libdrawgl") {
-  sources = [
-    "shell/src/draw_gl/draw_gl.cc",
-  ]
-  configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
-}
diff --git a/chromium/android_webview/tools/system_webview_shell/BUILD.gn b/chromium/android_webview/tools/system_webview_shell/BUILD.gn
index 658f42e73ac..65f836b16f5 100644
--- a/chromium/android_webview/tools/system_webview_shell/BUILD.gn
+++ b/chromium/android_webview/tools/system_webview_shell/BUILD.gn
@@ -24,8 +24,9 @@ android_apk("system_webview_shell_apk") {
     "apk/src/org/chromium/webview_shell/StartupTimeActivity.java",
     "apk/src/org/chromium/webview_shell/TelemetryActivity.java",
     "apk/src/org/chromium/webview_shell/TelemetryMemoryPressureActivity.java",
-    "apk/src/org/chromium/webview_shell/WebViewCreateDestroyActivity.java",
+    "apk/src/org/chromium/webview_shell/WebViewAnimationTestActivity.java",
     "apk/src/org/chromium/webview_shell/WebViewBrowserActivity.java",
+    "apk/src/org/chromium/webview_shell/WebViewCreateDestroyActivity.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",