[Android] Upstream WebView tests and their dependencies.

These are most of the WebView tests that are pending to be upstreamed. Any references to UrlUtils.getTestHttpUrl had to be migrated to alternative approaches. In order to make the tests work as closest as possible to their originals, we have decided to use TestWebServer whenever possible instead of accessing the files directly to prevent any possible subtle issues related to file:// access. This means that most tests will define their own resources within themselves.

Also, some bits of non-WebView code needed to be upstreamed in order to get some of the tests building and passing.


BUG=none

Review URL: https://chromiumcodereview.appspot.com/11026044

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160373 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 2 deletions

diff --git a/net/android/java/src/org/chromium/net/ProxyChangeListener.java b/net/android/java/src/org/chromium/net/ProxyChangeListener.java
index 2fe26e0..9c59bcc 100644
--- a/net/android/java/src/org/chromium/net/ProxyChangeListener.java
+++ b/net/android/java/src/org/chromium/net/ProxyChangeListener.java
@@ -75,9 +75,15 @@ public class ProxyChangeListener {
     }
 
     private void proxySettingsChanged() {
-        if (mNativePtr == 0)
+        if (!sEnabled) {
             return;
-
+        }
+        if (mDelegate != null) {
+          mDelegate.proxySettingsChanged();
+        }
+        if (mNativePtr == 0) {
+          return;
+        }
         // Note that this code currently runs on a MESSAGE_LOOP_UI thread, but
         // the C++ code must run the callbacks on the network thread.
         nativeProxySettingsChanged(mNativePtr);