BASELINE: Update Chromium to 69.0.3497.70

Change-Id: I2b7b56e4e7a8b26656930def0d4575dc32b900a0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 3 insertions, 7 deletions

diff --git a/chromium/base/android/jni_generator/BUILD.gn b/chromium/base/android/jni_generator/BUILD.gn
index f93b4162ed2..915da9755a4 100644
--- a/chromium/base/android/jni_generator/BUILD.gn
+++ b/chromium/base/android/jni_generator/BUILD.gn
@@ -41,7 +41,6 @@ shared_library("jni_sample_lib") {
     ":jni_sample_native_side",
     ":sample_jni_registration",
     "//base",
-    "//build/config:exe_and_shlib_deps",
   ]
 }
 
diff --git a/chromium/base/android/jni_generator/jni_exception_list.gni b/chromium/base/android/jni_generator/jni_exception_list.gni
index e3ce93adbb7..31d027cab28 100644
--- a/chromium/base/android/jni_generator/jni_exception_list.gni
+++ b/chromium/base/android/jni_generator/jni_exception_list.gni
@@ -4,13 +4,10 @@
 
 import("//device/vr/buildflags/buildflags.gni")
 
-jni_exception_files = [
-  "//base/android/java/src/org/chromium/base/library_loader/LegacyLinker.java",
-  "//base/android/java/src/org/chromium/base/library_loader/Linker.java",
-  "//base/android/java/src/org/chromium/base/library_loader/ModernLinker.java",
-]
+jni_exception_files =
+    [ "//base/android/java/src/org/chromium/base/library_loader/Linker.java" ]
 
 # Exclude it from JNI registration if VR is not enabled.
 if (!enable_vr) {
-  jni_exception_files += [ "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java" ]
+  jni_exception_files += [ "//chrome/android/java/src/org/chromium/chrome/browser/vr/VrShellDelegate.java" ]
 }