diff options
| author | newt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-20 00:28:35 +0000 |
|---|---|---|
| committer | newt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-20 00:28:35 +0000 |
| commit | 2e53058917f32b00cb602bc52354d7308d1729ed (patch) | |
| tree | ca7a9d155be2f194b139b72637f25025e0d73bfb /net/android | |
| parent | 199961a8db5b1d49954eaf10ee7f9f23cce6ec40 (diff) | |
| download | chromium_src-2e53058917f32b00cb602bc52354d7308d1729ed.zip chromium_src-2e53058917f32b00cb602bc52354d7308d1729ed.tar.gz chromium_src-2e53058917f32b00cb602bc52354d7308d1729ed.tar.bz2 | |
Upstream Android-specific net/ changes.
BUG=136750
Review URL: https://chromiumcodereview.appspot.com/11191047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163107 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/android')
| -rw-r--r-- | net/android/java/net_errors_java.template | 1 | ||||
| -rwxr-xr-x | net/android/tools/proxy_test_cases.py | 11 |
2 files changed, 10 insertions, 2 deletions
diff --git a/net/android/java/net_errors_java.template b/net/android/java/net_errors_java.template index c375685..f6c1661 100644 --- a/net/android/java/net_errors_java.template +++ b/net/android/java/net_errors_java.template @@ -8,4 +8,3 @@ public class NetError { #define NET_ERROR(name, value) public static final int ERR_##name = value; #include "net/base/net_error_list.h" } - diff --git a/net/android/tools/proxy_test_cases.py b/net/android/tools/proxy_test_cases.py index 0950902..a377767 100755 --- a/net/android/tools/proxy_test_cases.py +++ b/net/android/tools/proxy_test_cases.py @@ -174,6 +174,7 @@ test_cases = [ { "name": "HttpProxyHostIPv6", "description" : "Test IPv6 https.proxyHost and default port.", + "cpp-only" : "", "properties" : { "http.proxyHost" : "a:b:c::d:1", }, @@ -185,6 +186,7 @@ test_cases = [ { "name": "HttpProxyHostAndPortIPv6", "description" : "Test IPv6 http.proxyHost and http.proxyPort works.", + "cpp-only" : "", "properties" : { "http.proxyHost" : "a:b:c::d:1", "http.proxyPort" : "8080", @@ -197,6 +199,7 @@ test_cases = [ { "name": "HttpProxyHostAndInvalidPort", "description" : "Test invalid http.proxyPort does not crash.", + "cpp-only" : "", "properties" : { "http.proxyHost" : "a:b:c::d:1", "http.proxyPort" : "65536", @@ -302,9 +305,12 @@ class GenerateJava: def Generate(self): for test_case in test_cases: + if test_case.has_key("cpp-only"): + continue if "description" in test_case: self._GenerateDescription(test_case["description"]); print " @SmallTest" + print " @Feature({\"Android-WebView\"})" print " public void test%s() throws Exception {" % test_case["name"] self._GenerateConfiguration(test_case["properties"]) self._GenerateMappings(test_case["mappings"]) @@ -325,7 +331,10 @@ class GenerateJava: def _GenerateMappings(self, mappings): for url in sorted(mappings.iterkeys()): - print " checkMapping(\"%s\", \"%s\");" % (url, mappings[url]) + mapping = mappings[url] + if 'HTTPS' in mapping: + mapping = mapping.replace('HTTPS', 'PROXY') + print " checkMapping(\"%s\", \"%s\");" % (url, mapping) def main(): |