Merge branch 'upstream-import' into upstream-staging

Update Cronet to version 114.0.5735.53.

Test: none
Change-Id: I0383be13fece212e77e387cef8f4dcf886ed579d

1 files changed, 16 insertions, 6 deletions

diff --git a/base/BUILD.gn b/base/BUILD.gn
index 467f64fe8..b5f3e520b 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -480,6 +480,8 @@ component("base") {
     "metrics/dummy_histogram.h",
     "metrics/field_trial.cc",
     "metrics/field_trial.h",
+    "metrics/field_trial_list_including_low_anonymity.cc",
+    "metrics/field_trial_list_including_low_anonymity.h",
     "metrics/field_trial_param_associator.cc",
     "metrics/field_trial_param_associator.h",
     "metrics/field_trial_params.cc",
@@ -626,8 +628,6 @@ component("base") {
     "sequence_token.h",
     "state_transitions.h",
     "stl_util.h",
-    "strings/abseil_string_conversions.cc",
-    "strings/abseil_string_conversions.h",
     "strings/abseil_string_number_conversions.cc",
     "strings/abseil_string_number_conversions.h",
     "strings/escape.cc",
@@ -661,6 +661,7 @@ component("base") {
     "strings/stringprintf.cc",
     "strings/stringprintf.h",
     "strings/sys_string_conversions.h",
+    "strings/to_string.h",
     "strings/utf_offset_string_conversions.cc",
     "strings/utf_offset_string_conversions.h",
     "strings/utf_string_conversion_utils.cc",
@@ -934,6 +935,7 @@ component("base") {
     "types/optional_util.h",
     "types/pass_key.h",
     "types/strong_alias.h",
+    "types/supports_ostream_operator.h",
     "types/token_type.h",
     "types/variant_util.h",
     "unguessable_token.cc",
@@ -2157,6 +2159,7 @@ component("base") {
         "ios/sim_header_shims.h",
         "mac/mach_port_rendezvous.cc",
         "mac/mach_port_rendezvous.h",
+        "process/kill_mac.cc",
         "process/launch_mac.cc",
         "process/memory_mac.mm",
         "process/port_provider_mac.cc",
@@ -2164,6 +2167,7 @@ component("base") {
         "process/process_handle_mac.cc",
         "process/process_iterator_ios.mm",
         "process/process_mac.cc",
+        "process/process_metrics_posix.cc",
         "process/process_posix.cc",
         "sync_socket_posix.cc",
         "synchronization/waitable_event_watcher_mac.cc",
@@ -2779,6 +2783,10 @@ test("base_perftests") {
     # build, only do stack trace perftest for unofficial build
     sources += [ "debug/stack_trace_perftest.cc" ]
   }
+
+  if (build_allocation_stack_trace_recorder) {
+    sources += [ "debug/allocation_trace_perftest.cc" ]
+  }
 }
 
 test("base_i18n_perftests") {
@@ -2952,6 +2960,7 @@ if (is_apple) {
     sources = [
       "ios/crb_protocol_observers_unittest.mm",
       "mac/bind_objc_block_unittest_arc.mm",
+      "mac/scoped_nsobject_unittest_arc.mm",
     ]
     configs += [ "//build/config/compiler:enable_arc" ]
     deps = [
@@ -3255,7 +3264,6 @@ test("base_unittests") {
     "sequence_token_unittest.cc",
     "state_transitions_unittest.cc",
     "stl_util_unittest.cc",
-    "strings/abseil_string_conversions_unittest.cc",
     "strings/abseil_string_number_conversions_unittest.cc",
     "strings/escape_unittest.cc",
     "strings/no_trigraphs_unittest.cc",
@@ -3270,6 +3278,7 @@ test("base_unittests") {
     "strings/stringize_macros_unittest.cc",
     "strings/stringprintf_unittest.cc",
     "strings/sys_string_conversions_unittest.cc",
+    "strings/to_string_test.cc",
     "strings/utf_offset_string_conversions_unittest.cc",
     "strings/utf_string_conversions_unittest.cc",
     "substring_set_matcher/string_pattern_unittest.cc",
@@ -3403,6 +3412,7 @@ test("base_unittests") {
     "types/optional_util_unittest.cc",
     "types/pass_key_unittest.cc",
     "types/strong_alias_unittest.cc",
+    "types/supports_ostream_operator_test.cc",
     "types/token_type_unittest.cc",
     "types/variant_util_unittest.cc",
     "unguessable_token_unittest.cc",
@@ -4026,8 +4036,6 @@ if (is_win && toolchain_has_rust) {
       "//testing/gtest",
     ]
     data_deps = [ "//build/rust/tests/test_control_flow_guard" ]
-    cfg_exe = rebase_path("${root_out_dir}/test_control_flow_guard.exe")
-    defines = [ "RUST_CFG_WIN_UNITTEST_PATH_TO_RUST_EXE=\"${cfg_exe}\"" ]
     sources = [ "memory/rust_cfg_win_unittest.cc" ]
   }
 }
@@ -4252,7 +4260,6 @@ if (is_android) {
       "android/java/src/org/chromium/base/BaseFeatureList.java",
       "android/java/src/org/chromium/base/BuildInfo.java",
       "android/java/src/org/chromium/base/BundleUtils.java",
-      "android/java/src/org/chromium/base/ByteArrayGenerator.java",
       "android/java/src/org/chromium/base/Callback.java",
       "android/java/src/org/chromium/base/CallbackController.java",
       "android/java/src/org/chromium/base/CollectionUtil.java",
@@ -4290,6 +4297,7 @@ if (is_android) {
       "android/java/src/org/chromium/base/Promise.java",
       "android/java/src/org/chromium/base/RadioUtils.java",
       "android/java/src/org/chromium/base/RequiredCallback.java",
+      "android/java/src/org/chromium/base/ResettersForTesting.java",
       "android/java/src/org/chromium/base/StreamUtil.java",
       "android/java/src/org/chromium/base/StrictModeContext.java",
       "android/java/src/org/chromium/base/SysUtils.java",
@@ -4500,6 +4508,7 @@ if (is_android) {
       "test/android/javatests/src/org/chromium/base/test/LoadNative.java",
       "test/android/javatests/src/org/chromium/base/test/MockitoErrorHandler.java",
       "test/android/javatests/src/org/chromium/base/test/ResetCachedFlagValuesTestHook.java",
+      "test/android/javatests/src/org/chromium/base/test/ResettersForTestingTestRule.java",
       "test/android/javatests/src/org/chromium/base/test/ScreenshotOnFailureStatement.java",
       "test/android/javatests/src/org/chromium/base/test/TestListInstrumentationRunListener.java",
       "test/android/javatests/src/org/chromium/base/test/TestTraceEvent.java",
@@ -4645,6 +4654,7 @@ if (is_android) {
       "android/junit/src/org/chromium/base/PathUtilsTest.java",
       "android/junit/src/org/chromium/base/PiiEliderTest.java",
       "android/junit/src/org/chromium/base/PromiseTest.java",
+      "android/junit/src/org/chromium/base/ResettersForTestingTest.java",
       "android/junit/src/org/chromium/base/TimeUtilsTest.java",
       "android/junit/src/org/chromium/base/TraceEventTest.java",
       "android/junit/src/org/chromium/base/UnownedUserDataHostTest.java",