wptserve: Import the latest revision of wptserve-related files.

third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/serve/serve.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/serve/serve.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/serve/serve.py b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/serve/serve.py
index 3c298829bba3697da6fab2a6cf21d5ecb251ec71..f3d5c56432d51cca9b298894c6deba82e9c1ab2d 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/serve/serve.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/serve/serve.py
@@ -162,9 +162,11 @@ class RoutesBuilder(object):
 
 def build_routes(aliases):
     builder = RoutesBuilder()
-    for url, directory in aliases.items():
+    for alias in aliases:
+        url = alias["url-path"]
+        directory = alias["local-dir"]
         if not url.startswith("/") or len(directory) == 0:
-            logger.error("A map entry of 'aliases' must be \"/<url-path>\": \"<local-directory>\"")
+            logger.error("\"url-path\" value must start with '/'.")
             continue
         if url.endswith("/"):
             builder.add_mount_point(url, directory)
@@ -513,7 +515,7 @@ def set_computed_defaults(config):
         config["ws_doc_root"] = os.path.join(root, "websockets", "handlers")
 
     if not value_set(config, "aliases"):
-        config["aliases"] = {}
+        config["aliases"] = []
 
 
 def merge_json(base_obj, override_obj):