BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 23 insertions, 2 deletions

diff --git a/chromium/google_apis/BUILD.gn b/chromium/google_apis/BUILD.gn
index 09b612271f6..605d4ec4fad 100644
--- a/chromium/google_apis/BUILD.gn
+++ b/chromium/google_apis/BUILD.gn
@@ -213,6 +213,7 @@ test("google_apis_unittests") {
     "gaia/gaia_auth_fetcher_unittest.cc",
     "gaia/gaia_auth_util_unittest.cc",
     "gaia/gaia_oauth_client_unittest.cc",
+    "gaia/gaia_urls_unittest.cc",
     "gaia/google_service_auth_error_unittest.cc",
     "gaia/oauth2_access_token_fetcher_impl_unittest.cc",
     "gaia/oauth2_access_token_manager_unittest.cc",
@@ -225,8 +226,6 @@ test("google_apis_unittests") {
     "google_api_keys_unittest.h",
   ]
 
-  data = [ "test/" ]
-
   configs += [ ":key_defines" ]
 
   deps = [
@@ -241,6 +240,12 @@ test("google_apis_unittests") {
     "//testing/gtest",
   ]
 
+  if (is_ios) {
+    deps += [ ":google_apis_unittest_bundle_data" ]
+  } else {
+    data = [ "test/" ]
+  }
+
   if (enable_extensions) {
     deps += [ "//google_apis/drive:drive_unittests" ]
   }
@@ -253,3 +258,19 @@ test("google_apis_unittests") {
     deps += [ "//third_party/ocmock" ]
   }
 }
+
+bundle_data("google_apis_unittest_bundle_data") {
+  testonly = true
+  sources = [
+    "test/data/gaia/all_base_urls.json",
+    "test/data/gaia/all_urls.json",
+    "test/data/gaia/bad_url.json",
+    "test/data/gaia/bad_url_key.json",
+    "test/data/gaia/bad_urls_key.json",
+    "test/data/gaia/not_a_json.txt",
+    "test/data/gaia/one_base_url.json",
+    "test/data/gaia/one_url.json",
+  ]
+  outputs = [ "{{bundle_resources_dir}}/" +
+              "{{source_root_relative_dir}}/{{source_file_part}}" ]
+}