BASELINE: Update Chromium to 67.0.3396.47

Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

8 files changed, 133 insertions, 26 deletions

diff --git a/chromium/android_webview/BUILD.gn b/chromium/android_webview/BUILD.gn
index 049065206fa..97dd72d6a8b 100644
--- a/chromium/android_webview/BUILD.gn
+++ b/chromium/android_webview/BUILD.gn
@@ -11,6 +11,7 @@ import("//build/config/locales.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
 import("//tools/grit/repack.gni")
 import("//tools/resources/generate_resource_whitelist.gni")
+import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
 
 declare_args() {
   # Package name of the system_webview_apk target.
@@ -133,9 +134,9 @@ android_assets("locale_pak_assets") {
 
 repack("repack_pack") {
   sources = [
-    "$root_gen_dir/blink/public/resources/blink_resources.pak",
     "$root_gen_dir/content/content_resources.pak",
     "$root_gen_dir/net/net_resources.pak",
+    "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
     "$target_gen_dir/aw_resources.pak",
     "$target_gen_dir/components_resources.pak",
     "$target_gen_dir/webui_resources.pak",
@@ -146,7 +147,7 @@ repack("repack_pack") {
     ":generate_webui_resources",
     "//content:resources",
     "//net:net_resources",
-    "//third_party/WebKit/public:resources",
+    "//third_party/blink/public:resources",
   ]
   output = "$target_gen_dir/resources.pak"
 
@@ -158,13 +159,13 @@ repack("repack_pack") {
 
 repack("repack_100_percent") {
   sources = [
-    "$root_gen_dir/blink/public/resources/blink_scaled_resources_100_percent.pak",
     "$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
+    "$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_100_percent.pak",
     "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
   ]
   deps = [
     "//content/app/resources",
-    "//third_party/WebKit/public:scaled_resources_100_percent",
+    "//third_party/blink/public:scaled_resources_100_percent",
     "//ui/resources",
   ]
   output = "$target_gen_dir/chrome_100_percent.pak"
@@ -192,8 +193,12 @@ android_assets("pak_file_assets") {
 android_assets("monochrome_webview_assets") {
   deps = [
     "//third_party/icu:icu_assets",
-    "//v8:v8_external_startup_data_assets",
   ]
+  if (use_v8_context_snapshot) {
+    deps += [ "//tools/v8_context_snapshot:v8_context_snapshot_assets" ]
+  } else {
+    deps += [ "//v8:v8_external_startup_data_assets" ]
+  }
   if (android_64bit_target_cpu && build_apk_secondary_abi) {
     deps += [ ":v8_snapshot_secondary_abi_assets" ]
   }
@@ -396,10 +401,16 @@ if (android_64bit_target_cpu) {
     assert(android_64bit_target_cpu,
            "32-bit targets shouldn't have secondary abi")
     arch_suffix = "32"
-    renaming_sources = [ "$_secondary_abi_out_dir/snapshot_blob.bin" ]
-    renaming_destinations = [ "snapshot_blob_$arch_suffix.bin" ]
+    if (use_v8_context_snapshot) {
+      renaming_sources = [ "$_secondary_abi_out_dir/v8_context_snapshot.bin" ]
+      renaming_destinations = [ "v8_context_snapshot_$arch_suffix.bin" ]
+    } else {
+      renaming_sources = [ "$_secondary_abi_out_dir/snapshot_blob.bin" ]
+      renaming_destinations = [ "snapshot_blob_$arch_suffix.bin" ]
+    }
     disable_compression = true
     deps = [
+      "//tools/v8_context_snapshot($android_secondary_abi_toolchain)",
       "//v8($android_secondary_abi_toolchain)",
     ]
   }
@@ -413,6 +424,15 @@ if (android_64bit_target_cpu) {
     if (use_lld) {
       configs += [ "//build/config/android:lld_pack_relocations" ]
     }
+
+    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" ]
+    }
+
     public_configs = extra_chrome_shared_library_configs
     deps += extra_chrome_shared_library_deps
   }
@@ -674,6 +694,8 @@ source_set("common") {
     "renderer/aw_url_loader_throttle_provider.h",
     "renderer/print_render_frame_observer.cc",
     "renderer/print_render_frame_observer.h",
+    "utility/aw_content_utility_client.cc",
+    "utility/aw_content_utility_client.h",
   ]
 
   deps = [
@@ -714,7 +736,10 @@ source_set("common") {
     "//components/safe_browsing/renderer:throttles",
     "//components/safe_browsing/triggers",
     "//components/safe_browsing/web_ui",
-    "//components/spellcheck:build_features",
+    "//components/services/heap_profiling",
+    "//components/services/heap_profiling/public/cpp",
+    "//components/services/heap_profiling/public/mojom",
+    "//components/spellcheck:buildflags",
     "//components/supervised_user_error_page",
     "//components/supervised_user_error_page:gin",
     "//components/url_matcher",
@@ -747,7 +772,7 @@ source_set("common") {
     "//skia",
     "//storage/browser",
     "//storage/common",
-    "//third_party/WebKit/public:blink",
+    "//third_party/blink/public:blink",
     "//ui/base",
     "//ui/events:gesture_detection",
     "//ui/gfx",
@@ -764,7 +789,10 @@ source_set("common") {
     ]
   }
 
-  configs += [ "//v8:external_startup_data" ]
+  configs += [
+    "//tools/v8_context_snapshot:use_v8_context_snapshot",
+    "//v8:external_startup_data",
+  ]
 
   libs = [ "jnigraphics" ]
 }
@@ -842,6 +870,7 @@ android_library("android_webview_java") {
     "java/src/org/chromium/android_webview/ResourcesContextWrapperFactory.java",
     "java/src/org/chromium/android_webview/ScrollAccessibilityHelper.java",
     "java/src/org/chromium/android_webview/SslUtil.java",
+    "java/src/org/chromium/android_webview/VariationsSeedLoader.java",
     "java/src/org/chromium/android_webview/WebViewChromiumRunQueue.java",
     "java/src/org/chromium/android_webview/permission/AwGeolocationCallback.java",
     "java/src/org/chromium/android_webview/permission/AwPermissionRequest.java",
@@ -851,6 +880,7 @@ android_library("android_webview_java") {
     ":android_webview_commandline_java",
     ":android_webview_platform_services_java",
     ":android_webview_services_java",
+    ":android_webview_variations_utils_java",
     ":resources",
     ":strings_grd",
     ":system_webview_manifest",
@@ -863,6 +893,8 @@ android_library("android_webview_java") {
     "//components/navigation_interception/android:navigation_interception_java",
     "//components/policy/android:policy_java",
     "//components/safe_browsing/android:safe_browsing_java",
+    "//components/variations:load_seed_result_enum_java",
+    "//components/variations/android:variations_java",
     "//components/version_info/android:version_constants_java",
     "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//components/web_restrictions:client_java",
@@ -870,8 +902,8 @@ android_library("android_webview_java") {
     "//device/gamepad:java",
     "//device/geolocation:geolocation_java",
     "//net/android:net_java",
-    "//third_party/WebKit/public:blink_headers_java",
     "//third_party/android_tools:android_support_annotations_java",
+    "//third_party/blink/public:blink_headers_java",
     "//ui/android:ui_java",
   ]
 
@@ -890,6 +922,13 @@ android_library("android_webview_java") {
   android_manifest_for_lint = system_webview_android_manifest
 }
 
+android_library("android_webview_variations_utils_java") {
+  java_files = [ "java/src/org/chromium/android_webview/VariationsUtils.java" ]
+  deps = [
+    "//components/variations/android:variations_java",
+  ]
+}
+
 java_strings_grd("strings_grd") {
   grd_file = "java/strings/android_webview_strings.grd"
   outputs = [
@@ -941,15 +980,23 @@ java_strings_grd("strings_grd") {
 }
 
 # Separate target to allow for a dependency on GmsCore without pulling in all of
-# android_webview_java.
+# android_webview_java. It compiles the abstract class; implementations are
+# compiled separately.
 android_library("android_webview_platform_services_java") {
-  java_files =
-      [ "java/src/org/chromium/android_webview/PlatformServiceBridge.java" ]
+  java_files = [
+    "java/src/org/chromium/android_webview/PlatformServiceBridge.java",
+    "java/src/org/chromium/android_webview/PlatformServiceBridgeImpl.java",
+  ]
 
   deps = [
     "//base:base_java",
     "//third_party/android_tools:android_support_annotations_java",
   ]
+
+  # The appropriate .class file will be loaded via a dependency to a library
+  # like :platform_service_bridge_upstream_implementation_java below. We only include the
+  # .java file because other files in the target depend on it.
+  jar_excluded_patterns = [ "*/PlatformServiceBridgeImpl.class" ]
 }
 
 # This target compiles the implementation of PlatformServiceBridge for AOSP targets.
@@ -977,24 +1024,23 @@ android_library("android_webview_services_java") {
   java_files = [
     "java/src/org/chromium/android_webview/services/AwMinidumpUploadJobService.java",
     "java/src/org/chromium/android_webview/services/AwMinidumpUploaderDelegate.java",
-    "java/src/org/chromium/android_webview/services/AwVariationsConfigurationService.java",
-    "java/src/org/chromium/android_webview/services/AwVariationsSeedFetchService.java",
-    "java/src/org/chromium/android_webview/services/AwVariationsSeedHandler.java",
-    "java/src/org/chromium/android_webview/services/AwVariationsUtils.java",
     "java/src/org/chromium/android_webview/services/CrashReceiverService.java",
     "java/src/org/chromium/android_webview/services/ServiceInit.java",
+    "java/src/org/chromium/android_webview/services/VariationsSeedServer.java",
   ]
   deps = [
     ":android_webview_commandline_java",
     ":android_webview_platform_services_java",
+    ":android_webview_variations_utils_java",
     ":system_webview_manifest",
     "//base:base_java",
     "//components/background_task_scheduler:background_task_scheduler_java",
     "//components/minidump_uploader:minidump_uploader_java",
-    "//components/variations/android:variations_java",
   ]
-
-  srcjar_deps = [ ":crash_receiver_aidl" ]
+  srcjar_deps = [
+    ":crash_receiver_aidl",
+    ":aw_variations_seed_server_aidl",
+  ]
   android_manifest_for_lint = system_webview_android_manifest
 }
 
@@ -1005,11 +1051,19 @@ android_aidl("crash_receiver_aidl") {
   ]
 }
 
+android_aidl("aw_variations_seed_server_aidl") {
+  import_include = [ "java/src" ]
+  sources = [
+    "java/src/org/chromium/android_webview/services/IVariationsSeedServer.aidl",
+  ]
+}
+
 if (public_android_sdk) {
   system_webview_apk_tmpl("system_webview_apk") {
     android_manifest = system_webview_android_manifest
     android_manifest_dep = ":system_webview_manifest"
     deps = [
+      ":platform_service_bridge_upstream_implementation_java",
       ":system_webview_resources",
       "//android_webview/glue",
       "//android_webview/support_library:support_lib_glue_java",
diff --git a/chromium/android_webview/glue/BUILD.gn b/chromium/android_webview/glue/BUILD.gn
index 7c2b85eda84..ef092f49fd7 100644
--- a/chromium/android_webview/glue/BUILD.gn
+++ b/chromium/android_webview/glue/BUILD.gn
@@ -42,6 +42,7 @@ android_library("glue") {
     "java/src/com/android/webview/chromium/GeolocationPermissionsAdapter.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",
@@ -50,6 +51,7 @@ android_library("glue") {
     "java/src/com/android/webview/chromium/WebHistoryItemChromium.java",
     "java/src/com/android/webview/chromium/WebIconDatabaseAdapter.java",
     "java/src/com/android/webview/chromium/WebMessagePortAdapter.java",
+    "java/src/com/android/webview/chromium/WebResourceErrorAdapter.java",
     "java/src/com/android/webview/chromium/WebResourceRequestAdapter.java",
     "java/src/com/android/webview/chromium/WebStorageAdapter.java",
     "java/src/com/android/webview/chromium/WebkitToSharedGlueConverter.java",
diff --git a/chromium/android_webview/glue/glue.gni b/chromium/android_webview/glue/glue.gni
index 1bcaa68be4a..0581c9bb5f5 100644
--- a/chromium/android_webview/glue/glue.gni
+++ b/chromium/android_webview/glue/glue.gni
@@ -9,6 +9,8 @@ glue_library_deps = [
   "//android_webview:android_webview_commandline_java",
   "//android_webview:android_webview_platform_services_java",
   "//android_webview:system_webview_manifest",
+  "//android_webview/support_library/boundary_interfaces:boundary_interface_java",
+  "//android_webview/support_library/callback:callback_java",
   "//base:base_java",
   "//components/autofill/android:autofill_java",
   "//components/autofill/android:provider_java",
diff --git a/chromium/android_webview/support_library/BUILD.gn b/chromium/android_webview/support_library/BUILD.gn
index f561eb90842..10d2d013cf1 100644
--- a/chromium/android_webview/support_library/BUILD.gn
+++ b/chromium/android_webview/support_library/BUILD.gn
@@ -7,6 +7,11 @@ import("//build/config/android/rules.gni")
 
 android_library("support_lib_glue_java") {
   java_files = [
+    "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",
+    "java/src/org/chromium/support_lib_glue/SupportLibServiceWorkerSettingsAdapter.java",
+    "java/src/org/chromium/support_lib_glue/SupportLibWebResourceRequest.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",
diff --git a/chromium/android_webview/support_library/boundary_interfaces/BUILD.gn b/chromium/android_webview/support_library/boundary_interfaces/BUILD.gn
index 6f08b1d9f1f..854014a32f2 100644
--- a/chromium/android_webview/support_library/boundary_interfaces/BUILD.gn
+++ b/chromium/android_webview/support_library/boundary_interfaces/BUILD.gn
@@ -7,15 +7,26 @@ import("//build/config/android/rules.gni")
 
 android_library("boundary_interface_java") {
   java_files = [
-    "src/org/chromium/support_lib_boundary/BoundaryInterfaceReflectionUtil.java",
+    "src/org/chromium/support_lib_boundary/FeatureFlagHolderBoundaryInterface.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",
+    "src/org/chromium/support_lib_boundary/ServiceWorkerWebSettingsBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/StaticsBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/VisualStateCallbackBoundaryInterface.java",
+    "src/org/chromium/support_lib_boundary/WebResourceErrorBoundaryInterface.java",
+    "src/org/chromium/support_lib_boundary/WebResourceRequestBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.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/WebkitToCompatConverterBoundaryInterface.java",
+    "src/org/chromium/support_lib_boundary/util/BoundaryInterfaceReflectionUtil.java",
+    "src/org/chromium/support_lib_boundary/util/Features.java",
   ]
 
+  proguard_configs = [ "proguard.flags" ]
+
   # We can't use ANY deps here, the support library should be able to build
   # these interfaces without any other chromium dependencies.
   deps = []
diff --git a/chromium/android_webview/support_library/callback/BUILD.gn b/chromium/android_webview/support_library/callback/BUILD.gn
new file mode 100644
index 00000000000..214eeb07459
--- /dev/null
+++ b/chromium/android_webview/support_library/callback/BUILD.gn
@@ -0,0 +1,21 @@
+# Copyright 2018 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")
+
+android_library("callback_java") {
+  java_files = [
+    "java/src/org/chromium/support_lib_callback_glue/SupportLibSafeBrowsingResponse.java",
+    "java/src/org/chromium/support_lib_callback_glue/SupportLibWebResourceError.java",
+    "java/src/org/chromium/support_lib_callback_glue/SupportLibWebViewContentsClientAdapter.java",
+  ]
+
+  deps = [
+    "//android_webview:android_webview_commandline_java",
+    "//android_webview:android_webview_java",
+    "//android_webview/support_library/boundary_interfaces:boundary_interface_java",
+    "//base:base_java",
+  ]
+}
diff --git a/chromium/android_webview/test/BUILD.gn b/chromium/android_webview/test/BUILD.gn
index bfea1d82bba..a0a93892897 100644
--- a/chromium/android_webview/test/BUILD.gn
+++ b/chromium/android_webview/test/BUILD.gn
@@ -3,8 +3,9 @@
 # found in the LICENSE file.
 
 import("//build/config/android/rules.gni")
-import("//device/vr/features/features.gni")
+import("//device/vr/buildflags/buildflags.gni")
 import("//testing/test.gni")
+import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
 
 # Mark all targets as test only.
 testonly = true
@@ -22,6 +23,7 @@ android_apk("webview_instrumentation_apk") {
     ":android_webview_apk_resources",
     "//android_webview:android_webview_java",
     "//android_webview:locale_pak_assets",
+    "//android_webview:platform_service_bridge_upstream_implementation_java",
     "//base:base_java",
     "//base:base_java_test_support",
     "//components/policy/android:policy_java_test_support",
@@ -70,8 +72,8 @@ android_assets("android_webview_apk_assets") {
   deps = [
     "//android_webview:pak_file_assets",
     "//third_party/icu:icu_assets",
-    "//v8:v8_external_startup_data_assets",
   ]
+
   sources = [
     "shell/assets/asset_file.html",
     "shell/assets/asset_icon.png",
@@ -91,6 +93,12 @@ android_assets("android_webview_apk_assets") {
     "shell/assets/visual_state_waits_for_js_test.html",
     "shell/assets/webvr_not_functional_test.html",
   ]
+
+  if (use_v8_context_snapshot) {
+    deps += [ "//tools/v8_context_snapshot:v8_context_snapshot_assets" ]
+  } else {
+    deps += [ "//v8:v8_external_startup_data_assets" ]
+  }
 }
 
 shared_library("libstandalonelibwebviewchromium") {
@@ -113,6 +121,7 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
     "//android_webview:android_webview_java",
     "//android_webview:android_webview_platform_services_java",
     "//android_webview:android_webview_services_java",
+    "//android_webview:aw_variations_seed_server_aidl",
     "//android_webview/test/embedded_test_server:aw_net_java_test_support",
     "//base:base_java",
     "//base:base_java_test_support",
@@ -122,7 +131,6 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
     "//components/policy/android:policy_java",
     "//components/policy/android:policy_java_test_support",
     "//components/safe_browsing/android:safe_browsing_java",
-    "//components/variations/android:variations_java",
     "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
@@ -208,20 +216,23 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
     "../javatests/src/org/chromium/android_webview/test/RenderProcessGoneHelper.java",
     "../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/StandaloneAwQuotaManagerBridgeTest.java",
     "../javatests/src/org/chromium/android_webview/test/TestAwContents.java",
     "../javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java",
     "../javatests/src/org/chromium/android_webview/test/TestAwServiceWorkerClient.java",
     "../javatests/src/org/chromium/android_webview/test/UserAgentTest.java",
+    "../javatests/src/org/chromium/android_webview/test/VariationsSeedLoaderTest.java",
     "../javatests/src/org/chromium/android_webview/test/VisualStateTest.java",
     "../javatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java",
     "../javatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java",
     "../javatests/src/org/chromium/android_webview/test/WebViewFindApisTestRule.java",
     "../javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java",
     "../javatests/src/org/chromium/android_webview/test/WebViewWebVrTest.java",
-    "../javatests/src/org/chromium/android_webview/test/services/AwVariationsConfigurationServiceTest.java",
     "../javatests/src/org/chromium/android_webview/test/services/CrashReceiverServiceTest.java",
     "../javatests/src/org/chromium/android_webview/test/services/MinidumpUploaderTest.java",
+    "../javatests/src/org/chromium/android_webview/test/services/MockVariationsSeedServer.java",
+    "../javatests/src/org/chromium/android_webview/test/services/VariationsSeedServerTest.java",
     "../javatests/src/org/chromium/android_webview/test/services/VisualStateCallbackTest.java",
     "../javatests/src/org/chromium/android_webview/test/util/AwQuotaManagerBridgeTestUtil.java",
     "../javatests/src/org/chromium/android_webview/test/util/AwTestTouchUtils.java",
diff --git a/chromium/android_webview/tools/system_webview_shell/BUILD.gn b/chromium/android_webview/tools/system_webview_shell/BUILD.gn
index 8bc91f9be0e..af852420b61 100644
--- a/chromium/android_webview/tools/system_webview_shell/BUILD.gn
+++ b/chromium/android_webview/tools/system_webview_shell/BUILD.gn
@@ -58,6 +58,7 @@ instrumentation_test_apk("system_webview_shell_page_cycler_apk") {
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
   ]
+  enable_multidex = true
 }
 
 instrumentation_test_apk("system_webview_shell_layout_test_apk") {