Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy

Passing the extra string argument, blacklist, to the proxy in
chromium.

Need CL in frameworks/base:
https://android-git.corp.google.com/g/#change,112400

And external/chromium:
https://android-git.corp.google.com/g/#change,111832

Change-Id: Ie8ca84b5ebf9701391dbd8a5097638e24ac2cb85

1 files changed, 5 insertions, 4 deletions

diff --git a/Source/WebKit/android/jni/JavaBridge.cpp b/Source/WebKit/android/jni/JavaBridge.cpp
index 92778ef..359af42 100644
--- a/Source/WebKit/android/jni/JavaBridge.cpp
+++ b/Source/WebKit/android/jni/JavaBridge.cpp
@@ -109,7 +109,7 @@ public:
     static void AddPackageNames(JNIEnv* env, jobject obj, jobject packageNames);
     static void AddPackageName(JNIEnv* env, jobject obj, jstring packageName);
     static void RemovePackageName(JNIEnv* env, jobject obj, jstring packageName);
-    static void UpdateProxy(JNIEnv* env, jobject obj, jstring newProxy);
+    static void UpdateProxy(JNIEnv* env, jobject obj, jstring newProxy, jstring newExList);
 
 
 private:
@@ -456,12 +456,13 @@ void JavaBridge::RemovePackageName(JNIEnv* env, jobject obj, jstring packageName
     packageNotifier().removePackageName(jstringToWtfString(env, packageName));
 }
 
-void JavaBridge::UpdateProxy(JNIEnv* env, jobject obj, jstring newProxy)
+void JavaBridge::UpdateProxy(JNIEnv* env, jobject obj, jstring newProxy, jstring newExList)
 {
 #if USE(CHROME_NETWORK_STACK)
     std::string proxy = jstringToStdString(env, newProxy);
-    WebCache::get(false)->proxy()->UpdateProxySettings(proxy);
-    WebCache::get(true)->proxy()->UpdateProxySettings(proxy);
+    std::string exList = jstringToStdString(env, newExList);
+    WebCache::get(false)->proxy()->UpdateProxySettings(proxy, exList);
+    WebCache::get(true)->proxy()->UpdateProxySettings(proxy, exList);
 #endif
 }