| Index: components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java
|
| diff --git a/components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java b/components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java
|
| index 3c625a746a279728a8a3e3be82a228a3087e16c4..ce631b8912c2d036a073175f5842648e2293db4a 100644
|
| --- a/components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java
|
| +++ b/components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java
|
| @@ -65,6 +65,8 @@ public class CronetTestFramework {
|
| private LibraryInitType() {}
|
| }
|
|
|
| + private static boolean sLibCronetJavaTestsLoaded;
|
| +
|
| public URLStreamHandlerFactory mStreamHandlerFactory;
|
| public CronetEngine mCronetEngine;
|
| @SuppressWarnings("deprecation") HttpUrlRequestFactory mRequestFactory;
|
| @@ -99,6 +101,13 @@ public class CronetTestFramework {
|
| }
|
| }
|
|
|
| + private static void ensureLibCronetJavaTestsLoaded() {
|
| + if (!sLibCronetJavaTestsLoaded) {
|
| + sLibCronetJavaTestsLoaded = true;
|
| + System.loadLibrary("cronet_javatests");
|
| + }
|
| + }
|
| +
|
| // TODO(crbug.com/547160): Fix this findbugs error and remove the suppression.
|
| @SuppressFBWarnings("EI_EXPOSE_REP2")
|
| public CronetTestFramework(
|
| @@ -106,6 +115,8 @@ public class CronetTestFramework {
|
| mCommandLine = commandLine;
|
| mContext = context;
|
|
|
| + ensureLibCronetJavaTestsLoaded();
|
| +
|
| // Print out extra arguments passed in starting this activity.
|
| if (commandLine != null) {
|
| assertEquals(0, commandLine.length % 2);
|
|
|