diff options
| author | Mohannad Farrag <aymanm@google.com> | 2023-12-01 11:59:13 +0000 |
|---|---|---|
| committer | Mohannad Farrag <aymanm@google.com> | 2024-01-09 12:08:55 +0000 |
| commit | 03d3e2f473b275e2751a0d0e42e5ced551154cb2 (patch) | |
| tree | f5ad6b37cdc56a6b38f30f565fed86d89b78e8e1 /components/cronet/android/test | |
| parent | 60189f81ed67beacff074e953eeaa97ca6487476 (diff) | |
| download | cronet-03d3e2f473b275e2751a0d0e42e5ced551154cb2.tar.gz | |
Fix incorrectly resolved merge conflict
Accidentally removed FileUtils import which is needed to ensure we use
the same implementation as chromium.
Bug: 314275954
Change-Id: Ib744540871d8ebb1d0010968d6f3e98e65271c56
Diffstat (limited to 'components/cronet/android/test')
| -rw-r--r-- | components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java | 1 |
1 files changed, 1 insertions, 0 deletions
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 efb582636..5ed4cdefd 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 @@ -31,6 +31,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.chromium.base.Log; +import org.chromium.base.FileUtils; import org.chromium.base.PathUtils; import org.chromium.base.test.util.DoNotBatch; import org.chromium.net.CronetTestRule.CronetImplementation; |