Upstream Android-specific net/ changes.

net/android/tools/proxy_test_cases.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Generator script for proxy tests.
 
 See AndroidProxySelectorTest.java
 and net/proxy/proxy_config_service_android_unittest.cc
 
@@ skipping 156 matching lines @@
     },
     "mappings" : {
       "https://example.com/" : "HTTPS httpproxy.com:443",
       "http://example.com/" : "DIRECT",
       "ftp://example.com/" : "DIRECT",
     }
   },
   {
     "name": "HttpProxyHostIPv6",
     "description" : "Test IPv6 https.proxyHost and default port.",
+    "cpp-only" : "",
     "properties" : {
       "http.proxyHost" : "a:b:c::d:1",
     },
     "mappings" : {
       "http://example.com/" : "PROXY [a:b:c::d:1]:80",
       "ftp://example.com/" : "DIRECT",
     }
   },
   {
     "name": "HttpProxyHostAndPortIPv6",
     "description" : "Test IPv6 http.proxyHost and http.proxyPort works.",
+    "cpp-only" : "",
     "properties" : {
       "http.proxyHost" : "a:b:c::d:1",
       "http.proxyPort" : "8080",
     },
     "mappings" : {
       "http://example.com/" : "PROXY [a:b:c::d:1]:8080",
       "ftp://example.com/" : "DIRECT",
     }
   },
   {
     "name": "HttpProxyHostAndInvalidPort",
     "description" : "Test invalid http.proxyPort does not crash.",
+    "cpp-only" : "",
     "properties" : {
       "http.proxyHost" : "a:b:c::d:1",
       "http.proxyPort" : "65536",
     },
     "mappings" : {
       "http://example.com/" : "DIRECT",
       "ftp://example.com/" : "DIRECT",
     }
   },
   {
@@ skipping 85 matching lines @@
   def _GenerateMappings(self, mappings):
     for url in sorted(mappings.iterkeys()):
       print "  TestMapping(\"%s\", \"%s\");" % (url, mappings[url])
 
 
 class GenerateJava:
   """Generate Java test cases"""
 
   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"])
       print "    }"
       print ""
 
   def _GenerateDescription(self, description):
     print "    /**"
     print "     * %s" % description
     print "     *"
     print "     * @throws Exception"
     print "     */"
 
   def _GenerateConfiguration(self, properties):
     for key in sorted(properties.iterkeys()):
       print "        System.setProperty(\"%s\", \"%s\");" % (
           key, properties[key])
 
   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():
   parser = optparse.OptionParser()
   parser.add_option("-j", "--java",
                 action="store_true", dest="java");
   (options, args) = parser.parse_args();
   if options.java:
     generator = GenerateJava()
   else:
     generator = GenerateCPlusPlus()
   generator.Generate()
 
 if __name__ == '__main__':
   main()