BASELINE: Update Chromium to 85.0.4183.14085-based

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

3 files changed, 0 insertions, 55 deletions

diff --git a/chromium/chrome/browser/android/examples/partner_browser_customizations_provider/BUILD.gn b/chromium/chrome/browser/android/examples/partner_browser_customizations_provider/BUILD.gn
index 632b822acc1..7928b7ee6d4 100644
--- a/chromium/chrome/browser/android/examples/partner_browser_customizations_provider/BUILD.gn
+++ b/chromium/chrome/browser/android/examples/partner_browser_customizations_provider/BUILD.gn
@@ -14,7 +14,6 @@ android_resources("partner_browser_customizations_example_apk_resources") {
 }
 
 android_apk("partner_browser_customizations_example_apk") {
-  skip_jetify = true
   sources = [
     "src/org/chromium/example/partnercustomizations/PartnerBookmarksProviderExample.java",
     "src/org/chromium/example/partnercustomizations/PartnerBrowserCustomizationsProviderExample.java",
diff --git a/chromium/chrome/browser/android/metrics/BUILD.gn b/chromium/chrome/browser/android/metrics/BUILD.gn
deleted file mode 100644
index 2a7b9c608d0..00000000000
--- a/chromium/chrome/browser/android/metrics/BUILD.gn
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.
-
-if (is_android) {
-  import("//build/config/android/rules.gni")
-
-  _jni_sources = [ "javatests/src/org/chromium/chrome/browser/metrics/util/UkmUtilsForTest.java" ]
-
-  static_library("ukm_utils_for_test") {
-    testonly = true
-    sources = [ "ukm_utils_for_test.cc" ]
-    deps = [
-      "//chrome/browser",
-      "//chrome/browser/android/metrics:jni_headers",
-      "//components/metrics_services_manager:metrics_services_manager",
-      "//components/ukm",
-    ]
-  }
-
-  generate_jni("jni_headers") {
-    testonly = true
-    sources = _jni_sources
-  }
-
-  android_library("ukm_java_test_support") {
-    testonly = true
-    sources = _jni_sources
-    deps = [ "//base:base_java" ]
-  }
-
-  android_library("ukm_javatests") {
-    testonly = true
-    sources =
-        [ "javatests/src/org/chromium/chrome/browser/metrics/UkmTest.java" ]
-
-    deps = [
-      ":ukm_java_test_support",
-      "//base:base_java_test_support",
-      "//chrome/android:chrome_java",
-      "//chrome/browser/tab:java",
-      "//chrome/test/android:chrome_java_test_support",
-      "//components/metrics:metrics_java",
-      "//content/public/test/android:content_java_test_support",
-      "//third_party/android_support_test_runner:rules_java",
-      "//third_party/android_support_test_runner:runner_java",
-      "//third_party/junit",
-    ]
-  }
-}
diff --git a/chromium/chrome/browser/android/vr/BUILD.gn b/chromium/chrome/browser/android/vr/BUILD.gn
index a37a2b7ea44..bfdfd76eaf2 100644
--- a/chromium/chrome/browser/android/vr/BUILD.gn
+++ b/chromium/chrome/browser/android/vr/BUILD.gn
@@ -27,8 +27,6 @@ static_library("vr_android") {
     "cardboard_input_delegate.cc",
     "cardboard_input_delegate.h",
     "gl_browser_interface.h",
-    "gvr_consent_helper.cc",
-    "gvr_consent_helper.h",
     "gvr_graphics_delegate.cc",
     "gvr_graphics_delegate.h",
     "gvr_input_delegate.cc",
@@ -78,8 +76,6 @@ static_library("vr_android") {
       "arcore_device/arcore.h",
       "arcore_device/arcore_anchor_manager.cc",
       "arcore_device/arcore_anchor_manager.h",
-      "arcore_device/arcore_consent_prompt.cc",
-      "arcore_device/arcore_consent_prompt.h",
       "arcore_device/arcore_device.cc",
       "arcore_device/arcore_device.h",
       "arcore_device/arcore_device_provider.cc",