BASELINE: Update Chromium to 102.0.5005.57

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

2 files changed, 33 insertions, 24 deletions

diff --git a/chromium/components/cronet/BUILD.gn b/chromium/components/cronet/BUILD.gn
index 2db3d1fd4ab..5be0ce232c1 100644
--- a/chromium/components/cronet/BUILD.gn
+++ b/chromium/components/cronet/BUILD.gn
@@ -37,6 +37,8 @@ process_version("cronet_version_header") {
 # Cronet common implementation.
 source_set("cronet_common") {
   sources = [
+    "cronet_context.cc",
+    "cronet_context.h",
     "cronet_global_state.h",
     "cronet_prefs_manager.cc",
     "cronet_prefs_manager.h",
@@ -44,8 +46,6 @@ source_set("cronet_common") {
     "cronet_upload_data_stream.h",
     "cronet_url_request.cc",
     "cronet_url_request.h",
-    "cronet_url_request_context.cc",
-    "cronet_url_request_context.h",
     "host_cache_persistence_manager.cc",
     "host_cache_persistence_manager.h",
     "stale_host_resolver.cc",
@@ -87,6 +87,7 @@ source_set("cronet_common_unittests") {
 
   sources = [
     "host_cache_persistence_manager_unittest.cc",
+    "network_tasks_unittest.cc",
     "stale_host_resolver_unittest.cc",
     "url_request_context_config_unittest.cc",
   ]
diff --git a/chromium/components/cronet/android/BUILD.gn b/chromium/components/cronet/android/BUILD.gn
index a60928d5d2a..39346101999 100644
--- a/chromium/components/cronet/android/BUILD.gn
+++ b/chromium/components/cronet/android/BUILD.gn
@@ -95,10 +95,11 @@ java_cpp_template("integrated_mode_state") {
   }
 }
 
-_generated_api_version_java = "$_templates_dir/org/chromium/net/ApiVersion.java"
-_api_level = read_file("api_version.txt", "value")
+_generated_interface_api_version_java =
+    "$_templates_dir/org/chromium/net/ApiVersion.java"
+_interface_api_level = read_file("interface_api_version.txt", "value")
 
-process_version("api_version") {
+process_version("interface_api_version") {
   process_only = true
   template_file = "api/src/org/chromium/net/ApiVersion.template"
   sources = [
@@ -107,15 +108,16 @@ process_version("api_version") {
   ]
   extra_args = [
     "-e",
-    "API_LEVEL=$_api_level",
+    "API_LEVEL=$_interface_api_level",
   ]
-  output = _generated_api_version_java
+  output = _generated_interface_api_version_java
 }
 
-_generated_impl_version_java =
+_generated_implementation_api_version_java =
     "$_templates_dir/org/chromium/net/impl/ImplVersion.java"
+_implementation_api_level = read_file("implementation_api_version.txt", "value")
 
-process_version("impl_version") {
+process_version("implementation_api_version") {
   process_only = true
   template_file = "java/src/org/chromium/net/impl/ImplVersion.template"
   sources = [
@@ -124,9 +126,9 @@ process_version("impl_version") {
   ]
   extra_args = [
     "-e",
-    "API_LEVEL=$_api_level",
+    "API_LEVEL=$_implementation_api_level",
   ]
-  output = _generated_impl_version_java
+  output = _generated_implementation_api_version_java
 }
 
 _cronet_version_header_include_dir = "$target_gen_dir/cronet_version_header"
@@ -152,13 +154,13 @@ source_set("cronet_static") {
   sources = [
     "//components/cronet/android/cronet_bidirectional_stream_adapter.cc",
     "//components/cronet/android/cronet_bidirectional_stream_adapter.h",
+    "//components/cronet/android/cronet_context_adapter.cc",
+    "//components/cronet/android/cronet_context_adapter.h",
     "//components/cronet/android/cronet_library_loader.cc",
     "//components/cronet/android/cronet_upload_data_stream_adapter.cc",
     "//components/cronet/android/cronet_upload_data_stream_adapter.h",
     "//components/cronet/android/cronet_url_request_adapter.cc",
     "//components/cronet/android/cronet_url_request_adapter.h",
-    "//components/cronet/android/cronet_url_request_context_adapter.cc",
-    "//components/cronet/android/cronet_url_request_context_adapter.h",
     "//components/cronet/android/io_buffer_with_byte_buffer.cc",
     "//components/cronet/android/io_buffer_with_byte_buffer.h",
     "//components/cronet/android/url_request_error.cc",
@@ -244,11 +246,11 @@ android_library("cronet_api_java") {
     "api/src/org/chromium/net/UploadDataSink.java",
     "api/src/org/chromium/net/UrlRequest.java",
     "api/src/org/chromium/net/UrlResponseInfo.java",
-    _generated_api_version_java,
+    _generated_interface_api_version_java,
   ]
 
   deps = [
-    ":api_version",
+    ":interface_api_version",
     "//third_party/androidx:androidx_annotation_annotation_java",
   ]
 }
@@ -281,14 +283,14 @@ android_library("cronet_impl_common_base_java") {
     "java/src/org/chromium/net/impl/UrlResponseInfoImpl.java",
     "java/src/org/chromium/net/impl/UserAgent.java",
     "java/src/org/chromium/net/impl/VersionSafeCallbacks.java",
-    _generated_impl_version_java,
+    _generated_implementation_api_version_java,
   ]
 
   # Adding deps here won't include those deps in the cronet_impl_common_java.jar.
   # Please add to cronet_impl_common_java_deps_to_package instead.
   deps = [
     ":cronet_api_java",
-    ":impl_version",
+    ":implementation_api_version",
     "//third_party/androidx:androidx_annotation_annotation_java",
   ]
   deps += cronet_impl_common_java_deps_to_package
@@ -524,8 +526,9 @@ java_prebuilt("package_impl_native_java") {
     ":package_api_java",
     ":package_impl_common_java",
     ":repackage_native",
-    "//third_party/android_deps:android_support_v4_java",
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
+    "//third_party/androidx:androidx_drawerlayout_drawerlayout_java",
+    "//third_party/androidx:androidx_interpolator_interpolator_java",
   ]
   jar_excluded_patterns = [ "androidx/*/R*" ]
 }
@@ -677,6 +680,9 @@ _jar_excluded_patterns = [
   "org/chromium/base/memory/MemoryPressureMonitor*.class",
 ]
 
+# Excluded from repackage_jars, but not from jar_src().
+_build_jar_excluded_patterns = [ "org/chromium/build/NativeLibraries.class" ]
+
 template("repackage_jars") {
   dist_jar(target_name) {
     requires_android = true
@@ -716,7 +722,7 @@ repackage_jars("repackage_native") {
     ":cronet_jni_registration_java",
     ":repackage_native_java",
   ]
-  jar_excluded_patterns = _jar_excluded_patterns
+  jar_excluded_patterns = _jar_excluded_patterns + _build_jar_excluded_patterns
 }
 
 _native_intermediate_jar_path = "$target_out_dir/repackage_native_impl.jar"
@@ -726,7 +732,7 @@ repackage_jars("repackage_native_impl") {
   output = _native_intermediate_jar_path
   deps = cronet_impl_native_java_deps_to_package +
          [ ":cronet_impl_native_base_java" ]
-  jar_excluded_patterns = _jar_excluded_patterns
+  jar_excluded_patterns = _jar_excluded_patterns + _build_jar_excluded_patterns
 }
 
 # Do not depend on this target directly. Use :repackage_native.
@@ -808,10 +814,9 @@ if (!is_component_build) {
       # While "cronet_tests" cannot depend on "cronet_static", and hence cannot
       # call any Cronet functions, it can access fields of Cronet objects, so add
       # Cronet header files to facilitate accessing these fields.
+      "//components/cronet/android/cronet_context_adapter.h",
       "//components/cronet/android/cronet_url_request_adapter.h",
-      "//components/cronet/android/cronet_url_request_context_adapter.h",
       "//components/cronet/cronet_url_request.h",
-      "//components/cronet/cronet_url_request_context.h",
       "//components/cronet/url_request_context_config.h",
       "test/cronet_test_jni.cc",
       "test/cronet_test_util.cc",
@@ -836,6 +841,7 @@ if (!is_component_build) {
       "//base",
       "//base:i18n",
       "//base/test:test_support",
+      "//components/cronet:cronet_common",
       "//components/cronet:cronet_version_header",
       "//components/cronet/testing:test_support",
       "//components/prefs",
@@ -978,6 +984,7 @@ if (!is_component_build) {
       "test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java",
       "test/javatests/src/org/chromium/net/GetStatusTest.java",
       "test/javatests/src/org/chromium/net/MetricsTestUtil.java",
+      "test/javatests/src/org/chromium/net/MockCertVerifierTest.java",
       "test/javatests/src/org/chromium/net/NQETest.java",
       "test/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java",
       "test/javatests/src/org/chromium/net/NetworkErrorLoggingTest.java",
@@ -1363,10 +1370,11 @@ if (!is_component_build) {
       "$target_gen_dir/cronet_impl_native_proguard.cfg",
       "//AUTHORS",
       "//chrome/VERSION",
-      "api_version.txt",
       "cronet_impl_common_proguard.cfg",
       "cronet_impl_fake_proguard.cfg",
       "cronet_impl_platform_proguard.cfg",
+      "implementation_api_version.txt",
+      "interface_api_version.txt",
     ]
     outputs = [ "$_package_dir/{{source_file_part}}" ]
 
@@ -1522,7 +1530,7 @@ if (!is_component_build) {
     ]
     sources = [
       "//components/cronet/android/api.txt",
-      "//components/cronet/android/api_version.txt",
+      "//components/cronet/android/interface_api_version.txt",
     ]
   }