diff options
Diffstat (limited to 'chromium/third_party/webrtc/system_wrappers')
3 files changed, 6 insertions, 5 deletions
diff --git a/chromium/third_party/webrtc/system_wrappers/BUILD.gn b/chromium/third_party/webrtc/system_wrappers/BUILD.gn index 1ff2ddd4fda..4b2278c5032 100644 --- a/chromium/third_party/webrtc/system_wrappers/BUILD.gn +++ b/chromium/third_party/webrtc/system_wrappers/BUILD.gn @@ -38,8 +38,8 @@ rtc_library("system_wrappers") { "../rtc_base/synchronization:rw_lock_wrapper", "../rtc_base/system:arch", "../rtc_base/system:rtc_export", - "//third_party/abseil-cpp/absl/types:optional", ] + absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] if (is_android) { if (build_with_mozilla) { @@ -92,8 +92,8 @@ rtc_library("field_trial") { "../rtc_base:checks", "../rtc_base:logging", "../rtc_base:stringutils", - "//third_party/abseil-cpp/absl/strings", ] + absl_deps = [ "//third_party/abseil-cpp/absl/strings" ] } rtc_library("metrics") { diff --git a/chromium/third_party/webrtc/system_wrappers/source/field_trial_unittest.cc b/chromium/third_party/webrtc/system_wrappers/source/field_trial_unittest.cc index fdabe1b7e63..ada6313e674 100644 --- a/chromium/third_party/webrtc/system_wrappers/source/field_trial_unittest.cc +++ b/chromium/third_party/webrtc/system_wrappers/source/field_trial_unittest.cc @@ -32,7 +32,7 @@ TEST(FieldTrialValidationTest, AcceptsValidInputs) { EXPECT_TRUE(FieldTrialsStringIsValid("Audio/Enabled/B/C/Audio/Enabled/")); } -TEST(FieldTrialValidationTest, RejectsBadInputs) { +TEST(FieldTrialValidationDeathTest, RejectsBadInputs) { // Bad delimiters RTC_EXPECT_DEATH(InitFieldTrialsFromString("Audio/EnabledVideo/Disabled/"), "Invalid field trials string:"); @@ -90,7 +90,7 @@ TEST(FieldTrialMergingTest, MergesValidInput) { "Audio/Enabled/Video/Enabled/"); } -TEST(FieldTrialMergingTest, DchecksBadInput) { +TEST(FieldTrialMergingDeathTest, DchecksBadInput) { RTC_EXPECT_DEATH(MergeFieldTrialsStrings("Audio/Enabled/", "garbage"), "Invalid field trials string:"); } diff --git a/chromium/third_party/webrtc/system_wrappers/source/metrics_unittest.cc b/chromium/third_party/webrtc/system_wrappers/source/metrics_unittest.cc index 9e5bc86ba92..7532b2ad830 100644 --- a/chromium/third_party/webrtc/system_wrappers/source/metrics_unittest.cc +++ b/chromium/third_party/webrtc/system_wrappers/source/metrics_unittest.cc @@ -114,7 +114,8 @@ TEST_F(MetricsTest, RtcHistogramsCounts_AddSample) { } #if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID) -TEST_F(MetricsTest, RtcHistogramsCounts_InvalidIndex) { +using MetricsDeathTest = MetricsTest; +TEST_F(MetricsDeathTest, RtcHistogramsCounts_InvalidIndex) { EXPECT_DEATH(RTC_HISTOGRAMS_COUNTS_1000(-1, "Name", kSample), ""); EXPECT_DEATH(RTC_HISTOGRAMS_COUNTS_1000(3, "Name", kSample), ""); EXPECT_DEATH(RTC_HISTOGRAMS_COUNTS_1000(3u, "Name", kSample), ""); |