diff options
| author | Mohannad Farrag <aymanm@google.com> | 2023-08-25 15:39:30 +0000 |
|---|---|---|
| committer | Mohannad Farrag <aymanm@google.com> | 2023-08-25 16:40:50 +0000 |
| commit | e26221d2ef91d696dcd6fb270a1739cff22ae04a (patch) | |
| tree | 6cdd7474aab5db6378dcabd86bbc98b215b6622c /components/cronet/android/test | |
| parent | 873ffd05c0fe330b57d4078f4407f8a10fe32117 (diff) | |
| download | cronet-e26221d2ef91d696dcd6fb270a1739cff22ae04a.tar.gz | |
Cronet Import: Fix incorrectly resolved merge conflict
See https://android-review.git.corp.google.com/c/platform/external/cronet/+/2709854/3/components/cronet/android/test/javatests/src/org/chromium/net/NQETest.java
Change-Id: I1e46e4c6d8aebddd34be08f4aac6a74149245ef3
Diffstat (limited to 'components/cronet/android/test')
| -rw-r--r-- | components/cronet/android/test/javatests/src/org/chromium/net/NQETest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/NQETest.java b/components/cronet/android/test/javatests/src/org/chromium/net/NQETest.java index 69109e7b3..3c1aa3f51 100644 --- a/components/cronet/android/test/javatests/src/org/chromium/net/NQETest.java +++ b/components/cronet/android/test/javatests/src/org/chromium/net/NQETest.java @@ -54,7 +54,7 @@ public class NQETest { @Before public void setUp() throws Exception { - assertTrue(NativeTestServer.startNativeTestServer(getContext())); + assertThat(NativeTestServer.startNativeTestServer(mTestRule.getTestFramework().getContext())).isTrue(); mUrl = NativeTestServer.getSuccessURL(); } |