Remove deprecated field_trial_default and metrics_default.
This CL removes some deprecated build targets (and their headers)
from system_wrappers:
- field_trial_api
- field_trial_default
- metrics_api
- metrics_default
It also refreshes all the dependencies on field_trial.h and metrics.h.
A nice side effect is that it is finally possible to remove 'nogncheck'
from the following files (when it was used with field_trial_default
and metrics_default):
- sdk/objc/api/peerconnection/RTCMetricsSampleInfo+Private.h
- sdk/android/src/jni/pc/peerconnectionfactory.cc
- sdk/objc/api/peerconnection/RTCFieldTrials.mm
Bug: webrtc:9631
Change-Id: Ib621f41ef8ad0aba4fe1c1d7e749c044afc956c3
No-Try: True
Reviewed-on: https://webrtc-review.googlesource.com/100524
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24878}diff --git a/BUILD.gn b/BUILD.gn
index 3f06fa9..f3aae92 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -401,11 +401,7 @@
]
if (build_with_mozilla) {
- deps += [
- "api/video:video_frame",
- "system_wrappers:field_trial_default",
- "system_wrappers:metrics_default",
- ]
+ deps += [ "api/video:video_frame" ]
} else {
deps += [
"api",
@@ -475,7 +471,6 @@
"rtc_base:sigslot_unittest",
"rtc_base:weak_ptr_unittests",
"rtc_base/experiments:experiments_unittests",
- "system_wrappers:metrics_default",
"system_wrappers:runtime_enabled_features_default",
]
diff --git a/api/video_codecs/BUILD.gn b/api/video_codecs/BUILD.gn
index 0036479..55674d0 100644
--- a/api/video_codecs/BUILD.gn
+++ b/api/video_codecs/BUILD.gn
@@ -103,7 +103,7 @@
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../rtc_base/system:fallthrough",
- "../../system_wrappers:field_trial_api",
+ "../../system_wrappers:field_trial",
"../video:video_bitrate_allocation",
"//third_party/abseil-cpp/absl/memory",
]
diff --git a/api/video_codecs/test/BUILD.gn b/api/video_codecs/test/BUILD.gn
index 1894309..fa19162 100644
--- a/api/video_codecs/test/BUILD.gn
+++ b/api/video_codecs/test/BUILD.gn
@@ -26,7 +26,6 @@
"../../../modules/video_coding:webrtc_vp8",
"../../../rtc_base:checks",
"../../../rtc_base:rtc_base_tests_utils",
- "../../../system_wrappers:metrics_default",
"../../../test:field_trial",
"../../../test:test_support",
"../../video:video_bitrate_allocation",
diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index ae4c67e..7d3d6b7 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -82,8 +82,8 @@
"../rtc_base:safe_minmax",
"../rtc_base:stringutils",
"../system_wrappers",
- "../system_wrappers:field_trial_api",
- "../system_wrappers:metrics_api",
+ "../system_wrappers:field_trial",
+ "../system_wrappers:metrics",
"utility:audio_frame_operations",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
diff --git a/call/BUILD.gn b/call/BUILD.gn
index b485ead..e359995 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -129,7 +129,7 @@
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_task_queue",
- "../system_wrappers:field_trial_api",
+ "../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/memory",
]
}
@@ -159,8 +159,8 @@
"../rtc_base:rtc_base_approved",
"../rtc_base:sequenced_task_checker",
"../system_wrappers",
- "../system_wrappers:field_trial_api",
- "../system_wrappers:metrics_api",
+ "../system_wrappers:field_trial",
+ "../system_wrappers:metrics",
]
}
@@ -212,8 +212,8 @@
"../rtc_base:sequenced_task_checker",
"../rtc_base/synchronization:rw_lock_wrapper",
"../system_wrappers",
- "../system_wrappers:field_trial_api",
- "../system_wrappers:metrics_api",
+ "../system_wrappers:field_trial",
+ "../system_wrappers:metrics",
"../video",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
@@ -384,7 +384,7 @@
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
- "../system_wrappers:metrics_default",
+ "../system_wrappers:metrics",
"../system_wrappers:runtime_enabled_features_default",
"../test:direct_transport",
"../test:fake_video_codecs",
diff --git a/call/call_perf_tests.cc b/call/call_perf_tests.cc
index b8b4601..03c2db8 100644
--- a/call/call_perf_tests.cc
+++ b/call/call_perf_tests.cc
@@ -29,7 +29,7 @@
#include "rtc_base/bitrateallocationstrategy.h"
#include "rtc_base/checks.h"
#include "rtc_base/thread_annotations.h"
-#include "system_wrappers/include/metrics_default.h"
+#include "system_wrappers/include/metrics.h"
#include "test/call_test.h"
#include "test/direct_transport.h"
#include "test/drifting_clock.h"
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 2bf0144..09a0c0b 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -220,13 +220,11 @@
# iOS must use WebRTC.framework which is dynamically linked.
deps = [
"../sdk:framework_objc+link",
- "../system_wrappers:field_trial_default",
"../system_wrappers:runtime_enabled_features_default",
]
} else {
deps = [
"../sdk:mac_framework_objc+link",
- "../system_wrappers:field_trial_default",
"../system_wrappers:runtime_enabled_features_default",
]
}
@@ -496,8 +494,6 @@
"../sdk:ui_objc",
"../sdk:videocapture_objc",
"../sdk:videotoolbox_objc",
- "../system_wrappers:field_trial_default",
- "../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
"//third_party/abseil-cpp/absl/memory",
]
@@ -709,8 +705,6 @@
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_json",
- "../system_wrappers:field_trial_default",
- "../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
"//third_party/libyuv",
]
@@ -748,8 +742,6 @@
"../pc:rtc_pc",
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
- "../system_wrappers:field_trial_default",
- "../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
]
if (!build_with_chromium && is_clang) {
@@ -767,8 +759,6 @@
"../pc:rtc_pc",
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
- "../system_wrappers:field_trial_default",
- "../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
]
if (!build_with_chromium && is_clang) {
@@ -786,8 +776,6 @@
"../pc:rtc_pc",
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
- "../system_wrappers:field_trial_default",
- "../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
]
if (!build_with_chromium && is_clang) {
@@ -839,8 +827,6 @@
"../modules/video_capture:video_capture_module",
"../pc:libjingle_peerconnection",
"../rtc_base:rtc_base",
- "../system_wrappers:field_trial_default",
- "../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
"//third_party/abseil-cpp/absl/memory",
]
@@ -900,7 +886,6 @@
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
"../rtc_base:stringutils",
- "../system_wrappers:field_trial_default",
]
}
}
diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn
index f96fab2..b76b544 100644
--- a/examples/androidnativeapi/BUILD.gn
+++ b/examples/androidnativeapi/BUILD.gn
@@ -60,8 +60,6 @@
"//sdk/android:native_api_base",
"//sdk/android:native_api_jni",
"//sdk/android:native_api_video",
- "//system_wrappers:field_trial_default",
- "//system_wrappers:metrics_default",
"//system_wrappers:runtime_enabled_features_default",
"//third_party/abseil-cpp/absl/memory",
]
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index 0269485..cb22af4 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -350,8 +350,6 @@
"../rtc_base:checks",
"../rtc_base:protobuf_utils",
"../rtc_base:rtc_base_approved",
- "../system_wrappers:field_trial_default",
- "../system_wrappers:metrics_default",
"../test:rtp_test_utils",
"//third_party/abseil-cpp/absl/memory:memory",
"//third_party/abseil-cpp/absl/types:optional",
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 8b6de8d..2f01620 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -136,7 +136,6 @@
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
"../rtc_base/third_party/sigslot",
- "../system_wrappers:field_trial_api",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -167,6 +166,7 @@
deps = [
":rtc_h264_profile_id",
"../modules/video_coding:video_codec_interface",
+ "../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/memory",
]
sources = [
@@ -217,8 +217,6 @@
"../rtc_base:rtc_base_approved",
"../rtc_base:sequenced_task_checker",
"../system_wrappers",
- "../system_wrappers:field_trial_api",
- "../system_wrappers:metrics_api",
"//third_party/abseil-cpp/absl/types:optional",
"//third_party/libyuv",
]
@@ -240,6 +238,8 @@
"../rtc_base:audio_format_to_string",
"../rtc_base:checks",
"../rtc_base/third_party/base64",
+ "../system_wrappers:field_trial",
+ "../system_wrappers:metrics",
]
sources = [
@@ -322,8 +322,6 @@
"../rtc_base:rtc_task_queue",
"../rtc_base:stringutils",
"../system_wrappers",
- "../system_wrappers:field_trial_api",
- "../system_wrappers:metrics_api",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -594,7 +592,6 @@
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_base_tests_main",
"../rtc_base:rtc_base_tests_utils",
- "../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
"../test:audio_codec_mocks",
"../test:test_support",
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index b18d50c..c9b75a5 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -117,12 +117,12 @@
}
deps = audio_coding_deps + [
+ "../../system_wrappers:metrics",
"../../api/audio:audio_frame_api",
"..:module_api",
"../../common_audio:common_audio_c",
"../../rtc_base:deprecation",
"../../rtc_base:checks",
- "../../system_wrappers:metrics_api",
"../../api:array_view",
"../../api/audio_codecs:audio_codecs_api",
":audio_coding_module_typedefs",
@@ -821,7 +821,7 @@
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_numerics",
"../../rtc_base:safe_minmax",
- "../../system_wrappers:field_trial_api",
+ "../../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -938,7 +938,7 @@
"../../rtc_base:rtc_base_approved",
"../../rtc_base/system:file_wrapper",
"../../system_wrappers",
- "../../system_wrappers:field_trial_api",
+ "../../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -1059,8 +1059,8 @@
"../../rtc_base:safe_minmax",
"../../rtc_base:sanitizer",
"../../rtc_base/system:fallthrough",
- "../../system_wrappers:field_trial_api",
- "../../system_wrappers:metrics_api",
+ "../../system_wrappers:field_trial",
+ "../../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -1365,7 +1365,7 @@
"../../rtc_base:protobuf_utils",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
- "../../system_wrappers:field_trial_api",
+ "../../system_wrappers:field_trial",
"../../test:fileutils",
"../../test:perf_test",
"../../test:test_support",
@@ -1515,7 +1515,7 @@
":neteq_test_factory",
":neteq_test_tools",
"../../rtc_base:rtc_base_approved",
- "../../system_wrappers:field_trial_default",
+ "../../system_wrappers:field_trial",
"../../test:field_trial",
]
sources = [
@@ -1575,9 +1575,7 @@
"../..:webrtc_common",
"../../api:libjingle_peerconnection_api",
"../../rtc_base:rtc_base_approved",
- "../../system_wrappers:metrics_default",
"../../system_wrappers:system_wrappers_default",
- "../../test:field_trial",
"../../test:test_main",
"../audio_processing",
"//testing/gtest",
diff --git a/modules/audio_coding/neteq/tools/neteq_rtpplay.cc b/modules/audio_coding/neteq/tools/neteq_rtpplay.cc
index d2dcdae..25e8cd8 100644
--- a/modules/audio_coding/neteq/tools/neteq_rtpplay.cc
+++ b/modules/audio_coding/neteq/tools/neteq_rtpplay.cc
@@ -14,7 +14,7 @@
#include "modules/audio_coding/neteq/tools/neteq_test.h"
#include "modules/audio_coding/neteq/tools/neteq_test_factory.h"
#include "rtc_base/flags.h"
-#include "system_wrappers/include/field_trial_default.h"
+#include "system_wrappers/include/field_trial.h"
#include "test/field_trial.h"
DEFINE_bool(codec_map,
diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
index 2759da4..55fec73 100644
--- a/modules/audio_device/BUILD.gn
+++ b/modules/audio_device/BUILD.gn
@@ -72,7 +72,7 @@
"../../sdk:audio_device",
"../../sdk:audio_objc",
"../../sdk:base_objc",
- "../../system_wrappers:metrics_api",
+ "../../system_wrappers:metrics",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
@@ -115,7 +115,7 @@
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",
"../../system_wrappers",
- "../../system_wrappers:metrics_api",
+ "../../system_wrappers:metrics",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
@@ -217,7 +217,7 @@
"../../rtc_base/system:arch",
"../../rtc_base/system:file_wrapper",
"../../system_wrappers",
- "../../system_wrappers:metrics_api",
+ "../../system_wrappers:metrics",
"../utility",
"//third_party/abseil-cpp/absl/memory",
]
diff --git a/modules/audio_mixer/BUILD.gn b/modules/audio_mixer/BUILD.gn
index da54e7b..bd3b106 100644
--- a/modules/audio_mixer/BUILD.gn
+++ b/modules/audio_mixer/BUILD.gn
@@ -45,8 +45,7 @@
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
- "../../system_wrappers:field_trial_api",
- "../../system_wrappers:metrics_api",
+ "../../system_wrappers:metrics",
"../audio_processing",
"../audio_processing:apm_logging",
"../audio_processing:audio_frame_view",
diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index 3f04873..78e0091 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -120,8 +120,8 @@
"../../rtc_base:sanitizer",
"../../rtc_base/system:arch",
"../../system_wrappers:cpu_features_api",
- "../../system_wrappers:field_trial_api",
- "../../system_wrappers:metrics_api",
+ "../../system_wrappers:field_trial",
+ "../../system_wrappers:metrics",
"aec:aec",
"aec:aec_core",
"aecm:aecm_core",
@@ -612,7 +612,6 @@
"../../rtc_base:rtc_base_approved",
"../../rtc_base/system:file_wrapper",
"../../system_wrappers",
- "../../system_wrappers:metrics_default",
"../../test:fileutils",
"../../test:test_support",
"agc:level_estimation",
@@ -632,7 +631,6 @@
"../..:webrtc_common",
"../../rtc_base/system:file_wrapper",
"../../system_wrappers",
- "../../system_wrappers:metrics_default",
]
}
diff --git a/modules/audio_processing/aec/BUILD.gn b/modules/audio_processing/aec/BUILD.gn
index 52441d7..294c43f 100644
--- a/modules/audio_processing/aec/BUILD.gn
+++ b/modules/audio_processing/aec/BUILD.gn
@@ -40,7 +40,7 @@
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base/system:arch",
"../../../system_wrappers:cpu_features_api",
- "../../../system_wrappers:metrics_api",
+ "../../../system_wrappers:metrics",
"../utility:block_mean_calculator",
"../utility:legacy_delay_estimator",
"../utility:ooura_fft",
diff --git a/modules/audio_processing/aec3/BUILD.gn b/modules/audio_processing/aec3/BUILD.gn
index 02b3acf..e631732 100644
--- a/modules/audio_processing/aec3/BUILD.gn
+++ b/modules/audio_processing/aec3/BUILD.gn
@@ -137,8 +137,8 @@
"../../../rtc_base:safe_minmax",
"../../../rtc_base/system:arch",
"../../../system_wrappers:cpu_features_api",
- "../../../system_wrappers:field_trial_api",
- "../../../system_wrappers:metrics_api",
+ "../../../system_wrappers:field_trial",
+ "../../../system_wrappers:metrics",
"../utility:ooura_fft",
"//third_party/abseil-cpp/absl/types:optional",
]
diff --git a/modules/audio_processing/agc/BUILD.gn b/modules/audio_processing/agc/BUILD.gn
index 65653a0..a5c15ec 100644
--- a/modules/audio_processing/agc/BUILD.gn
+++ b/modules/audio_processing/agc/BUILD.gn
@@ -25,7 +25,7 @@
"../../../rtc_base:logging",
"../../../rtc_base:macromagic",
"../../../rtc_base:safe_minmax",
- "../../../system_wrappers:metrics_api",
+ "../../../system_wrappers:metrics",
"../agc2:level_estimation_agc",
"../vad",
]
diff --git a/modules/audio_processing/agc2/BUILD.gn b/modules/audio_processing/agc2/BUILD.gn
index 45ef968..dc5bbe9 100644
--- a/modules/audio_processing/agc2/BUILD.gn
+++ b/modules/audio_processing/agc2/BUILD.gn
@@ -65,7 +65,7 @@
"../../../rtc_base:checks",
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base:safe_minmax",
- "../../../system_wrappers:metrics_api",
+ "../../../system_wrappers:metrics",
]
}
@@ -114,7 +114,7 @@
"../../../rtc_base:gtest_prod",
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base:safe_minmax",
- "../../../system_wrappers:metrics_api",
+ "../../../system_wrappers:metrics",
]
}
@@ -232,7 +232,7 @@
"../../../rtc_base:checks",
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base:rtc_base_tests_utils",
- "../../../system_wrappers:metrics_default",
+ "../../../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/memory",
]
}
diff --git a/modules/audio_processing/agc2/fixed_gain_controller_unittest.cc b/modules/audio_processing/agc2/fixed_gain_controller_unittest.cc
index bd7c356..db1732a 100644
--- a/modules/audio_processing/agc2/fixed_gain_controller_unittest.cc
+++ b/modules/audio_processing/agc2/fixed_gain_controller_unittest.cc
@@ -16,7 +16,7 @@
#include "modules/audio_processing/agc2/vector_float_frame.h"
#include "modules/audio_processing/logging/apm_data_dumper.h"
#include "rtc_base/gunit.h"
-#include "system_wrappers/include/metrics_default.h"
+#include "system_wrappers/include/metrics.h"
namespace webrtc {
namespace {
diff --git a/modules/audio_processing/test/py_quality_assessment/BUILD.gn b/modules/audio_processing/test/py_quality_assessment/BUILD.gn
index 6a4e31f..4fe9f1c 100644
--- a/modules/audio_processing/test/py_quality_assessment/BUILD.gn
+++ b/modules/audio_processing/test/py_quality_assessment/BUILD.gn
@@ -142,7 +142,6 @@
"../../../..:webrtc_common",
"../../../../common_audio",
"../../../../rtc_base:rtc_base_approved",
- "../../../../system_wrappers:metrics_default",
"../../vad",
]
}
@@ -156,7 +155,6 @@
"../../../..:webrtc_common",
"../../../../common_audio",
"../../../../rtc_base:rtc_base_approved",
- "../../../../system_wrappers:metrics_default",
]
}
diff --git a/modules/bitrate_controller/BUILD.gn b/modules/bitrate_controller/BUILD.gn
index f9960cf..ae66765 100644
--- a/modules/bitrate_controller/BUILD.gn
+++ b/modules/bitrate_controller/BUILD.gn
@@ -36,8 +36,8 @@
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
- "../../system_wrappers:field_trial_api",
- "../../system_wrappers:metrics_api",
+ "../../system_wrappers:field_trial",
+ "../../system_wrappers:metrics",
"../congestion_controller/goog_cc:delay_based_bwe",
"../pacing",
"../remote_bitrate_estimator:remote_bitrate_estimator",
diff --git a/modules/congestion_controller/BUILD.gn b/modules/congestion_controller/BUILD.gn
index 5381a1d..ab3ca83 100644
--- a/modules/congestion_controller/BUILD.gn
+++ b/modules/congestion_controller/BUILD.gn
@@ -44,8 +44,7 @@
"../../rtc_base:ptr_util",
"../../rtc_base:rate_limiter",
"../../system_wrappers",
- "../../system_wrappers:field_trial_api",
- "../../system_wrappers:metrics_api",
+ "../../system_wrappers:field_trial",
"../../system_wrappers:runtime_enabled_features_api",
"../bitrate_controller",
"../pacing",
diff --git a/modules/congestion_controller/bbr/BUILD.gn b/modules/congestion_controller/bbr/BUILD.gn
index a424c11..fd31b9c 100644
--- a/modules/congestion_controller/bbr/BUILD.gn
+++ b/modules/congestion_controller/bbr/BUILD.gn
@@ -37,7 +37,7 @@
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base/experiments:field_trial_parser",
"../../../rtc_base/system:fallthrough",
- "../../../system_wrappers:field_trial_api",
+ "../../../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/types:optional",
]
}
diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn
index b27b28c..334fd22 100644
--- a/modules/congestion_controller/goog_cc/BUILD.gn
+++ b/modules/congestion_controller/goog_cc/BUILD.gn
@@ -40,8 +40,7 @@
"../../../rtc_base/experiments:alr_experiment",
"../../../rtc_base/experiments:field_trial_parser",
"../../../system_wrappers",
- "../../../system_wrappers:field_trial_api",
- "../../../system_wrappers:metrics_api",
+ "../../../system_wrappers:field_trial",
"../../bitrate_controller",
"../../remote_bitrate_estimator",
"../../rtp_rtcp:rtp_rtcp_format",
@@ -62,7 +61,7 @@
"../../../rtc_base:checks",
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base/experiments:alr_experiment",
- "../../../system_wrappers:field_trial_api",
+ "../../../system_wrappers:field_trial",
"../../pacing:interval_budget",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
@@ -91,8 +90,7 @@
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base:rtc_numerics",
"../../../rtc_base:safe_minmax",
- "../../../system_wrappers:field_trial_api",
- "../../../system_wrappers:metrics_api",
+ "../../../system_wrappers:field_trial",
"../../remote_bitrate_estimator",
"../../rtp_rtcp:rtp_rtcp_format",
"//third_party/abseil-cpp/absl/memory",
@@ -113,8 +111,8 @@
"../../../logging:rtc_event_log_api",
"../../../rtc_base:checks",
"../../../rtc_base:rtc_base_approved",
- "../../../system_wrappers:field_trial_api",
- "../../../system_wrappers:metrics_api",
+ "../../../system_wrappers:field_trial",
+ "../../../system_wrappers:metrics",
"../../pacing",
"../../remote_bitrate_estimator",
"//third_party/abseil-cpp/absl/memory",
@@ -134,8 +132,8 @@
"../../../rtc_base:checks",
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base/system:unused",
- "../../../system_wrappers:field_trial_api",
- "../../../system_wrappers:metrics_api",
+ "../../../system_wrappers:field_trial",
+ "../../../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -182,12 +180,12 @@
"../../../rtc_base:rtc_base_tests_utils",
"../../../rtc_base/experiments:alr_experiment",
"../../../system_wrappers",
+ "../../../system_wrappers:field_trial",
"../../../test:field_trial",
"../../../test:test_support",
"../../pacing",
"../../remote_bitrate_estimator",
"../../rtp_rtcp:rtp_rtcp_format",
- "//system_wrappers:field_trial_api",
"//testing/gmock",
"//third_party/abseil-cpp/absl/memory",
]
diff --git a/modules/congestion_controller/rtp/BUILD.gn b/modules/congestion_controller/rtp/BUILD.gn
index 0f2a64e..f7447d2 100644
--- a/modules/congestion_controller/rtp/BUILD.gn
+++ b/modules/congestion_controller/rtp/BUILD.gn
@@ -44,8 +44,7 @@
"../../../rtc_base:sequenced_task_checker",
"../../../rtc_base/experiments:congestion_controller_experiment",
"../../../system_wrappers",
- "../../../system_wrappers:field_trial_api",
- "../../../system_wrappers:metrics_api",
+ "../../../system_wrappers:field_trial",
"../../../system_wrappers:runtime_enabled_features_api",
"../../pacing",
"../../remote_bitrate_estimator",
diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn
index 6b94468..74de174 100644
--- a/modules/desktop_capture/BUILD.gn
+++ b/modules/desktop_capture/BUILD.gn
@@ -378,7 +378,7 @@
"../../rtc_base/system:arch",
"../../system_wrappers",
"../../system_wrappers:cpu_features_api",
- "../../system_wrappers:metrics_api",
+ "../../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/memory",
]
diff --git a/modules/pacing/BUILD.gn b/modules/pacing/BUILD.gn
index 602f396..5039ffa 100644
--- a/modules/pacing/BUILD.gn
+++ b/modules/pacing/BUILD.gn
@@ -33,7 +33,7 @@
"../../rtc_base:rtc_base_approved",
"../../rtc_base/experiments:alr_experiment",
"../../system_wrappers",
- "../../system_wrappers:field_trial_api",
+ "../../system_wrappers:field_trial",
"../../system_wrappers:runtime_enabled_features_api",
"../congestion_controller/goog_cc:alr_detector",
"../remote_bitrate_estimator",
@@ -76,7 +76,7 @@
"../../rtc_base:rtc_base_tests_utils",
"../../rtc_base/experiments:alr_experiment",
"../../system_wrappers",
- "../../system_wrappers:field_trial_api",
+ "../../system_wrappers:field_trial",
"../../system_wrappers:runtime_enabled_features_api",
"../../test:field_trial",
"../../test:test_support",
diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn
index 63564a6..f5fccbd 100644
--- a/modules/remote_bitrate_estimator/BUILD.gn
+++ b/modules/remote_bitrate_estimator/BUILD.gn
@@ -48,8 +48,8 @@
"../../rtc_base:rtc_base_approved",
"../../rtc_base:safe_minmax",
"../../system_wrappers",
- "../../system_wrappers:field_trial_api",
- "../../system_wrappers:metrics_api",
+ "../../system_wrappers:field_trial",
+ "../../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -134,7 +134,7 @@
"../../rtc_base/system:fallthrough",
"../../rtc_base/system:unused",
"../../system_wrappers",
- "../../system_wrappers:field_trial_api",
+ "../../system_wrappers:field_trial",
"../../test:fileutils",
"../../test:perf_test",
"../../test:test_support",
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index e470869..378b552 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -222,8 +222,8 @@
"../../rtc_base/system:fallthrough",
"../../rtc_base/time:timestamp_extrapolator",
"../../system_wrappers",
- "../../system_wrappers:field_trial_api",
- "../../system_wrappers:metrics_api",
+ "../../system_wrappers:field_trial",
+ "../../system_wrappers:metrics",
"../audio_coding:audio_format_conversion",
"../remote_bitrate_estimator",
"//third_party/abseil-cpp/absl/container:inlined_vector",
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 8103d94..b1ba48a 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -26,7 +26,6 @@
"../../rtc_base:rtc_base_approved",
"../../rtc_base/experiments:alr_experiment",
"../../rtc_base/experiments:rtt_mult_experiment",
- "../../system_wrappers:field_trial_api",
"../../system_wrappers:system_wrappers",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -75,7 +74,10 @@
rtc_static_library("video_coding") {
visibility = [ "*" ]
- deps = []
+ deps = [
+ "../../system_wrappers:field_trial",
+ "../../system_wrappers:metrics",
+ ]
sources = [
"codec_timer.cc",
@@ -175,8 +177,6 @@
"../../rtc_base/third_party/base64",
"../../rtc_base/time:timestamp_extrapolator",
"../../system_wrappers",
- "../../system_wrappers:field_trial_api",
- "../../system_wrappers:metrics_api",
"../rtp_rtcp:rtp_rtcp_format",
"../utility:utility",
"//third_party/abseil-cpp/absl/types:optional",
@@ -273,8 +273,7 @@
"../../rtc_base/experiments:quality_scaling_experiment",
"../../rtc_base/system:arch",
"../../system_wrappers",
- "../../system_wrappers:field_trial_api",
- "../../system_wrappers:metrics_api",
+ "../../system_wrappers:field_trial",
"../rtp_rtcp:rtp_rtcp_format",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -303,7 +302,7 @@
"../../media:rtc_media_base",
"../../rtc_base:checks",
"../../rtc_base:rtc_base",
- "../../system_wrappers:metrics_api",
+ "../../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/memory",
"//third_party/libyuv",
]
@@ -422,8 +421,8 @@
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_numerics",
"../../system_wrappers",
- "../../system_wrappers:field_trial_api",
- "../../system_wrappers:metrics_api",
+ "../../system_wrappers:field_trial",
+ "../../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
"//third_party/libyuv",
@@ -852,9 +851,8 @@
"../../rtc_base:rtc_task_queue",
"../../rtc_base:rtc_task_queue_for_test",
"../../system_wrappers",
- "../../system_wrappers:field_trial_api",
- "../../system_wrappers:metrics_api",
- "../../system_wrappers:metrics_default",
+ "../../system_wrappers:field_trial",
+ "../../system_wrappers:metrics",
"../../test:field_trial",
"../../test:fileutils",
"../../test:test_common",
diff --git a/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc b/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
index 098827c..bf40894 100644
--- a/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
+++ b/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
@@ -16,7 +16,6 @@
#include "modules/video_coding/include/video_codec_interface.h"
#include "system_wrappers/include/clock.h"
#include "system_wrappers/include/metrics.h"
-#include "system_wrappers/include/metrics_default.h"
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/modules/video_coding/jitter_buffer_unittest.cc b/modules/video_coding/jitter_buffer_unittest.cc
index e38a7eb..6ae65d6 100644
--- a/modules/video_coding/jitter_buffer_unittest.cc
+++ b/modules/video_coding/jitter_buffer_unittest.cc
@@ -25,7 +25,6 @@
#include "system_wrappers/include/clock.h"
#include "system_wrappers/include/field_trial.h"
#include "system_wrappers/include/metrics.h"
-#include "system_wrappers/include/metrics_default.h"
#include "test/field_trial.h"
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/ortc/BUILD.gn b/ortc/BUILD.gn
index d0fb00f..b9bedd0 100644
--- a/ortc/BUILD.gn
+++ b/ortc/BUILD.gn
@@ -94,7 +94,6 @@
"../rtc_base:rtc_base_tests_main",
"../rtc_base:rtc_base_tests_utils",
"../rtc_base/system:arch",
- "../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
]
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index 0f08990..2d351bb 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -94,8 +94,8 @@
"../rtc_base:weak_ptr",
"../rtc_base/third_party/base64",
"../rtc_base/third_party/sigslot",
- "../system_wrappers:field_trial_api",
- "../system_wrappers:metrics_api",
+ "../system_wrappers:field_trial",
+ "../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -182,7 +182,7 @@
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_base_tests_utils",
"../rtc_base:stringutils",
- "../system_wrappers:metrics_default",
+ "../system_wrappers:metrics",
"../test:test_support",
"//testing/gtest",
"//third_party/abseil-cpp/absl/memory",
diff --git a/p2p/base/p2ptransportchannel_unittest.cc b/p2p/base/p2ptransportchannel_unittest.cc
index 03a3103..76b918c 100644
--- a/p2p/base/p2ptransportchannel_unittest.cc
+++ b/p2p/base/p2ptransportchannel_unittest.cc
@@ -37,7 +37,7 @@
#include "rtc_base/ssladapter.h"
#include "rtc_base/thread.h"
#include "rtc_base/virtualsocketserver.h"
-#include "system_wrappers/include/metrics_default.h"
+#include "system_wrappers/include/metrics.h"
namespace {
diff --git a/p2p/client/basicportallocator_unittest.cc b/p2p/client/basicportallocator_unittest.cc
index 2b6dd3a..a46e53b 100644
--- a/p2p/client/basicportallocator_unittest.cc
+++ b/p2p/client/basicportallocator_unittest.cc
@@ -34,7 +34,7 @@
#include "rtc_base/ssladapter.h"
#include "rtc_base/thread.h"
#include "rtc_base/virtualsocketserver.h"
-#include "system_wrappers/include/metrics_default.h"
+#include "system_wrappers/include/metrics.h"
using rtc::IPAddress;
using rtc::SocketAddress;
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index da5a1c2..c5659d1 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -85,7 +85,7 @@
"../rtc_base:stringutils",
"../rtc_base/third_party/base64",
"../rtc_base/third_party/sigslot",
- "../system_wrappers:metrics_api",
+ "../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -207,8 +207,8 @@
"../rtc_base/third_party/sigslot",
"../stats",
"../system_wrappers",
- "../system_wrappers:field_trial_api",
- "../system_wrappers:metrics_api",
+ "../system_wrappers:field_trial",
+ "../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -330,7 +330,7 @@
"../rtc_base:rtc_base_tests_main",
"../rtc_base:rtc_base_tests_utils",
"../rtc_base/third_party/sigslot",
- "../system_wrappers:metrics_default",
+ "../system_wrappers:metrics",
"../system_wrappers:runtime_enabled_features_default",
"../test:test_support",
"//third_party/abseil-cpp/absl/memory",
@@ -500,6 +500,7 @@
"../rtc_base:checks",
"../rtc_base:stringutils",
"../rtc_base/third_party/base64",
+ "../system_wrappers:metrics",
"../test:fileutils",
"//third_party/abseil-cpp/absl/memory",
]
@@ -541,7 +542,6 @@
"../rtc_base:rtc_base_tests_utils",
"../rtc_base:rtc_task_queue",
"../rtc_base:safe_conversions",
- "../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
"../test:audio_codec_mocks",
"../test:test_support",
diff --git a/pc/peerconnection_histogram_unittest.cc b/pc/peerconnection_histogram_unittest.cc
index f1203e4..b5c07f4 100644
--- a/pc/peerconnection_histogram_unittest.cc
+++ b/pc/peerconnection_histogram_unittest.cc
@@ -24,7 +24,7 @@
#include "rtc_base/fakenetwork.h"
#include "rtc_base/gunit.h"
#include "rtc_base/virtualsocketserver.h"
-#include "system_wrappers/include/metrics_default.h"
+#include "system_wrappers/include/metrics.h"
namespace webrtc {
diff --git a/pc/peerconnection_ice_unittest.cc b/pc/peerconnection_ice_unittest.cc
index a96adfe..965956c 100644
--- a/pc/peerconnection_ice_unittest.cc
+++ b/pc/peerconnection_ice_unittest.cc
@@ -29,7 +29,7 @@
#include "rtc_base/gunit.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/virtualsocketserver.h"
-#include "system_wrappers/include/metrics_default.h"
+#include "system_wrappers/include/metrics.h"
namespace webrtc {
diff --git a/pc/peerconnection_integrationtest.cc b/pc/peerconnection_integrationtest.cc
index 3cf3e58..28e0110 100644
--- a/pc/peerconnection_integrationtest.cc
+++ b/pc/peerconnection_integrationtest.cc
@@ -63,7 +63,7 @@
#include "rtc_base/testcertificateverifier.h"
#include "rtc_base/timeutils.h"
#include "rtc_base/virtualsocketserver.h"
-#include "system_wrappers/include/metrics_default.h"
+#include "system_wrappers/include/metrics.h"
#include "test/gmock.h"
using cricket::ContentInfo;
diff --git a/pc/peerconnection_rtp_unittest.cc b/pc/peerconnection_rtp_unittest.cc
index 1e4bf62..bc21a3e 100644
--- a/pc/peerconnection_rtp_unittest.cc
+++ b/pc/peerconnection_rtp_unittest.cc
@@ -31,7 +31,7 @@
#include "rtc_base/refcountedobject.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/thread.h"
-#include "system_wrappers/include/metrics_default.h"
+#include "system_wrappers/include/metrics.h"
#include "test/gmock.h"
// This file contains tests for RTP Media API-related behavior of
diff --git a/pc/srtpsession_unittest.cc b/pc/srtpsession_unittest.cc
index b1bc9f0..aff3a5f 100644
--- a/pc/srtpsession_unittest.cc
+++ b/pc/srtpsession_unittest.cc
@@ -17,7 +17,7 @@
#include "pc/srtptestutil.h"
#include "rtc_base/gunit.h"
#include "rtc_base/sslstreamadapter.h" // For rtc::SRTP_*
-#include "system_wrappers/include/metrics_default.h"
+#include "system_wrappers/include/metrics.h"
#include "third_party/libsrtp/include/srtp.h"
namespace rtc {
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 1cc08ac..f90b7ee 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -1045,7 +1045,6 @@
":rtc_base",
":stringutils",
"../api/units:time_delta",
- "../test:field_trial",
"../test:test_support",
"system:fallthrough",
"third_party/sigslot",
@@ -1093,8 +1092,8 @@
":rtc_base",
":rtc_base_approved",
":rtc_base_tests_utils",
- "../system_wrappers:field_trial_default",
- "../system_wrappers:metrics_default",
+ "../system_wrappers:field_trial",
+ "../system_wrappers:metrics",
"../test:field_trial",
"../test:fileutils",
"../test:test_support",
diff --git a/rtc_base/experiments/BUILD.gn b/rtc_base/experiments/BUILD.gn
index f5f372f..b10d0c1 100644
--- a/rtc_base/experiments/BUILD.gn
+++ b/rtc_base/experiments/BUILD.gn
@@ -15,7 +15,7 @@
]
deps = [
"../:rtc_base_approved",
- "../../system_wrappers:field_trial_api",
+ "../../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -33,7 +33,6 @@
"../../api/units:data_size",
"../../api/units:time_delta",
"../../rtc_base:checks",
- "../../system_wrappers:field_trial_api",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -45,7 +44,7 @@
]
deps = [
"../:rtc_base_approved",
- "../../system_wrappers:field_trial_api",
+ "../../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -59,7 +58,7 @@
"../:rtc_base_approved",
"../..:webrtc_common",
"../../api/video_codecs:video_codecs_api",
- "../../system_wrappers:field_trial_api",
+ "../../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -71,7 +70,7 @@
]
deps = [
"../:rtc_base_approved",
- "../../system_wrappers:field_trial_api",
+ "../../system_wrappers:field_trial",
]
}
@@ -93,7 +92,7 @@
":rtt_mult_experiment",
"../:rtc_base_tests_main",
"../:rtc_base_tests_utils",
- "../../system_wrappers:field_trial_api",
+ "../../system_wrappers:field_trial",
"../../test:field_trial",
]
}
diff --git a/rtc_base/unittest_main.cc b/rtc_base/unittest_main.cc
index 0b5a39d..a52f727 100644
--- a/rtc_base/unittest_main.cc
+++ b/rtc_base/unittest_main.cc
@@ -19,8 +19,8 @@
#include "rtc_base/logging.h"
#include "rtc_base/ssladapter.h"
#include "rtc_base/sslstreamadapter.h"
-#include "system_wrappers/include/field_trial_default.h"
-#include "system_wrappers/include/metrics_default.h"
+#include "system_wrappers/include/field_trial.h"
+#include "system_wrappers/include/metrics.h"
#include "test/field_trial.h"
#include "test/testsupport/fileutils.h"
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 437dca4..990d964 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -305,7 +305,7 @@
"../logging:rtc_event_log_parser",
"../rtc_base:protobuf_utils",
"../rtc_base:rtc_base_approved",
- "../system_wrappers:field_trial_default",
+ "../system_wrappers:field_trial",
"../test:field_trial",
"../test:fileutils",
"../test:test_support",
@@ -325,7 +325,6 @@
"../modules/audio_processing/vad",
"../rtc_base:rtc_base_approved",
"../rtc_base:safe_minmax",
- "../system_wrappers:metrics_default",
"../test:test_support",
"//testing/gtest",
]
diff --git a/rtc_tools/event_log_visualizer/main.cc b/rtc_tools/event_log_visualizer/main.cc
index 4e5534e..0c3689c 100644
--- a/rtc_tools/event_log_visualizer/main.cc
+++ b/rtc_tools/event_log_visualizer/main.cc
@@ -16,7 +16,7 @@
#include "rtc_tools/event_log_visualizer/plot_base.h"
#include "rtc_tools/event_log_visualizer/plot_protobuf.h"
#include "rtc_tools/event_log_visualizer/plot_python.h"
-#include "system_wrappers/include/field_trial_default.h"
+#include "system_wrappers/include/field_trial.h"
#include "test/field_trial.h"
#include "test/testsupport/fileutils.h"
diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn
index cf6b9eb..a5036dc 100644
--- a/rtc_tools/network_tester/BUILD.gn
+++ b/rtc_tools/network_tester/BUILD.gn
@@ -159,7 +159,6 @@
deps = [
":network_tester",
- "../../system_wrappers:field_trial_default",
]
suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ]
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index a50b93d..9a04322 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -213,7 +213,6 @@
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
- "../system_wrappers:metrics_api",
]
if (is_clang) {
@@ -260,7 +259,7 @@
"../rtc_base:checks",
"../rtc_base:rtc_base",
"../rtc_base/system:fallthrough",
- "../system_wrappers:metrics_api",
+ "../system_wrappers:metrics",
]
if (is_clang) {
@@ -564,7 +563,6 @@
"../modules/video_coding:video_codec_interface",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
- "../system_wrappers:field_trial_api",
]
}
@@ -614,7 +612,6 @@
":base_objc",
":wrapped_native_codec_objc",
"../modules/video_coding:webrtc_vp8",
- "../system_wrappers:metrics_default",
]
}
@@ -633,7 +630,6 @@
":wrapped_native_codec_objc",
"../media:rtc_media_base",
"../modules/video_coding:webrtc_vp9",
- "../system_wrappers:metrics_default",
]
}
@@ -921,6 +917,8 @@
"../pc:peerconnection",
"../rtc_base:checks",
"../rtc_base:rtc_base",
+ "../system_wrappers:field_trial",
+ "../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/memory",
]
@@ -1310,8 +1308,6 @@
":videocodec_objc",
":videotoolbox_objc",
"../rtc_base:rtc_base_approved",
- "../system_wrappers:field_trial_default",
- "../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
]
if (rtc_use_metal_rendering) {
@@ -1452,8 +1448,6 @@
":videocodec_objc",
":videotoolbox_objc",
"../rtc_base:rtc_base_approved",
- "../system_wrappers:field_trial_default",
- "../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
]
if (rtc_use_metal_rendering) {
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index def4b38..23db512 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -133,9 +133,7 @@
":native_api_jni",
":peerconnection_jni",
"../../pc:peerconnection",
- "../../system_wrappers:field_trial_default",
- "../../system_wrappers:metrics_api",
- "../../system_wrappers:metrics_default",
+ "../../system_wrappers:metrics",
"../../system_wrappers:runtime_enabled_features_default",
]
}
@@ -501,7 +499,7 @@
"../../rtc_base:checks",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
- "../../system_wrappers:metrics_api",
+ "../../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -523,7 +521,9 @@
rtc_static_library("video_jni") {
sources = []
- deps = []
+ deps = [
+ "../../system_wrappers:field_trial",
+ ]
sources += [
"src/jni/androidmediacodeccommon.h",
@@ -593,7 +593,6 @@
"../../rtc_base:sequenced_task_checker",
"../../rtc_base:weak_ptr",
"../../rtc_base/memory:aligned_malloc",
- "../../system_wrappers:field_trial_api",
"//third_party/libyuv",
]
}
@@ -670,7 +669,7 @@
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",
"../../rtc_base:stringutils",
- "../../system_wrappers:field_trial_api",
+ "../../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/memory",
]
}
@@ -760,7 +759,7 @@
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
- "../../system_wrappers:metrics_api",
+ "../../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/memory",
]
if (rtc_enable_android_aaudio) {
@@ -987,7 +986,7 @@
"../../modules/audio_device:audio_device_buffer",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
- "../../system_wrappers:metrics_api",
+ "../../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -1009,7 +1008,7 @@
"../../modules/audio_device:audio_device_buffer",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
- "../../system_wrappers:metrics_api",
+ "../../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/types:optional",
]
}
diff --git a/sdk/android/src/jni/androidmetrics.cc b/sdk/android/src/jni/androidmetrics.cc
index 3f96c0a..3aec34a 100644
--- a/sdk/android/src/jni/androidmetrics.cc
+++ b/sdk/android/src/jni/androidmetrics.cc
@@ -15,7 +15,6 @@
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
#include "system_wrappers/include/metrics.h"
-#include "system_wrappers/include/metrics_default.h"
// Enables collection of native histograms and creating them.
namespace webrtc {
diff --git a/sdk/android/src/jni/pc/peerconnectionfactory.cc b/sdk/android/src/jni/pc/peerconnectionfactory.cc
index 35bdd89..3de7955 100644
--- a/sdk/android/src/jni/pc/peerconnectionfactory.cc
+++ b/sdk/android/src/jni/pc/peerconnectionfactory.cc
@@ -37,10 +37,6 @@
#include "sdk/android/src/jni/pc/sslcertificateverifierwrapper.h"
#include "sdk/android/src/jni/pc/video.h"
#include "system_wrappers/include/field_trial.h"
-// Adding 'nogncheck' to disable the gn include headers check.
-// We don't want to depend on 'system_wrappers:field_trial_default' because
-// clients should be able to provide their own implementation.
-#include "system_wrappers/include/field_trial_default.h" // nogncheck
namespace webrtc {
namespace jni {
diff --git a/sdk/objc/api/peerconnection/RTCFieldTrials.h b/sdk/objc/api/peerconnection/RTCFieldTrials.h
index 9b7f41c..effc470 100644
--- a/sdk/objc/api/peerconnection/RTCFieldTrials.h
+++ b/sdk/objc/api/peerconnection/RTCFieldTrials.h
@@ -38,9 +38,8 @@
RTC_EXTERN NSString *RTCFieldTrialTrendlineFilterValue(
size_t windowSize, double smoothingCoeff, double thresholdGain);
-/** Initialize field trials using a dictionary mapping field trial keys to their values. See above
- * for valid keys and values.
- * Must be called before any other call into WebRTC. See:
- * webrtc/system_wrappers/include/field_trial_default.h
+/** Initialize field trials using a dictionary mapping field trial keys to their
+ * values. See above for valid keys and values. Must be called before any other
+ * call into WebRTC. See: webrtc/system_wrappers/include/field_trial.h
*/
RTC_EXTERN void RTCInitFieldTrialDictionary(NSDictionary<NSString *, NSString *> *fieldTrials);
diff --git a/sdk/objc/api/peerconnection/RTCFieldTrials.mm b/sdk/objc/api/peerconnection/RTCFieldTrials.mm
index c81bc55..2212c7d 100644
--- a/sdk/objc/api/peerconnection/RTCFieldTrials.mm
+++ b/sdk/objc/api/peerconnection/RTCFieldTrials.mm
@@ -14,10 +14,7 @@
#import "base/RTCLogging.h"
-// Adding 'nogncheck' to disable the gn include headers check.
-// We don't want to depend on 'system_wrappers:field_trial_default' because
-// clients should be able to provide their own implementation.
-#include "system_wrappers/include/field_trial_default.h" // nogncheck
+#include "system_wrappers/include/field_trial.h"
NSString * const kRTCFieldTrialAudioSendSideBweKey = @"WebRTC-Audio-SendSideBwe";
NSString * const kRTCFieldTrialAudioSendSideBweForVideoKey = @"WebRTC-Audio-SendSideBwe-For-Video";
diff --git a/sdk/objc/api/peerconnection/RTCMetricsSampleInfo+Private.h b/sdk/objc/api/peerconnection/RTCMetricsSampleInfo+Private.h
index 03eb8e7..c465b1c 100644
--- a/sdk/objc/api/peerconnection/RTCMetricsSampleInfo+Private.h
+++ b/sdk/objc/api/peerconnection/RTCMetricsSampleInfo+Private.h
@@ -10,10 +10,7 @@
#import "RTCMetricsSampleInfo.h"
-// Adding 'nogncheck' to disable the gn include headers check.
-// We don't want to depend on 'system_wrappers:metrics_default' because
-// clients should be able to provide their own implementation.
-#include "system_wrappers/include/metrics_default.h" // nogncheck
+#include "system_wrappers/include/metrics.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/stats/BUILD.gn b/stats/BUILD.gn
index d62dbd0..de300f1 100644
--- a/stats/BUILD.gn
+++ b/stats/BUILD.gn
@@ -60,7 +60,6 @@
"../rtc_base:rtc_base_tests_main",
"../rtc_base:rtc_base_tests_utils",
"../rtc_base:rtc_json",
- "../system_wrappers:metrics_default",
]
if (is_android) {
diff --git a/system_wrappers/BUILD.gn b/system_wrappers/BUILD.gn
index 11e6616..a237576 100644
--- a/system_wrappers/BUILD.gn
+++ b/system_wrappers/BUILD.gn
@@ -33,8 +33,6 @@
libs = []
deps = [
":cpu_features_api",
- ":field_trial_api",
- ":metrics_api",
":runtime_enabled_features_api",
"..:webrtc_common",
"../modules:module_api_public",
@@ -101,7 +99,6 @@
visibility = [ "*" ]
public = [
"include/field_trial.h",
- "include/field_trial_default.h",
]
sources = [
"source/field_trial.cc",
@@ -111,23 +108,6 @@
}
}
-# TODO(bugs.webrtc.org/9631): Remove this as soon as Chromium stop depending
-# on it.
-rtc_source_set("field_trial_api") {
- public_deps = [ # no-presubmit-check TODO(webrtc:8603)
- ":field_trial",
- ]
-}
-
-# TODO(bugs.webrtc.org/9631): Remove this as soon as Chromium stop depending
-# on it.
-rtc_source_set("field_trial_default") {
- public_deps = [ # no-presubmit-check TODO(webrtc:8603)
- ":field_trial",
- ]
- visibility = [ "*" ]
-}
-
rtc_source_set("runtime_enabled_features_api") {
visibility = [ "*" ]
sources = [
@@ -151,7 +131,6 @@
visibility = [ "*" ]
public = [
"include/metrics.h",
- "include/metrics_default.h",
]
sources = [
"source/metrics.cc",
@@ -166,28 +145,8 @@
]
}
-# TODO(bugs.webrtc.org/9631): Remove this as soon as Chromium stops depending
-# on it.
-rtc_source_set("metrics_api") {
- visibility = [ "*" ]
- public_deps = [ # no-presubmit-check TODO(webrtc:8603)
- ":metrics",
- ]
-}
-
-# TODO(bugs.webrtc.org/9631): Remove this as soon as Chromium stops depending
-# on it.
-rtc_source_set("metrics_default") {
- visibility = [ "*" ]
- public_deps = [ # no-presubmit-check TODO(webrtc:8603)
- ":metrics",
- ]
-}
-
group("system_wrappers_default") {
deps = [
- ":field_trial_default",
- ":metrics_default",
":runtime_enabled_features_default",
":system_wrappers",
]
@@ -229,8 +188,7 @@
]
deps = [
- ":metrics_api",
- ":metrics_default",
+ ":metrics",
":system_wrappers",
"..:webrtc_common",
"../rtc_base:rtc_base_approved",
diff --git a/system_wrappers/include/field_trial_default.h b/system_wrappers/include/field_trial_default.h
deleted file mode 100644
index 12130c5..0000000
--- a/system_wrappers/include/field_trial_default.h
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
-//
-// Use of this source code is governed by a BSD-style license
-// that can be found in the LICENSE file in the root of the source
-// tree. An additional intellectual property rights grant can be found
-// in the file PATENTS. All contributing project authors may
-// be found in the AUTHORS file in the root of the source tree.
-//
-
-#ifndef SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_DEFAULT_H_
-#define SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_DEFAULT_H_
-
-// TODO(bugs.webrtc.org/9631): Remove this forward header.
-
-#include "system_wrappers/include/field_trial.h"
-
-#endif // SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_DEFAULT_H_
diff --git a/system_wrappers/include/metrics_default.h b/system_wrappers/include/metrics_default.h
deleted file mode 100644
index 5311587..0000000
--- a/system_wrappers/include/metrics_default.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef SYSTEM_WRAPPERS_INCLUDE_METRICS_DEFAULT_H_
-#define SYSTEM_WRAPPERS_INCLUDE_METRICS_DEFAULT_H_
-
-#include "system_wrappers/include/metrics.h"
-
-#endif // SYSTEM_WRAPPERS_INCLUDE_METRICS_DEFAULT_H_
diff --git a/system_wrappers/source/metrics.cc b/system_wrappers/source/metrics.cc
index 662e64e..4aa8770 100644
--- a/system_wrappers/source/metrics.cc
+++ b/system_wrappers/source/metrics.cc
@@ -269,7 +269,7 @@
SampleInfo::~SampleInfo() {}
-// Implementation of global functions in metrics_default.h.
+// Implementation of global functions in metrics.h.
void Enable() {
RTC_DCHECK(g_rtc_histogram_map == nullptr);
#if RTC_DCHECK_IS_ON
diff --git a/system_wrappers/source/metrics_default_unittest.cc b/system_wrappers/source/metrics_default_unittest.cc
index 7491a2f..b2d2023 100644
--- a/system_wrappers/source/metrics_default_unittest.cc
+++ b/system_wrappers/source/metrics_default_unittest.cc
@@ -8,7 +8,6 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "system_wrappers/include/metrics_default.h"
#include "system_wrappers/include/metrics.h"
#include "test/gtest.h"
diff --git a/system_wrappers/source/metrics_unittest.cc b/system_wrappers/source/metrics_unittest.cc
index 4218ad7..dac8177 100644
--- a/system_wrappers/source/metrics_unittest.cc
+++ b/system_wrappers/source/metrics_unittest.cc
@@ -9,7 +9,6 @@
*/
#include "system_wrappers/include/metrics.h"
-#include "system_wrappers/include/metrics_default.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 26f929b..574aa4e 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -16,7 +16,6 @@
testonly = true
deps = [
- ":field_trial",
":rtp_test_utils",
":test_common",
":test_renderer",
@@ -115,8 +114,7 @@
deps = [
"..:webrtc_common",
- "../system_wrappers:field_trial_api",
- "../system_wrappers:field_trial_default",
+ "../system_wrappers:field_trial",
]
}
@@ -212,8 +210,8 @@
":fileutils",
":perf_test",
"../rtc_base:rtc_base",
- "../system_wrappers:field_trial_default",
- "../system_wrappers:metrics_default",
+ "../system_wrappers:field_trial",
+ "../system_wrappers:metrics",
"../system_wrappers:runtime_enabled_features_default",
"//testing/gtest",
]
@@ -615,7 +613,7 @@
"../rtc_base:rtc_base_approved",
"../rtc_base/experiments:congestion_controller_experiment",
"../system_wrappers",
- "../system_wrappers:field_trial_api",
+ "../system_wrappers:field_trial",
"../system_wrappers:runtime_enabled_features_api",
"../video",
"//testing/gtest",
diff --git a/test/field_trial.cc b/test/field_trial.cc
index c4d8b3c..2fb5da4 100644
--- a/test/field_trial.cc
+++ b/test/field_trial.cc
@@ -18,7 +18,6 @@
#include <string>
#include "system_wrappers/include/field_trial.h"
-#include "system_wrappers/include/field_trial_default.h"
namespace webrtc {
namespace {
diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index df834bb..634cefb 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -16,8 +16,6 @@
]
deps = [
"../../rtc_base:rtc_base_approved",
- "../../system_wrappers:field_trial_default",
- "../../system_wrappers:metrics_default",
"../../system_wrappers:runtime_enabled_features_default",
"//testing/libfuzzer:libfuzzer_main",
]
@@ -508,7 +506,7 @@
"../../rtc_base:ptr_util",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:safe_minmax",
- "../../system_wrappers:field_trial_default",
+ "../../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/memory",
]
seed_corpus = "corpora/audio_processing-corpus"
diff --git a/test/fuzzers/audio_processing_configs_fuzzer.cc b/test/fuzzers/audio_processing_configs_fuzzer.cc
index 58ddcdb..8117c52 100644
--- a/test/fuzzers/audio_processing_configs_fuzzer.cc
+++ b/test/fuzzers/audio_processing_configs_fuzzer.cc
@@ -17,7 +17,7 @@
#include "modules/audio_processing/include/audio_processing.h"
#include "rtc_base/arraysize.h"
#include "rtc_base/numerics/safe_minmax.h"
-#include "system_wrappers/include/field_trial_default.h"
+#include "system_wrappers/include/field_trial.h"
#include "test/fuzzers/audio_processing_fuzzer_helper.h"
#include "test/fuzzers/fuzz_data_helper.h"
@@ -156,7 +156,7 @@
void FuzzOneInput(const uint8_t* data, size_t size) {
test::FuzzDataHelper fuzz_data(rtc::ArrayView<const uint8_t>(data, size));
// This string must be in scope during execution, according to documentation
- // for field_trial_default.h. Hence it's created here and not in CreateApm.
+ // for field_trial.h. Hence it's created here and not in CreateApm.
std::string field_trial_string = "";
auto apm = CreateApm(&fuzz_data, &field_trial_string);
diff --git a/test/scenario/BUILD.gn b/test/scenario/BUILD.gn
index 16f3a78..47f3844 100644
--- a/test/scenario/BUILD.gn
+++ b/test/scenario/BUILD.gn
@@ -83,7 +83,7 @@
"../../rtc_base:sequenced_task_checker",
"../../rtc_base:stringutils",
"../../system_wrappers",
- "../../system_wrappers:field_trial_api",
+ "../../system_wrappers:field_trial",
"../../system_wrappers:runtime_enabled_features_api",
"../../video",
"//third_party/abseil-cpp/absl/types:optional",
@@ -114,7 +114,7 @@
"../../system_wrappers",
"../../test:field_trial",
"../../test:test_support",
- "//system_wrappers:field_trial_api",
+ "//system_wrappers:field_trial",
"//testing/gmock",
"//third_party/abseil-cpp/absl/memory",
]
diff --git a/test/test_main.cc b/test/test_main.cc
index 8091b3f..5bb2c10 100644
--- a/test/test_main.cc
+++ b/test/test_main.cc
@@ -13,8 +13,8 @@
#include "rtc_base/flags.h"
#include "rtc_base/logging.h"
#include "rtc_base/thread.h"
-#include "system_wrappers/include/field_trial_default.h"
-#include "system_wrappers/include/metrics_default.h"
+#include "system_wrappers/include/field_trial.h"
+#include "system_wrappers/include/metrics.h"
#include "test/field_trial.h"
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/video/BUILD.gn b/video/BUILD.gn
index cecdd38..a26815b 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -79,8 +79,8 @@
"../rtc_base/experiments:alr_experiment",
"../rtc_base/experiments:quality_scaling_experiment",
"../rtc_base/system:fallthrough",
- "../system_wrappers:field_trial_api",
- "../system_wrappers:metrics_api",
+ "../system_wrappers:field_trial",
+ "../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
@@ -175,7 +175,7 @@
"../rtc_base:timeutils",
"../rtc_base/experiments:quality_scaling_experiment",
"../rtc_base/system:fallthrough",
- "../system_wrappers:field_trial_api",
+ "../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -259,7 +259,7 @@
"../modules/video_coding:webrtc_vp9",
"../rtc_base:rtc_base_approved",
"../rtc_base/experiments:alr_experiment",
- "../system_wrappers:field_trial_default",
+ "../system_wrappers:field_trial",
"../test:field_trial",
"../test:test_common",
"../test:test_support",
@@ -283,8 +283,7 @@
":video_quality_test",
"../rtc_base:logging",
"../rtc_base:rtc_base_approved",
- "../system_wrappers:field_trial_default",
- "../system_wrappers:metrics_default",
+ "../system_wrappers:field_trial",
"../system_wrappers:runtime_enabled_features_default",
"../test:field_trial",
"../test:run_test",
@@ -310,8 +309,7 @@
":video_quality_test",
"../rtc_base:logging",
"../rtc_base:rtc_base_approved",
- "../system_wrappers:field_trial_default",
- "../system_wrappers:metrics_default",
+ "../system_wrappers:field_trial",
"../system_wrappers:runtime_enabled_features_default",
"../test:field_trial",
"../test:run_test",
@@ -336,8 +334,7 @@
":video_quality_test",
"../rtc_base:logging",
"../rtc_base:rtc_base_approved",
- "../system_wrappers:field_trial_default",
- "../system_wrappers:metrics_default",
+ "../system_wrappers:field_trial",
"../system_wrappers:runtime_enabled_features_default",
"../test:field_trial",
"../test:run_test",
@@ -369,10 +366,8 @@
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_json",
"../system_wrappers",
- "../system_wrappers:metrics_default",
"../system_wrappers:runtime_enabled_features_default",
"../test:fake_video_codecs",
- "../test:field_trial",
"../test:rtp_test_utils",
"../test:run_test",
"../test:run_test_interface",
@@ -479,9 +474,8 @@
"../rtc_base:rtc_task_queue_for_test",
"../rtc_base/experiments:alr_experiment",
"../system_wrappers",
- "../system_wrappers:field_trial_default",
- "../system_wrappers:metrics_api",
- "../system_wrappers:metrics_default",
+ "../system_wrappers:field_trial",
+ "../system_wrappers:metrics",
"../test:direct_transport",
"../test:fake_video_codecs",
"../test:field_trial",
diff --git a/video/call_stats_unittest.cc b/video/call_stats_unittest.cc
index 33076c5..71faa69 100644
--- a/video/call_stats_unittest.cc
+++ b/video/call_stats_unittest.cc
@@ -18,7 +18,6 @@
#include "rtc_base/location.h"
#include "rtc_base/task_queue.h"
#include "system_wrappers/include/metrics.h"
-#include "system_wrappers/include/metrics_default.h"
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/video/end_to_end_tests/histogram_tests.cc b/video/end_to_end_tests/histogram_tests.cc
index 4b5ffe9..a4aa0c8 100644
--- a/video/end_to_end_tests/histogram_tests.cc
+++ b/video/end_to_end_tests/histogram_tests.cc
@@ -11,7 +11,6 @@
#include "absl/types/optional.h"
#include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "system_wrappers/include/metrics.h"
-#include "system_wrappers/include/metrics_default.h"
#include "test/call_test.h"
#include "test/function_video_encoder_factory.h"
#include "test/gtest.h"
diff --git a/video/end_to_end_tests/stats_tests.cc b/video/end_to_end_tests/stats_tests.cc
index db50049..af6bbda 100644
--- a/video/end_to_end_tests/stats_tests.cc
+++ b/video/end_to_end_tests/stats_tests.cc
@@ -15,7 +15,6 @@
#include "modules/video_coding/include/video_coding_defines.h"
#include "rtc_base/strings/string_builder.h"
#include "system_wrappers/include/metrics.h"
-#include "system_wrappers/include/metrics_default.h"
#include "system_wrappers/include/sleep.h"
#include "test/call_test.h"
#include "test/fake_encoder.h"
diff --git a/video/full_stack_tests.cc b/video/full_stack_tests.cc
index 382440f..f1065e4 100644
--- a/video/full_stack_tests.cc
+++ b/video/full_stack_tests.cc
@@ -14,7 +14,7 @@
#include "modules/video_coding/codecs/vp9/include/vp9.h"
#include "rtc_base/experiments/alr_experiment.h"
#include "rtc_base/flags.h"
-#include "system_wrappers/include/field_trial_default.h"
+#include "system_wrappers/include/field_trial.h"
#include "test/field_trial.h"
#include "test/gtest.h"
#include "video/video_quality_test.h"
diff --git a/video/receive_statistics_proxy_unittest.cc b/video/receive_statistics_proxy_unittest.cc
index c3b9ae7..d8903e8 100644
--- a/video/receive_statistics_proxy_unittest.cc
+++ b/video/receive_statistics_proxy_unittest.cc
@@ -19,7 +19,6 @@
#include "api/video/video_rotation.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include "system_wrappers/include/metrics.h"
-#include "system_wrappers/include/metrics_default.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/video/rtp_video_stream_receiver_unittest.cc b/video/rtp_video_stream_receiver_unittest.cc
index 9fadae1..ec2bf33 100644
--- a/video/rtp_video_stream_receiver_unittest.cc
+++ b/video/rtp_video_stream_receiver_unittest.cc
@@ -26,7 +26,7 @@
#include "rtc_base/bytebuffer.h"
#include "rtc_base/logging.h"
#include "system_wrappers/include/clock.h"
-#include "system_wrappers/include/field_trial_default.h"
+#include "system_wrappers/include/field_trial.h"
#include "test/field_trial.h"
#include "video/rtp_video_stream_receiver.h"
diff --git a/video/screenshare_loopback.cc b/video/screenshare_loopback.cc
index ec1d59e..1d6e87e 100644
--- a/video/screenshare_loopback.cc
+++ b/video/screenshare_loopback.cc
@@ -13,7 +13,7 @@
#include "rtc_base/flags.h"
#include "rtc_base/logging.h"
#include "rtc_base/stringencode.h"
-#include "system_wrappers/include/field_trial_default.h"
+#include "system_wrappers/include/field_trial.h"
#include "test/field_trial.h"
#include "test/gtest.h"
#include "test/run_test.h"
diff --git a/video/send_delay_stats_unittest.cc b/video/send_delay_stats_unittest.cc
index 65ae961..f43b185 100644
--- a/video/send_delay_stats_unittest.cc
+++ b/video/send_delay_stats_unittest.cc
@@ -11,7 +11,6 @@
#include "video/send_delay_stats.h"
#include "system_wrappers/include/metrics.h"
-#include "system_wrappers/include/metrics_default.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/video/send_statistics_proxy_unittest.cc b/video/send_statistics_proxy_unittest.cc
index fba46b9..3d27c71 100644
--- a/video/send_statistics_proxy_unittest.cc
+++ b/video/send_statistics_proxy_unittest.cc
@@ -16,7 +16,6 @@
#include <vector>
#include "system_wrappers/include/metrics.h"
-#include "system_wrappers/include/metrics_default.h"
#include "test/field_trial.h"
#include "test/gtest.h"
diff --git a/video/sv_loopback.cc b/video/sv_loopback.cc
index 25bfa01..fd72c99 100644
--- a/video/sv_loopback.cc
+++ b/video/sv_loopback.cc
@@ -13,7 +13,7 @@
#include "rtc_base/flags.h"
#include "rtc_base/logging.h"
#include "rtc_base/stringencode.h"
-#include "system_wrappers/include/field_trial_default.h"
+#include "system_wrappers/include/field_trial.h"
#include "test/field_trial.h"
#include "test/gtest.h"
#include "test/run_test.h"
diff --git a/video/video_loopback.cc b/video/video_loopback.cc
index 71a86f7..57590ed 100644
--- a/video/video_loopback.cc
+++ b/video/video_loopback.cc
@@ -12,7 +12,7 @@
#include "rtc_base/flags.h"
#include "rtc_base/logging.h"
-#include "system_wrappers/include/field_trial_default.h"
+#include "system_wrappers/include/field_trial.h"
#include "test/field_trial.h"
#include "test/gtest.h"
#include "test/run_test.h"
diff --git a/video/video_stream_encoder_unittest.cc b/video/video_stream_encoder_unittest.cc
index b97d2cf..32665d5 100644
--- a/video/video_stream_encoder_unittest.cc
+++ b/video/video_stream_encoder_unittest.cc
@@ -20,7 +20,7 @@
#include "rtc_base/fakeclock.h"
#include "rtc_base/logging.h"
#include "rtc_base/refcountedobject.h"
-#include "system_wrappers/include/metrics_default.h"
+#include "system_wrappers/include/metrics.h"
#include "system_wrappers/include/sleep.h"
#include "test/encoder_proxy_factory.h"
#include "test/encoder_settings.h"