Bug 1372595 - Let resource URL protocol be configurable; r=jgraham

The url fixture is used to access hosted files on the wptserve instance.
This patch makes it possible to choose between different wptserve HTTPDs
based on the protocol.

The default remains the HTTP protocol.

MozReview-Commit-ID: FvtMMUSlB4M

--HG--
extra : rebase_source : 42a25ebc1a0ca6a3d664ba4949711dd11a6f4007

testing/web-platform/meta/MANIFEST.json

@@ -220626,7 +220626,7 @@
    "support"
   ],
   "webdriver/support/fixtures.py": [
-   "6e3aa3d4ba89b4acd2e18af60ad1d7034b2a4e5f",
+   "82f0f3b1c668040fa7a0187f00501a2b0f2e2565",
    "support"
   ],
   "webdriver/support/http_request.py": [

testing/web-platform/tests/webdriver/support/fixtures.py

@@ -172,12 +172,9 @@ def new_session(configuration, request):
 
 
 def url(server_config):
-    def inner(path, query="", fragment=""):
-        rv = urlparse.urlunsplit(("http",
-                                  "%s:%s" % (server_config["host"],
-                                             server_config["ports"]["http"][0]),
-                                  path,
-                                  query,
-                                  fragment))
-        return rv
+    def inner(path, protocol="http", query="", fragment=""):
+        port = server_config["ports"][protocol][0]
+        host = "%s:%s" % (server_config["host"], port)
+        return urlparse.urlunsplit((protocol, host, path, query, fragment))
+
     return inner