BASELINE: Update Chromium to 60.0.3112.70

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

5 files changed, 188 insertions, 224 deletions

diff --git a/chromium/android_webview/BUILD.gn b/chromium/android_webview/BUILD.gn
index 2cac47dd715..3f9ce2754e0 100644
--- a/chromium/android_webview/BUILD.gn
+++ b/chromium/android_webview/BUILD.gn
@@ -36,6 +36,69 @@ group("android_webview") {
   }
 }
 
+generate_jni("native_jni") {
+  sources = [
+    "java/src/org/chromium/android_webview/AndroidProtocolHandler.java",
+    "java/src/org/chromium/android_webview/AwAutofillClient.java",
+    "java/src/org/chromium/android_webview/AwBrowserProcess.java",
+    "java/src/org/chromium/android_webview/AwContents.java",
+    "java/src/org/chromium/android_webview/AwContentsBackgroundThreadClient.java",
+    "java/src/org/chromium/android_webview/AwContentsClientBridge.java",
+    "java/src/org/chromium/android_webview/AwContentsIoThreadClient.java",
+    "java/src/org/chromium/android_webview/AwContentsLifecycleNotifier.java",
+    "java/src/org/chromium/android_webview/AwContentsStatics.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/AwFormDatabase.java",
+    "java/src/org/chromium/android_webview/AwGLFunctor.java",
+    "java/src/org/chromium/android_webview/AwHttpAuthHandler.java",
+    "java/src/org/chromium/android_webview/AwMetricsLogUploader.java",
+    "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/AwQuotaManagerBridge.java",
+    "java/src/org/chromium/android_webview/AwRendererPriorityManager.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/AwWebContentsDelegate.java",
+    "java/src/org/chromium/android_webview/AwWebResourceResponse.java",
+    "java/src/org/chromium/android_webview/InputStreamUtil.java",
+    "java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java",
+    "java/src/org/chromium/android_webview/PopupTouchHandleDrawable.java",
+    "java/src/org/chromium/android_webview/permission/AwPermissionRequest.java",
+  ]
+  jni_package = "android_webview"
+
+  deps = [
+    ":cancellation_signal_android_jar_jni_headers",
+  ]
+}
+
+generate_jar_jni("cancellation_signal_android_jar_jni_headers") {
+  classes = [ "android/os/CancellationSignal.class" ]
+  jni_package = "android_webview"
+}
+
+java_cpp_enum("aw_permission_request_resource") {
+  sources = [
+    "browser/permission/aw_permission_request.h",
+  ]
+}
+
+java_cpp_enum("aw_renderer_priority_manager_renderer_priority") {
+  sources = [
+    "browser/aw_renderer_priority_manager.h",
+  ]
+}
+
+java_cpp_enum("aw_error_ui") {
+  sources = [
+    "browser/aw_safe_browsing_blocking_page.h",
+  ]
+}
+
 jinja_template("system_webview_manifest") {
   input = "apk/java/AndroidManifest.xml"
   output = system_webview_android_manifest
@@ -56,9 +119,11 @@ webview_repack_locales("repack_locales") {
 
 android_assets("locale_pak_assets") {
   disable_compression = true
-  sources = []
+  renaming_sources = []
+  renaming_destinations = []
   foreach(_locale, locales) {
-    sources += [ "$root_out_dir/android_webview/locales/$_locale.pak" ]
+    renaming_sources += [ "$root_out_dir/android_webview/locales/$_locale.pak" ]
+    renaming_destinations += [ "stored-locales/$_locale.pak" ]
   }
   deps = [
     ":repack_locales",
@@ -219,8 +284,8 @@ grit("generate_webui_resources") {
   ]
   outputs = [
     "grit/webui_resources.h",
-    "grit/webui_resources_map.h",
     "grit/webui_resources_map.cc",
+    "grit/webui_resources_map.h",
     "webui_resources.pak",
   ]
 }
@@ -315,7 +380,7 @@ source_set("webview_entry_point") {
     ":common",
   ]
   sources = [
-    "lib/main/webview_entry_point.cc",
+    "lib/webview_entry_point.cc",
   ]
 }
 
@@ -363,6 +428,16 @@ if (enable_resource_whitelist_generation) {
 
 source_set("common") {
   sources = [
+    "browser/address_parser.cc",
+    "browser/address_parser.h",
+    "browser/address_parser_internal.cc",
+    "browser/address_parser_internal.h",
+    "browser/android_protocol_handler.cc",
+    "browser/android_protocol_handler.h",
+    "browser/android_webview_jni_registrar.cc",
+    "browser/android_webview_jni_registrar.h",
+    "browser/aw_autofill_client.cc",
+    "browser/aw_autofill_client.h",
     "browser/aw_browser_context.cc",
     "browser/aw_browser_context.h",
     "browser/aw_browser_main_parts.cc",
@@ -370,34 +445,60 @@ source_set("common") {
     "browser/aw_browser_permission_request_delegate.h",
     "browser/aw_browser_policy_connector.cc",
     "browser/aw_browser_policy_connector.h",
+    "browser/aw_browser_process.cc",
+    "browser/aw_browser_process.h",
     "browser/aw_browser_terminator.cc",
     "browser/aw_browser_terminator.h",
     "browser/aw_content_browser_client.cc",
     "browser/aw_content_browser_client.h",
-    "browser/aw_contents_client_bridge_base.cc",
-    "browser/aw_contents_client_bridge_base.h",
+    "browser/aw_contents.cc",
+    "browser/aw_contents.h",
+    "browser/aw_contents_background_thread_client.cc",
+    "browser/aw_contents_background_thread_client.h",
+    "browser/aw_contents_client_bridge.cc",
+    "browser/aw_contents_client_bridge.h",
+    "browser/aw_contents_io_thread_client.cc",
     "browser/aw_contents_io_thread_client.h",
+    "browser/aw_contents_lifecycle_notifier.cc",
+    "browser/aw_contents_lifecycle_notifier.h",
+    "browser/aw_contents_statics.cc",
+    "browser/aw_contents_statics.h",
     "browser/aw_cookie_access_policy.cc",
     "browser/aw_cookie_access_policy.h",
+    "browser/aw_debug.cc",
+    "browser/aw_debug.h",
     "browser/aw_devtools_manager_delegate.cc",
     "browser/aw_devtools_manager_delegate.h",
+    "browser/aw_devtools_server.cc",
+    "browser/aw_devtools_server.h",
     "browser/aw_download_manager_delegate.cc",
     "browser/aw_download_manager_delegate.h",
+    "browser/aw_form_database.cc",
+    "browser/aw_form_database.h",
     "browser/aw_form_database_service.cc",
     "browser/aw_form_database_service.h",
+    "browser/aw_gl_functor.cc",
+    "browser/aw_gl_functor.h",
     "browser/aw_gl_surface.cc",
     "browser/aw_gl_surface.h",
-    "browser/aw_http_auth_handler_base.cc",
-    "browser/aw_http_auth_handler_base.h",
+    "browser/aw_http_auth_handler.cc",
+    "browser/aw_http_auth_handler.h",
     "browser/aw_javascript_dialog_manager.cc",
     "browser/aw_javascript_dialog_manager.h",
-    "browser/aw_locale_manager.h",
     "browser/aw_login_delegate.cc",
     "browser/aw_login_delegate.h",
+    "browser/aw_media_url_interceptor.cc",
+    "browser/aw_media_url_interceptor.h",
+    "browser/aw_metrics_log_uploader.cc",
+    "browser/aw_metrics_log_uploader.h",
     "browser/aw_metrics_service_client.cc",
     "browser/aw_metrics_service_client.h",
+    "browser/aw_pdf_exporter.cc",
+    "browser/aw_pdf_exporter.h",
     "browser/aw_permission_manager.cc",
     "browser/aw_permission_manager.h",
+    "browser/aw_picture.cc",
+    "browser/aw_picture.h",
     "browser/aw_print_manager.cc",
     "browser/aw_print_manager.h",
     "browser/aw_printing_message_filter.cc",
@@ -409,19 +510,27 @@ source_set("common") {
     "browser/aw_render_process_gone_delegate.h",
     "browser/aw_render_thread_context_provider.cc",
     "browser/aw_render_thread_context_provider.h",
+    "browser/aw_renderer_priority_manager.cc",
+    "browser/aw_renderer_priority_manager.h",
     "browser/aw_resource_context.cc",
     "browser/aw_resource_context.h",
     "browser/aw_result_codes.h",
+    "browser/aw_safe_browsing_blocking_page.cc",
+    "browser/aw_safe_browsing_blocking_page.h",
     "browser/aw_safe_browsing_config_helper.cc",
     "browser/aw_safe_browsing_config_helper.h",
     "browser/aw_safe_browsing_resource_throttle.cc",
     "browser/aw_safe_browsing_resource_throttle.h",
     "browser/aw_safe_browsing_ui_manager.cc",
     "browser/aw_safe_browsing_ui_manager.h",
+    "browser/aw_settings.cc",
+    "browser/aw_settings.h",
     "browser/aw_ssl_host_state_delegate.cc",
     "browser/aw_ssl_host_state_delegate.h",
-    "browser/aw_web_preferences_populater.cc",
-    "browser/aw_web_preferences_populater.h",
+    "browser/aw_web_contents_delegate.cc",
+    "browser/aw_web_contents_delegate.h",
+    "browser/aw_web_contents_view_delegate.cc",
+    "browser/aw_web_contents_view_delegate.h",
     "browser/browser_view_renderer.cc",
     "browser/browser_view_renderer.h",
     "browser/browser_view_renderer_client.h",
@@ -429,8 +538,12 @@ source_set("common") {
     "browser/child_frame.h",
     "browser/command_line_helper.cc",
     "browser/command_line_helper.h",
+    "browser/compositor_frame_consumer.h",
+    "browser/compositor_frame_producer.h",
     "browser/compositor_id.cc",
     "browser/compositor_id.h",
+    "browser/cookie_manager.cc",
+    "browser/cookie_manager.h",
     "browser/deferred_gpu_command_service.cc",
     "browser/deferred_gpu_command_service.h",
     "browser/find_helper.cc",
@@ -441,8 +554,10 @@ source_set("common") {
     "browser/hardware_renderer.h",
     "browser/icon_helper.cc",
     "browser/icon_helper.h",
+    "browser/input_stream.cc",
     "browser/input_stream.h",
-    "browser/jni_dependency_factory.h",
+    "browser/java_browser_view_renderer_helper.cc",
+    "browser/java_browser_view_renderer_helper.h",
     "browser/net/android_stream_reader_url_request_job.cc",
     "browser/net/android_stream_reader_url_request_job.h",
     "browser/net/aw_cookie_store_wrapper.cc",
@@ -463,20 +578,35 @@ source_set("common") {
     "browser/net/aw_url_request_job_factory.h",
     "browser/net/aw_web_resource_request.cc",
     "browser/net/aw_web_resource_request.h",
+    "browser/net/aw_web_resource_response.cc",
     "browser/net/aw_web_resource_response.h",
+    "browser/net/init_native_callback.cc",
     "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_disk_cache_remover.cc",
-    "browser/net_disk_cache_remover.h",
     "browser/parent_compositor_draw_constraints.cc",
     "browser/parent_compositor_draw_constraints.h",
     "browser/parent_output_surface.cc",
     "browser/parent_output_surface.h",
+    "browser/permission/aw_permission_request.cc",
+    "browser/permission/aw_permission_request.h",
+    "browser/permission/aw_permission_request_delegate.cc",
+    "browser/permission/aw_permission_request_delegate.h",
+    "browser/permission/media_access_permission_request.cc",
+    "browser/permission/media_access_permission_request.h",
+    "browser/permission/permission_request_handler.cc",
+    "browser/permission/permission_request_handler.h",
+    "browser/permission/permission_request_handler_client.cc",
+    "browser/permission/permission_request_handler_client.h",
+    "browser/permission/simple_permission_request.cc",
+    "browser/permission/simple_permission_request.h",
+    "browser/popup_touch_handle_drawable.cc",
+    "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",
@@ -485,8 +615,12 @@ source_set("common") {
     "browser/renderer_host/aw_resource_dispatcher_host_delegate.h",
     "browser/scoped_app_gl_state_restore.cc",
     "browser/scoped_app_gl_state_restore.h",
+    "browser/state_serializer.cc",
+    "browser/state_serializer.h",
     "browser/surfaces_instance.cc",
     "browser/surfaces_instance.h",
+    "browser/token_binding_manager_bridge.cc",
+    "browser/token_binding_manager_bridge.h",
     "browser/tracing/aw_tracing_delegate.cc",
     "browser/tracing/aw_tracing_delegate.h",
     "common/android_webview_message_generator.cc",
@@ -500,6 +634,7 @@ source_set("common") {
     "common/aw_media_drm_bridge_client.h",
     "common/aw_paths.cc",
     "common/aw_paths.h",
+    "common/aw_resource.cc",
     "common/aw_resource.h",
     "common/aw_switches.cc",
     "common/aw_switches.h",
@@ -514,11 +649,12 @@ source_set("common") {
     "common/url_constants.h",
     "gpu/aw_content_gpu_client.cc",
     "gpu/aw_content_gpu_client.h",
-    "lib/main/aw_main_delegate.cc",
-    "lib/main/aw_main_delegate.h",
-    "lib/main/webview_jni_onload.cc",
-    "lib/main/webview_jni_onload.h",
+    "lib/aw_main_delegate.cc",
+    "lib/aw_main_delegate.h",
+    "lib/webview_jni_onload.cc",
+    "lib/webview_jni_onload.h",
     "public/browser/draw_gl.h",
+    "public/browser/draw_sw.h",
     "renderer/aw_content_renderer_client.cc",
     "renderer/aw_content_renderer_client.h",
     "renderer/aw_content_settings_client.cc",
@@ -541,8 +677,11 @@ source_set("common") {
     ":generate_aw_resources",
     ":generate_aw_strings",
     ":generate_components_strings",
+    ":native_jni",
+    "//android_webview:generate_components_strings",
     "//android_webview/common:version",
-    "//android_webview/native:native",
+    "//base",
+    "//base/third_party/dynamic_annotations:dynamic_annotations",
     "//cc/surfaces",
     "//components/autofill/content/browser",
     "//components/autofill/content/renderer",
@@ -587,12 +726,17 @@ source_set("common") {
     "//gpu/skia_bindings",
     "//media",
     "//media/midi",
+    "//net",
     "//net:extras",
     "//printing",
     "//services/service_manager/public/cpp",
     "//skia",
+    "//storage/browser",
+    "//storage/common",
     "//third_party/WebKit/public:blink",
+    "//ui/base",
     "//ui/events:gesture_detection",
+    "//ui/gfx",
     "//ui/gl",
     "//ui/gl/init",
     "//ui/shell_dialogs",
@@ -607,6 +751,8 @@ source_set("common") {
   }
 
   configs += [ "//v8:external_startup_data" ]
+
+  libs = [ "jnigraphics" ]
 }
 
 android_library("android_webview_java") {
@@ -680,12 +826,14 @@ android_library("android_webview_java") {
     "java/src/org/chromium/android_webview/policy/AwPolicyProvider.java",
   ]
   deps = [
+    ":android_webview_commandline_java",
     ":android_webview_crash_services_java",
     ":android_webview_platform_services_java",
     ":resources",
     ":strings_grd",
     "//base:base_java",
     "//components/autofill/android:autofill_java",
+    "//components/crash/android:java",
     "//components/minidump_uploader:minidump_uploader_java",
     "//components/navigation_interception/android:navigation_interception_java",
     "//components/policy/android:policy_java",
@@ -705,8 +853,9 @@ android_library("android_webview_java") {
   }
 
   srcjar_deps = [
-    "//android_webview/native:aw_permission_request_resource",
-    "//android_webview/native:aw_renderer_priority_manager_renderer_priority",
+    ":aw_permission_request_resource",
+    ":aw_renderer_priority_manager_renderer_priority",
+    ":aw_error_ui",
   ]
 }
 
diff --git a/chromium/android_webview/glue/BUILD.gn b/chromium/android_webview/glue/BUILD.gn
index 25fb8b4a073..ab529541f9b 100644
--- a/chromium/android_webview/glue/BUILD.gn
+++ b/chromium/android_webview/glue/BUILD.gn
@@ -78,6 +78,5 @@ android_library("glue") {
     "java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java",
     "java/src/com/android/webview/chromium/WebViewDatabaseAdapter.java",
     "java/src/com/android/webview/chromium/WebViewDelegateFactory.java",
-    "java/src/com/android/webview/chromium/reflection/WebViewConfig.java",
   ]
 }
diff --git a/chromium/android_webview/native/BUILD.gn b/chromium/android_webview/native/BUILD.gn
deleted file mode 100644
index 9c4584dc632..00000000000
--- a/chromium/android_webview/native/BUILD.gn
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 2015 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.
-
-import("//build/config/android/config.gni")
-import("//build/config/android/rules.gni")
-import("//components/spellcheck/spellcheck_build_features.gni")
-
-source_set("native") {
-  deps = [
-    ":native_jni",
-    "//android_webview:generate_components_strings",
-    "//android_webview/common:version",
-    "//base",
-    "//base/third_party/dynamic_annotations:dynamic_annotations",
-    "//cc:cc",
-    "//components/autofill/content/browser:browser",
-    "//components/spellcheck:build_features",
-    "//components/web_contents_delegate_android:web_contents_delegate_android",
-    "//content/public/common",
-    "//device/battery:mojo_bindings",
-    "//media",
-    "//net",
-    "//skia",
-    "//storage/browser",
-    "//storage/common",
-    "//third_party/boringssl",
-    "//ui/base",
-    "//ui/gfx",
-    "//ui/gfx/geometry:geometry",
-  ]
-
-  include_dirs = [
-    "//skia/config",
-    "//third_party/protobuf",
-  ]
-
-  sources = [
-    "address_parser.cc",
-    "address_parser.h",
-    "address_parser_internal.cc",
-    "address_parser_internal.h",
-    "android_protocol_handler.cc",
-    "android_protocol_handler.h",
-    "android_webview_jni_registrar.cc",
-    "android_webview_jni_registrar.h",
-    "aw_autofill_client.cc",
-    "aw_autofill_client.h",
-    "aw_contents.cc",
-    "aw_contents.h",
-    "aw_contents_background_thread_client.cc",
-    "aw_contents_background_thread_client.h",
-    "aw_contents_client_bridge.cc",
-    "aw_contents_client_bridge.h",
-    "aw_contents_io_thread_client_impl.cc",
-    "aw_contents_io_thread_client_impl.h",
-    "aw_contents_lifecycle_notifier.cc",
-    "aw_contents_lifecycle_notifier.h",
-    "aw_contents_statics.cc",
-    "aw_contents_statics.h",
-    "aw_debug.cc",
-    "aw_debug.h",
-    "aw_devtools_server.cc",
-    "aw_devtools_server.h",
-    "aw_form_database.cc",
-    "aw_form_database.h",
-    "aw_gl_functor.cc",
-    "aw_gl_functor.h",
-    "aw_http_auth_handler.cc",
-    "aw_http_auth_handler.h",
-    "aw_locale_manager_impl.cc",
-    "aw_locale_manager_impl.h",
-    "aw_media_url_interceptor.cc",
-    "aw_media_url_interceptor.h",
-    "aw_metrics_log_uploader.cc",
-    "aw_metrics_log_uploader.h",
-    "aw_metrics_service_client_impl.cc",
-    "aw_metrics_service_client_impl.h",
-    "aw_pdf_exporter.cc",
-    "aw_pdf_exporter.h",
-    "aw_picture.cc",
-    "aw_picture.h",
-    "aw_quota_manager_bridge_impl.cc",
-    "aw_quota_manager_bridge_impl.h",
-    "aw_renderer_priority_manager.cc",
-    "aw_renderer_priority_manager.h",
-    "aw_resource.cc",
-    "aw_settings.cc",
-    "aw_settings.h",
-    "aw_web_contents_delegate.cc",
-    "aw_web_contents_delegate.h",
-    "aw_web_contents_view_delegate.cc",
-    "aw_web_contents_view_delegate.h",
-    "aw_web_preferences_populater_impl.cc",
-    "aw_web_preferences_populater_impl.h",
-    "aw_web_resource_response_impl.cc",
-    "aw_web_resource_response_impl.h",
-    "cookie_manager.cc",
-    "cookie_manager.h",
-    "input_stream_impl.cc",
-    "input_stream_impl.h",
-    "java_browser_view_renderer_helper.cc",
-    "java_browser_view_renderer_helper.h",
-    "net_init_native_callback.cc",
-    "permission/aw_permission_request.cc",
-    "permission/aw_permission_request.h",
-    "permission/aw_permission_request_delegate.cc",
-    "permission/aw_permission_request_delegate.h",
-    "permission/media_access_permission_request.cc",
-    "permission/media_access_permission_request.h",
-    "permission/permission_request_handler.cc",
-    "permission/permission_request_handler.h",
-    "permission/permission_request_handler_client.cc",
-    "permission/permission_request_handler_client.h",
-    "permission/simple_permission_request.cc",
-    "permission/simple_permission_request.h",
-    "popup_touch_handle_drawable.cc",
-    "popup_touch_handle_drawable.h",
-    "state_serializer.cc",
-    "state_serializer.h",
-    "token_binding_manager_bridge.cc",
-    "token_binding_manager_bridge.h",
-  ]
-
-  if (enable_spellcheck) {
-    deps += [ "//components/spellcheck/browser:browser" ]
-  }
-
-  libs = [ "jnigraphics" ]
-}
-
-generate_jni("native_jni") {
-  sources = [
-    "../java/src/org/chromium/android_webview/AndroidProtocolHandler.java",
-    "../java/src/org/chromium/android_webview/AwAutofillClient.java",
-    "../java/src/org/chromium/android_webview/AwContents.java",
-    "../java/src/org/chromium/android_webview/AwContentsBackgroundThreadClient.java",
-    "../java/src/org/chromium/android_webview/AwContentsClientBridge.java",
-    "../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java",
-    "../java/src/org/chromium/android_webview/AwContentsLifecycleNotifier.java",
-    "../java/src/org/chromium/android_webview/AwContentsStatics.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/AwFormDatabase.java",
-    "../java/src/org/chromium/android_webview/AwGLFunctor.java",
-    "../java/src/org/chromium/android_webview/AwHttpAuthHandler.java",
-    "../java/src/org/chromium/android_webview/AwMetricsLogUploader.java",
-    "../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/AwQuotaManagerBridge.java",
-    "../java/src/org/chromium/android_webview/AwRendererPriorityManager.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/AwWebContentsDelegate.java",
-    "../java/src/org/chromium/android_webview/AwWebResourceResponse.java",
-    "../java/src/org/chromium/android_webview/InputStreamUtil.java",
-    "../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java",
-    "../java/src/org/chromium/android_webview/PopupTouchHandleDrawable.java",
-    "../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java",
-  ]
-  jni_package = "android_webview"
-
-  deps = [
-    ":cancellation_signal_android_jar_jni_headers",
-  ]
-}
-
-generate_jar_jni("cancellation_signal_android_jar_jni_headers") {
-  classes = [ "android/os/CancellationSignal.class" ]
-  jni_package = "android_webview"
-}
-
-java_cpp_enum("aw_permission_request_resource") {
-  sources = [
-    "permission/aw_permission_request.h",
-  ]
-}
-
-java_cpp_enum("aw_renderer_priority_manager_renderer_priority") {
-  sources = [
-    "aw_renderer_priority_manager.h",
-  ]
-}
diff --git a/chromium/android_webview/system_webview_apk_tmpl.gni b/chromium/android_webview/system_webview_apk_tmpl.gni
index 90bdc7f53f4..b222511eb6d 100644
--- a/chromium/android_webview/system_webview_apk_tmpl.gni
+++ b/chromium/android_webview/system_webview_apk_tmpl.gni
@@ -30,7 +30,9 @@ template("system_webview_apk_tmpl") {
     }
     aapt_locale_whitelist = locales
 
-    if (!is_java_debug) {
+    if (is_java_debug) {
+      enable_multidex = true
+    } else {
       proguard_enabled = true
       if (!defined(proguard_configs)) {
         proguard_configs = []
diff --git a/chromium/android_webview/test/BUILD.gn b/chromium/android_webview/test/BUILD.gn
index 2b26381232d..4a770649451 100644
--- a/chromium/android_webview/test/BUILD.gn
+++ b/chromium/android_webview/test/BUILD.gn
@@ -10,12 +10,12 @@ testonly = true
 
 group("test") {
   deps = [
-    ":android_webview_test_apk",
     ":android_webview_unittests",
+    ":webview_instrumentation_test_apk",
   ]
 }
 
-android_apk("android_webview_apk") {
+android_apk("webview_instrumentation_apk") {
   deps = [
     ":android_webview_apk_assets",
     ":android_webview_apk_resources",
@@ -28,7 +28,7 @@ android_apk("android_webview_apk") {
     "//ui/android:ui_java",
   ]
 
-  apk_name = "AndroidWebView"
+  apk_name = "WebViewInstrumentation"
   android_manifest = "shell/AndroidManifest.xml"
   java_files = [
     "shell/src/org/chromium/android_webview/shell/AwShellActivity.java",
@@ -88,7 +88,7 @@ android_assets("android_webview_apk_assets") {
 
 shared_library("libstandalonelibwebviewchromium") {
   sources = [
-    "../lib/main/webview_entry_point.cc",
+    "../lib/webview_entry_point.cc",
   ]
   ldflags = [ "-Wl,-shared,-Bsymbolic" ]
   deps = [
@@ -98,9 +98,9 @@ shared_library("libstandalonelibwebviewchromium") {
   configs += [ "//build/config/android:hide_all_but_jni" ]
 }
 
-instrumentation_test_apk("android_webview_test_apk") {
-  apk_name = "AndroidWebViewTest"
-  apk_under_test = ":android_webview_apk"
+instrumentation_test_apk("webview_instrumentation_test_apk") {
+  apk_name = "WebViewInstrumentationTest"
+  apk_under_test = ":webview_instrumentation_apk"
   android_manifest = "../javatests/AndroidManifest.xml"
   deps = [
     "//android_webview:android_webview_crash_services_java",
@@ -245,27 +245,27 @@ test("android_webview_unittests") {
   ]
 
   sources = [
+    "../browser/address_parser_unittest.cc",
+    "../browser/aw_contents_client_bridge_unittest.cc",
     "../browser/aw_form_database_service_unittest.cc",
+    "../browser/aw_media_url_interceptor_unittest.cc",
     "../browser/aw_permission_manager_unittest.cc",
     "../browser/aw_static_cookie_policy_unittest.cc",
     "../browser/browser_view_renderer_unittest.cc",
     "../browser/command_line_helper_unittest.cc",
+    "../browser/input_stream_unittest.cc",
     "../browser/net/android_stream_reader_url_request_job_unittest.cc",
     "../browser/net/aw_cookie_store_wrapper_unittest.cc",
     "../browser/net/input_stream_reader_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",
+    "../browser/state_serializer_unittest.cc",
     "../browser/test/fake_window.cc",
     "../browser/test/fake_window.h",
     "../browser/test/rendering_test.cc",
     "../browser/test/rendering_test.h",
-    "../lib/main/webview_tests.cc",
-    "../native/address_parser_unittest.cc",
-    "../native/aw_contents_client_bridge_unittest.cc",
-    "../native/aw_media_url_interceptor_unittest.cc",
-    "../native/input_stream_unittest.cc",
-    "../native/permission/media_access_permission_request_unittest.cc",
-    "../native/permission/permission_request_handler_unittest.cc",
-    "../native/state_serializer_unittest.cc",
+    "../lib/webview_tests.cc",
   ]
 }