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

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

Issue 1536433002: [Cronet] Get Cronet performance test running again (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ignore netty proguard errors Created 4 years, 11 months 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/javatests/src/org/chromium/net/CronetTestBase.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java
index 28aafd3e663892e06a844a0e1ba72c23b001f6fd..f0d6e4850f5e2a8a4b396b5494228d033f91c394 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java
@@ -20,6 +20,7 @@ import java.net.URL;
*/
public class CronetTestBase extends AndroidTestCase {
private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "cronet_test";
+ private static final String LOOPBACK_ADDRESS = "127.0.0.1";
private CronetTestFramework mCronetTestFramework;
// {@code true} when test is being run against system HttpURLConnection implementation.
@@ -163,16 +164,11 @@ public class CronetTestBase extends AndroidTestCase {
* @param isLegacyAPI true if the test should use the legacy API.
*/
protected void registerHostResolver(CronetTestFramework framework, boolean isLegacyAPI) {
- long urlRequestContextAdapter;
if (isLegacyAPI) {
- urlRequestContextAdapter = ((ChromiumUrlRequestFactory) framework.mRequestFactory)
- .getRequestContext()
- .getUrlRequestContextAdapter();
+ CronetTestUtil.registerHostResolverProc(framework.mRequestFactory, LOOPBACK_ADDRESS);
} else {
- urlRequestContextAdapter = ((CronetUrlRequestContext) framework.mCronetEngine)
- .getUrlRequestContextAdapter();
+ CronetTestUtil.registerHostResolverProc(framework.mCronetEngine, LOOPBACK_ADDRESS);
}
- NativeTestServer.registerHostResolverProc(urlRequestContextAdapter, isLegacyAPI);
}
void assertResponseEquals(UrlResponseInfo expected, UrlResponseInfo actual) {

Powered by Google App Engine
This is Rietveld 408576698