Revert "Merge "Add a method java can send proxy changes to""

This reverts commit c3a805c84165787f1693b3502ce139d6ea405307, reversing
changes made to 062390c915ca7282c88b435ad4fa7b6f157fb5ef.

diff --git a/WebKit/android/jni/JavaBridge.cpp b/WebKit/android/jni/JavaBridge.cpp
index ce16a0f..ad2bc5d 100644 (file)
--- a/WebKit/android/jni/JavaBridge.cpp
+++ b/WebKit/android/jni/JavaBridge.cpp
@@ -44,7 +44,6 @@
 #ifdef ANDROID_INSTRUMENT
 #include "TimeCounter.h"
 #endif
-#include "WebCache.h"
 #include "WebCoreJni.h"
 
 #include <JNIHelp.h>
@@ -109,7 +108,6 @@ 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);
 
 
 private:
@@ -455,15 +453,6 @@ void JavaBridge::RemovePackageName(JNIEnv* env, jobject obj, jstring packageName
     packageNotifier().removePackageName(jstringToWtfString(env, packageName));
 }
 
-void JavaBridge::UpdateProxy(JNIEnv* env, jobject obj, jstring newProxy)
-{
-#if USE(CHROME_NETWORK_STACK)
-    std::string proxy = jstringToStdString(env, newProxy);
-    WebCache::get(false)->proxy()->UpdateProxySettings(proxy);
-    WebCache::get(true)->proxy()->UpdateProxySettings(proxy);
-#endif
-}
-
 
 // ----------------------------------------------------------------------------
 
@@ -493,9 +482,7 @@ static JNINativeMethod gWebCoreJavaBridgeMethods[] = {
     { "addPackageName", "(Ljava/lang/String;)V",
         (void*) JavaBridge::AddPackageName },
     { "removePackageName", "(Ljava/lang/String;)V",
-        (void*) JavaBridge::RemovePackageName },
-    { "updateProxy", "(Ljava/lang/String;)V",
-        (void*) JavaBridge::UpdateProxy }
+        (void*) JavaBridge::RemovePackageName }
 };
 
 int registerJavaBridge(JNIEnv* env)