| Index: components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java
|
| diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java
|
| index fefad0f12f0936ff8c73b1358eaaa905179abf1d..a26fccc83a24a2386d21c0b6b0056adc6da0f52c 100644
|
| --- a/components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java
|
| +++ b/components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java
|
| @@ -17,8 +17,6 @@ public class BrotliTest extends CronetTestBase {
|
| @Override
|
| protected void setUp() throws Exception {
|
| super.setUp();
|
| - // Load library first to create MockCertVerifier.
|
| - System.loadLibrary("cronet_tests");
|
| assertTrue(Http2TestServer.startHttp2TestServer(
|
| getContext(), SERVER_CERT_PEM, SERVER_KEY_PKCS8_PEM));
|
| }
|
| @@ -26,7 +24,9 @@ public class BrotliTest extends CronetTestBase {
|
| @Override
|
| protected void tearDown() throws Exception {
|
| assertTrue(Http2TestServer.shutdownHttp2TestServer());
|
| - mCronetEngine.shutdown();
|
| + if (mCronetEngine != null) {
|
| + mCronetEngine.shutdown();
|
| + }
|
| super.tearDown();
|
| }
|
|
|
|
|