Index: components/cronet/android/java/src/org/chromium/net/CronetUrlRequest.java |
diff --git a/components/cronet/android/java/src/org/chromium/net/CronetUrlRequest.java b/components/cronet/android/java/src/org/chromium/net/CronetUrlRequest.java |
index f4ebdb9ad060d7fcf282dd2c75b955fa99a13d96..b54dce26e9a6dd4b5cc570ca288f97e3f6472722 100644 |
--- a/components/cronet/android/java/src/org/chromium/net/CronetUrlRequest.java |
+++ b/components/cronet/android/java/src/org/chromium/net/CronetUrlRequest.java |
@@ -107,17 +107,19 @@ final class CronetUrlRequest implements UrlRequest { |
private final HeadersList mAllHeaders = new HeadersList(); |
private final boolean mWasCached; |
private final String mNegotiatedProtocol; |
+ private final String mProxyServer; |
private Map<String, List<String>> mResponseHeaders; |
private List<Pair<String, String>> mUnmodifiableAllHeaders; |
NativeResponseInfo(String[] urlChain, int httpStatusCode, |
String httpStatusText, boolean wasCached, |
- String negotiatedProtocol) { |
+ String negotiatedProtocol, String proxyServer) { |
mResponseInfoUrlChain = urlChain; |
mHttpStatusCode = httpStatusCode; |
mHttpStatusText = httpStatusText; |
mWasCached = wasCached; |
mNegotiatedProtocol = negotiatedProtocol; |
+ mProxyServer = proxyServer; |
} |
@Override |
@@ -177,6 +179,11 @@ final class CronetUrlRequest implements UrlRequest { |
public String getNegotiatedProtocol() { |
return mNegotiatedProtocol; |
} |
+ |
+ @Override |
+ public String getProxyServer() { |
+ return mProxyServer; |
+ } |
}; |
static final class NativeExtendedResponseInfo implements |
@@ -421,7 +428,8 @@ final class CronetUrlRequest implements UrlRequest { |
httpStatusCode, |
nativeGetHttpStatusText(urlRequestAdapter), |
nativeGetWasCached(urlRequestAdapter), |
- nativeGetNegotiatedProtocol(urlRequestAdapter)); |
+ nativeGetNegotiatedProtocol(urlRequestAdapter), |
+ nativeGetProxyServer(urlRequestAdapter)); |
nativePopulateResponseHeaders(urlRequestAdapter, |
responseInfo.mAllHeaders); |
return responseInfo; |
@@ -702,5 +710,8 @@ final class CronetUrlRequest implements UrlRequest { |
private native String nativeGetNegotiatedProtocol(long nativePtr); |
@NativeClassQualifiedName("CronetURLRequestAdapter") |
+ private native String nativeGetProxyServer(long nativePtr); |
+ |
+ @NativeClassQualifiedName("CronetURLRequestAdapter") |
private native boolean nativeGetWasCached(long nativePtr); |
} |