From 17f487841941677f5fda07759d70a7fdb6eabfcb Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Fri, 28 Sep 2018 08:51:10 +0200 Subject: [PATCH] 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 Reviewed-by: Karl Wiberg Cr-Commit-Position: refs/heads/master@{#24878} --- BUILD.gn | 7 +-- api/video_codecs/BUILD.gn | 2 +- api/video_codecs/test/BUILD.gn | 1 - audio/BUILD.gn | 4 +- call/BUILD.gn | 12 ++--- call/call_perf_tests.cc | 2 +- examples/BUILD.gn | 15 ------- examples/androidnativeapi/BUILD.gn | 2 - logging/BUILD.gn | 2 - media/BUILD.gn | 9 ++-- modules/audio_coding/BUILD.gn | 16 +++---- .../audio_coding/neteq/tools/neteq_rtpplay.cc | 2 +- modules/audio_device/BUILD.gn | 6 +-- modules/audio_mixer/BUILD.gn | 3 +- modules/audio_processing/BUILD.gn | 6 +-- modules/audio_processing/aec/BUILD.gn | 2 +- modules/audio_processing/aec3/BUILD.gn | 4 +- modules/audio_processing/agc/BUILD.gn | 2 +- modules/audio_processing/agc2/BUILD.gn | 6 +-- .../agc2/fixed_gain_controller_unittest.cc | 2 +- .../test/py_quality_assessment/BUILD.gn | 2 - modules/bitrate_controller/BUILD.gn | 4 +- modules/congestion_controller/BUILD.gn | 3 +- modules/congestion_controller/bbr/BUILD.gn | 2 +- .../congestion_controller/goog_cc/BUILD.gn | 18 ++++---- modules/congestion_controller/rtp/BUILD.gn | 3 +- modules/desktop_capture/BUILD.gn | 2 +- modules/pacing/BUILD.gn | 4 +- modules/remote_bitrate_estimator/BUILD.gn | 6 +-- modules/rtp_rtcp/BUILD.gn | 4 +- modules/video_coding/BUILD.gn | 22 +++++----- .../codecs/vp8/screenshare_layers_unittest.cc | 1 - .../video_coding/jitter_buffer_unittest.cc | 1 - ortc/BUILD.gn | 1 - p2p/BUILD.gn | 6 +-- p2p/base/p2ptransportchannel_unittest.cc | 2 +- p2p/client/basicportallocator_unittest.cc | 2 +- pc/BUILD.gn | 10 ++--- pc/peerconnection_histogram_unittest.cc | 2 +- pc/peerconnection_ice_unittest.cc | 2 +- pc/peerconnection_integrationtest.cc | 2 +- pc/peerconnection_rtp_unittest.cc | 2 +- pc/srtpsession_unittest.cc | 2 +- rtc_base/BUILD.gn | 5 +-- rtc_base/experiments/BUILD.gn | 11 +++-- rtc_base/unittest_main.cc | 4 +- rtc_tools/BUILD.gn | 3 +- rtc_tools/event_log_visualizer/main.cc | 2 +- rtc_tools/network_tester/BUILD.gn | 1 - sdk/BUILD.gn | 12 ++--- sdk/android/BUILD.gn | 19 ++++---- sdk/android/src/jni/androidmetrics.cc | 1 - .../src/jni/pc/peerconnectionfactory.cc | 4 -- sdk/objc/api/peerconnection/RTCFieldTrials.h | 7 ++- sdk/objc/api/peerconnection/RTCFieldTrials.mm | 5 +-- .../RTCMetricsSampleInfo+Private.h | 5 +-- stats/BUILD.gn | 1 - system_wrappers/BUILD.gn | 44 +------------------ system_wrappers/include/field_trial_default.h | 18 -------- system_wrappers/include/metrics_default.h | 16 ------- system_wrappers/source/metrics.cc | 2 +- .../source/metrics_default_unittest.cc | 1 - system_wrappers/source/metrics_unittest.cc | 1 - test/BUILD.gn | 10 ++--- test/field_trial.cc | 1 - test/fuzzers/BUILD.gn | 4 +- .../audio_processing_configs_fuzzer.cc | 4 +- test/scenario/BUILD.gn | 4 +- test/test_main.cc | 4 +- video/BUILD.gn | 24 ++++------ video/call_stats_unittest.cc | 1 - video/end_to_end_tests/histogram_tests.cc | 1 - video/end_to_end_tests/stats_tests.cc | 1 - video/full_stack_tests.cc | 2 +- video/receive_statistics_proxy_unittest.cc | 1 - video/rtp_video_stream_receiver_unittest.cc | 2 +- video/screenshare_loopback.cc | 2 +- video/send_delay_stats_unittest.cc | 1 - video/send_statistics_proxy_unittest.cc | 1 - video/sv_loopback.cc | 2 +- video/video_loopback.cc | 2 +- video/video_stream_encoder_unittest.cc | 2 +- 82 files changed, 138 insertions(+), 301 deletions(-) delete mode 100644 system_wrappers/include/field_trial_default.h delete mode 100644 system_wrappers/include/metrics_default.h diff --git a/BUILD.gn b/BUILD.gn index 3f06fa9da4..f3aae92b55 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -401,11 +401,7 @@ if (!build_with_chromium) { ] 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 @@ if (rtc_include_tests) { "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 003647986f..55674d0901 100644 --- a/api/video_codecs/BUILD.gn +++ b/api/video_codecs/BUILD.gn @@ -103,7 +103,7 @@ rtc_static_library("rtc_software_fallback_wrappers") { "../../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 18943095f5..fa191625a1 100644 --- a/api/video_codecs/test/BUILD.gn +++ b/api/video_codecs/test/BUILD.gn @@ -26,7 +26,6 @@ if (rtc_include_tests) { "../../../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 ae4c67e6ec..7d3d6b7436 100644 --- a/audio/BUILD.gn +++ b/audio/BUILD.gn @@ -82,8 +82,8 @@ rtc_static_library("audio") { "../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 b485ead55c..e359995bf5 100644 --- a/call/BUILD.gn +++ b/call/BUILD.gn @@ -129,7 +129,7 @@ rtc_source_set("rtp_sender") { "../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_source_set("bitrate_allocator") { "../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_static_library("call") { "../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 @@ if (rtc_include_tests) { "../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 b8b460135e..03c2db831a 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 2bf01448e7..09a0c0bcd4 100644 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -220,13 +220,11 @@ if (is_ios || (is_mac && target_cpu != "x86")) { # 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 @@ if (is_ios || (is_mac && target_cpu != "x86")) { "../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 @@ if (is_linux || is_win) { "../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 @@ if (is_linux || is_win) { "../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 @@ if (is_linux || is_win) { "../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 @@ if (is_linux || is_win) { "../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 @@ if (is_win || is_android) { "../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 @@ if (!build_with_chromium) { "../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 f96fab2e8e..b76b5440e5 100644 --- a/examples/androidnativeapi/BUILD.gn +++ b/examples/androidnativeapi/BUILD.gn @@ -60,8 +60,6 @@ if (is_android) { "//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 0269485b8f..cb22af4a07 100644 --- a/logging/BUILD.gn +++ b/logging/BUILD.gn @@ -350,8 +350,6 @@ if (rtc_enable_protobuf) { "../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 8b6de8dcfb..2f01620544 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -136,7 +136,6 @@ rtc_static_library("rtc_media_base") { "../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 @@ rtc_static_library("rtc_internal_video_codecs") { 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_static_library("rtc_internal_video_codecs") { "../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_static_library("rtc_audio_video") { "../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_static_library("rtc_audio_video") { "../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 @@ if (rtc_include_tests) { "../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 b18d50c2c7..c9b75a5a17 100644 --- a/modules/audio_coding/BUILD.gn +++ b/modules/audio_coding/BUILD.gn @@ -117,12 +117,12 @@ rtc_static_library("audio_coding") { } 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_static_library("webrtc_opus") { "../../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_static_library("audio_network_adaptor") { "../../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_static_library("neteq") { "../../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 @@ if (rtc_include_tests) { "../../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 @@ if (rtc_include_tests) { ":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 @@ if (rtc_include_tests) { "../..: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 d2dcdae482..25e8cd8816 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 2759da4843..55fec7341c 100644 --- a/modules/audio_device/BUILD.gn +++ b/modules/audio_device/BUILD.gn @@ -72,7 +72,7 @@ if (rtc_include_internal_audio_device && is_ios) { "../../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_source_set("audio_device_buffer") { "../../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_source_set("audio_device_impl") { "../../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 da54e7bc97..bd3b106d3d 100644 --- a/modules/audio_mixer/BUILD.gn +++ b/modules/audio_mixer/BUILD.gn @@ -45,8 +45,7 @@ rtc_static_library("audio_mixer_impl") { "../../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 3f048732f4..78e00917f7 100644 --- a/modules/audio_processing/BUILD.gn +++ b/modules/audio_processing/BUILD.gn @@ -120,8 +120,8 @@ rtc_static_library("audio_processing") { "../../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 @@ if (rtc_include_tests) { "../../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 @@ if (rtc_include_tests) { "../..: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 52441d7fda..294c43f032 100644 --- a/modules/audio_processing/aec/BUILD.gn +++ b/modules/audio_processing/aec/BUILD.gn @@ -40,7 +40,7 @@ rtc_source_set("aec_core") { "../../../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 02b3acf4a2..e631732a45 100644 --- a/modules/audio_processing/aec3/BUILD.gn +++ b/modules/audio_processing/aec3/BUILD.gn @@ -137,8 +137,8 @@ rtc_static_library("aec3") { "../../../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 65653a0d3e..a5c15ecbbc 100644 --- a/modules/audio_processing/agc/BUILD.gn +++ b/modules/audio_processing/agc/BUILD.gn @@ -25,7 +25,7 @@ rtc_source_set("agc") { "../../../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 45ef968506..dc5bbe98f9 100644 --- a/modules/audio_processing/agc2/BUILD.gn +++ b/modules/audio_processing/agc2/BUILD.gn @@ -65,7 +65,7 @@ rtc_source_set("adaptive_digital") { "../../../rtc_base:checks", "../../../rtc_base:rtc_base_approved", "../../../rtc_base:safe_minmax", - "../../../system_wrappers:metrics_api", + "../../../system_wrappers:metrics", ] } @@ -114,7 +114,7 @@ rtc_source_set("fixed_digital") { "../../../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_source_set("fixed_digital_unittests") { "../../../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 bd7c356326..db1732aa47 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 6a4e31f4a4..4fe9f1cbd5 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 @@ rtc_executable("apm_vad") { "../../../..:webrtc_common", "../../../../common_audio", "../../../../rtc_base:rtc_base_approved", - "../../../../system_wrappers:metrics_default", "../../vad", ] } @@ -156,7 +155,6 @@ rtc_executable("sound_level") { "../../../..: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 f9960cf00b..ae6676578d 100644 --- a/modules/bitrate_controller/BUILD.gn +++ b/modules/bitrate_controller/BUILD.gn @@ -36,8 +36,8 @@ rtc_static_library("bitrate_controller") { "../../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 5381a1d90d..ab3ca838b4 100644 --- a/modules/congestion_controller/BUILD.gn +++ b/modules/congestion_controller/BUILD.gn @@ -44,8 +44,7 @@ rtc_static_library("congestion_controller") { "../../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 a424c118f4..fd31b9c755 100644 --- a/modules/congestion_controller/bbr/BUILD.gn +++ b/modules/congestion_controller/bbr/BUILD.gn @@ -37,7 +37,7 @@ rtc_source_set("bbr_controller") { "../../../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 b27b28c526..334fd22a89 100644 --- a/modules/congestion_controller/goog_cc/BUILD.gn +++ b/modules/congestion_controller/goog_cc/BUILD.gn @@ -40,8 +40,7 @@ rtc_static_library("goog_cc") { "../../../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_source_set("alr_detector") { "../../../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_source_set("estimators") { "../../../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 @@ rtc_source_set("delay_based_bwe") { "../../../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_source_set("probe_controller") { "../../../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 @@ if (rtc_include_tests) { "../../../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 0f2a64ecc3..f7447d21ad 100644 --- a/modules/congestion_controller/rtp/BUILD.gn +++ b/modules/congestion_controller/rtp/BUILD.gn @@ -44,8 +44,7 @@ rtc_static_library("congestion_controller") { "../../../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 6b944684e5..74de1747af 100644 --- a/modules/desktop_capture/BUILD.gn +++ b/modules/desktop_capture/BUILD.gn @@ -378,7 +378,7 @@ rtc_static_library("desktop_capture_generic") { "../../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 602f396b88..5039ffadf4 100644 --- a/modules/pacing/BUILD.gn +++ b/modules/pacing/BUILD.gn @@ -33,7 +33,7 @@ rtc_static_library("pacing") { "../../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 @@ if (rtc_include_tests) { "../../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 63564a632f..f5fccbd584 100644 --- a/modules/remote_bitrate_estimator/BUILD.gn +++ b/modules/remote_bitrate_estimator/BUILD.gn @@ -48,8 +48,8 @@ rtc_static_library("remote_bitrate_estimator") { "../../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 @@ if (rtc_include_tests) { "../../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 e470869794..378b5526d1 100644 --- a/modules/rtp_rtcp/BUILD.gn +++ b/modules/rtp_rtcp/BUILD.gn @@ -222,8 +222,8 @@ rtc_static_library("rtp_rtcp") { "../../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 8103d94cca..b1ba48a73b 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -26,7 +26,6 @@ rtc_static_library("encoded_frame") { "../../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("packet") { rtc_static_library("video_coding") { visibility = [ "*" ] - deps = [] + deps = [ + "../../system_wrappers:field_trial", + "../../system_wrappers:metrics", + ] sources = [ "codec_timer.cc", @@ -175,8 +177,6 @@ rtc_static_library("video_coding") { "../../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_source_set("video_coding_utility") { "../../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 @@ rtc_static_library("webrtc_h264") { "../../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_static_library("webrtc_vp8") { "../../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 @@ if (rtc_include_tests) { "../../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 098827c011..bf40894d04 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 e38a7eb936..6ae65d62e9 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 d0fb00f5ca..b9bedd01b9 100644 --- a/ortc/BUILD.gn +++ b/ortc/BUILD.gn @@ -94,7 +94,6 @@ if (rtc_include_tests) { "../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 0f089902a5..2d351bb0fa 100644 --- a/p2p/BUILD.gn +++ b/p2p/BUILD.gn @@ -94,8 +94,8 @@ rtc_static_library("rtc_p2p") { "../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 @@ if (rtc_include_tests) { "../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 03a31032c0..76b918ca1e 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 2b6dd3a9fc..a46e53ba9d 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 da5a1c2135..c5659d1ce4 100644 --- a/pc/BUILD.gn +++ b/pc/BUILD.gn @@ -85,7 +85,7 @@ rtc_static_library("rtc_pc_base") { "../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_static_library("peerconnection") { "../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 @@ if (rtc_include_tests) { "../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 @@ if (rtc_include_tests) { "../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 @@ if (rtc_include_tests) { "../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 f1203e4cb4..b5c07f49ec 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 a96adfef7f..965956c42a 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 3cf3e58407..28e0110355 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 1e4bf62003..bc21a3e295 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 b1bc9f0676..aff3a5f014 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 1cc08ac8bf..f90b7eefa0 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -1045,7 +1045,6 @@ rtc_source_set("rtc_base_tests_utils") { ":rtc_base", ":stringutils", "../api/units:time_delta", - "../test:field_trial", "../test:test_support", "system:fallthrough", "third_party/sigslot", @@ -1093,8 +1092,8 @@ if (rtc_include_tests) { ":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 f5f372ff9e..b10d0c1545 100644 --- a/rtc_base/experiments/BUILD.gn +++ b/rtc_base/experiments/BUILD.gn @@ -15,7 +15,7 @@ rtc_static_library("alr_experiment") { ] deps = [ "../:rtc_base_approved", - "../../system_wrappers:field_trial_api", + "../../system_wrappers:field_trial", "//third_party/abseil-cpp/absl/types:optional", ] } @@ -33,7 +33,6 @@ rtc_static_library("field_trial_parser") { "../../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 @@ rtc_static_library("congestion_controller_experiment") { ] 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_static_library("quality_scaling_experiment") { "../: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 @@ rtc_static_library("rtt_mult_experiment") { ] deps = [ "../:rtc_base_approved", - "../../system_wrappers:field_trial_api", + "../../system_wrappers:field_trial", ] } @@ -93,7 +92,7 @@ if (rtc_include_tests) { ":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 0b5a39da55..a52f727832 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 437dca4069..990d964321 100644 --- a/rtc_tools/BUILD.gn +++ b/rtc_tools/BUILD.gn @@ -305,7 +305,7 @@ if (rtc_include_tests) { "../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 @@ if (rtc_include_tests) { "../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 4e5534e1dc..0c3689c1bc 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 cf6b9eb452..a5036dcea9 100644 --- a/rtc_tools/network_tester/BUILD.gn +++ b/rtc_tools/network_tester/BUILD.gn @@ -159,7 +159,6 @@ if (is_android) { 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 a50b93ded0..9a04322bd5 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -213,7 +213,6 @@ if (is_ios || is_mac) { "../rtc_base:checks", "../rtc_base:rtc_base_approved", "../system_wrappers", - "../system_wrappers:metrics_api", ] if (is_clang) { @@ -260,7 +259,7 @@ if (is_ios || is_mac) { "../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 @@ if (is_ios || is_mac) { "../modules/video_coding:video_codec_interface", "../rtc_base:checks", "../rtc_base:rtc_base_approved", - "../system_wrappers:field_trial_api", ] } @@ -614,7 +612,6 @@ if (is_ios || is_mac) { ":base_objc", ":wrapped_native_codec_objc", "../modules/video_coding:webrtc_vp8", - "../system_wrappers:metrics_default", ] } @@ -633,7 +630,6 @@ if (is_ios || is_mac) { ":wrapped_native_codec_objc", "../media:rtc_media_base", "../modules/video_coding:webrtc_vp9", - "../system_wrappers:metrics_default", ] } @@ -921,6 +917,8 @@ if (is_ios || is_mac) { "../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 @@ if (is_ios || is_mac) { ":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 @@ if (is_ios || is_mac) { ":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 def4b389da..23db5124ee 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -133,9 +133,7 @@ if (is_android) { ":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 @@ if (is_android) { "../../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 @@ if (is_android) { rtc_static_library("video_jni") { sources = [] - deps = [] + deps = [ + "../../system_wrappers:field_trial", + ] sources += [ "src/jni/androidmediacodeccommon.h", @@ -593,7 +593,6 @@ if (is_android) { "../../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 @@ if (is_android) { "../../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 @@ if (is_android) { "../../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 @@ if (is_android) { "../../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 @@ if (is_android) { "../../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 3f96c0a832..3aec34a450 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 35bdd895ac..3de79555a6 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 9b7f41c5bc..effc470686 100644 --- a/sdk/objc/api/peerconnection/RTCFieldTrials.h +++ b/sdk/objc/api/peerconnection/RTCFieldTrials.h @@ -38,9 +38,8 @@ RTC_EXTERN NSString * const kRTCFieldTrialTrendlineFilterKey; 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 *fieldTrials); diff --git a/sdk/objc/api/peerconnection/RTCFieldTrials.mm b/sdk/objc/api/peerconnection/RTCFieldTrials.mm index c81bc55a66..2212c7dec9 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 03eb8e7b8e..c465b1c756 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 d62dbd0f1b..de300f18cf 100644 --- a/stats/BUILD.gn +++ b/stats/BUILD.gn @@ -60,7 +60,6 @@ if (rtc_include_tests) { "../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 11e661656b..a237576997 100644 --- a/system_wrappers/BUILD.gn +++ b/system_wrappers/BUILD.gn @@ -33,8 +33,6 @@ rtc_static_library("system_wrappers") { libs = [] deps = [ ":cpu_features_api", - ":field_trial_api", - ":metrics_api", ":runtime_enabled_features_api", "..:webrtc_common", "../modules:module_api_public", @@ -101,7 +99,6 @@ rtc_source_set("field_trial") { visibility = [ "*" ] public = [ "include/field_trial.h", - "include/field_trial_default.h", ] sources = [ "source/field_trial.cc", @@ -111,23 +108,6 @@ rtc_source_set("field_trial") { } } -# 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 @@ rtc_source_set("metrics") { visibility = [ "*" ] public = [ "include/metrics.h", - "include/metrics_default.h", ] sources = [ "source/metrics.cc", @@ -166,28 +145,8 @@ rtc_source_set("metrics") { ] } -# 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 @@ if (rtc_include_tests) { ] 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 12130c528f..0000000000 --- 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 5311587577..0000000000 --- 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 662e64ef24..4aa8770b82 100644 --- a/system_wrappers/source/metrics.cc +++ b/system_wrappers/source/metrics.cc @@ -269,7 +269,7 @@ SampleInfo::SampleInfo(const std::string& name, 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 7491a2f513..b2d202325f 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 4218ad751d..dac8177e06 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 26f929b502..574aa4e3ce 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -16,7 +16,6 @@ group("test") { testonly = true deps = [ - ":field_trial", ":rtp_test_utils", ":test_common", ":test_renderer", @@ -115,8 +114,7 @@ rtc_source_set("field_trial") { deps = [ "..:webrtc_common", - "../system_wrappers:field_trial_api", - "../system_wrappers:field_trial_default", + "../system_wrappers:field_trial", ] } @@ -212,8 +210,8 @@ if (rtc_include_tests) { ":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_source_set("test_common") { "../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 c4d8b3c337..2fb5da458b 100644 --- a/test/field_trial.cc +++ b/test/field_trial.cc @@ -18,7 +18,6 @@ #include #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 df834bb3f0..634cefb898 100644 --- a/test/fuzzers/BUILD.gn +++ b/test/fuzzers/BUILD.gn @@ -16,8 +16,6 @@ rtc_static_library("webrtc_fuzzer_main") { ] 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 @@ webrtc_fuzzer_test("audio_processing_fuzzer") { "../../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 58ddcdb478..8117c52aaf 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 @@ std::unique_ptr CreateApm(test::FuzzDataHelper* fuzz_data, void FuzzOneInput(const uint8_t* data, size_t size) { test::FuzzDataHelper fuzz_data(rtc::ArrayView(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 16f3a786a4..47f3844212 100644 --- a/test/scenario/BUILD.gn +++ b/test/scenario/BUILD.gn @@ -83,7 +83,7 @@ if (rtc_include_tests) { "../../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 @@ if (rtc_include_tests) { "../../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 8091b3fb74..5bb2c10a58 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 cecdd38ad3..a26815b04a 100644 --- a/video/BUILD.gn +++ b/video/BUILD.gn @@ -79,8 +79,8 @@ rtc_static_library("video") { "../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_source_set("video_stream_encoder_impl") { "../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 @@ if (rtc_include_tests) { "../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 @@ if (rtc_include_tests) { ":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 @@ if (rtc_include_tests) { ":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 @@ if (rtc_include_tests) { ":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 @@ if (rtc_include_tests) { "../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 @@ if (rtc_include_tests) { "../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 33076c518c..71faa692a5 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 4b5ffe931a..a4aa0c810a 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 db500492a7..af6bbda168 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 382440fa78..f1065e4f68 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 c3b9ae752c..d8903e84b7 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 9fadae10f7..ec2bf334e9 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 ec1d59e6a4..1d6e87e71f 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 65ae961a8d..f43b185e1a 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 fba46b9ef9..3d27c712c6 100644 --- a/video/send_statistics_proxy_unittest.cc +++ b/video/send_statistics_proxy_unittest.cc @@ -16,7 +16,6 @@ #include #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 25bfa01dbc..fd72c99912 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 71a86f73d6..57590ed144 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 b97d2cf621..32665d5282 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"