Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Unified Diff: components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java

Issue 1536433002: [Cronet] Get Cronet performance test running again (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address Helen's comments Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);

Powered by Google App Engine
This is Rietveld 408576698