diff options
| author | Stefano Duo <stefanoduo@google.com> | 2023-08-03 11:24:54 +0100 |
|---|---|---|
| committer | Stefano Duo <stefanoduo@google.com> | 2023-08-08 09:45:14 +0000 |
| commit | 2beb0754629ca4d7c05c6f229fe5d77c82d405d0 (patch) | |
| tree | 7536f755d7f2d5b53e506c5677a4e589bbf9e4ac /components/cronet/android/test | |
| parent | 8c40b44bf9ffa410fb5ef1c1c815b6bbd6e5d1f4 (diff) | |
| download | cronet-2beb0754629ca4d7c05c6f229fe5d77c82d405d0.tar.gz | |
Cherry-pick https://crrev.com/c/4687421
Original commit message:
Make CronetSources aware of platform Cronet
Cronet from the platform is always loaded from the bootclassloader. This
makes it possible to directly implement CRONET_SOURCE_PLATFORM upstream,
without having to fork the code downstream: all we have to do is check
for the classloader of Cronet's implementation (similarly to what we do
for Google Play Services Cronet).
Test: TH
Bug: 284972285
Change-Id: I62c54fee57dde59de686d714557fe757b74646b8
Diffstat (limited to 'components/cronet/android/test')
| -rw-r--r-- | components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java index 999401ed9..8640cb52d 100644 --- a/components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java +++ b/components/cronet/android/test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java @@ -302,7 +302,7 @@ public final class CronetLoggerTest { if (mTestRule.testingJavaImpl()) { assertEquals(CronetSource.CRONET_SOURCE_FALLBACK, source); } else { - assertEquals(CronetSource.CRONET_SOURCE_STATICALLY_LINKED, source); + assertEquals(CronetSource.CRONET_SOURCE_PLATFORM, source); } assertEquals(1, mTestLogger.callsToLogCronetEngineCreation()); |