Fix incorrectly resolved merge-conflict during 121 import
This test has been consistently failing on post-submit. I'm not entirely sure
if it is flaky or not anymore so I will keep the @SkipPresubmit and keep a close eye
on the post-submit to verify that this CL fixes the issue.
Bug: 320434138
Test: TH
Change-Id: I43c63b6aa1cf8aa32a876b7dc8e1e260cf387123
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
index 5ed4cde..5110bbb 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
@@ -1030,6 +1030,9 @@
@Test
@SmallTest
@SkipPresubmit(reason = "b/293141085 flaky test")
+ @IgnoreFor(
+ implementations = {CronetImplementation.AOSP_PLATFORM},
+ reason = "ActiveRequestCount is not available in AOSP")
public void testGetActiveRequestCountWithError() throws Exception {
final String badUrl = "www.unreachable-url.com";
ExperimentalCronetEngine cronetEngine = mTestRule.getTestFramework().startEngine();
