Add package_resolver to dartium DEPS, update both DEPS files.

tools/deps/dartium.deps/DEPS

 
 import gclient_utils
 import os
 
 path = gclient_utils.FindGclientRoot(os.getcwd())
 execfile(os.path.join(path, 'src', 'dart', 'tools', 'deps', 'dartium.deps', 'DEPS.chromium')) # Include proper Chromium DEPS.
 
 # Now we need to override some settings and add some new ones.
 
 vars.update({
@@ skipping 11 matching lines @@
   #   external/github.com/dart-lang/NAME
   # It is ok to add a dependency directly on dart-lang (dart-lang only)
   # github repo until the mirror has been created, but please do file a bug
   # against infra to make that happen.
   "github_mirror":
       "https://chromium.googlesource.com/external/github.com/dart-lang/%s.git",
 
   "args_tag": "@0.13.0",
   "barback_rev" : "@29ee90dbcf77cfd64632fa2797a4c8a4f29a4b51",
   "charcode_tag": "@1.1.0",
-  "collection_rev": "@f6135e6350c63eb3f4dd12953b8d4363faff16fc",
+  "collection_tag": "@1.9.1",
   "crypto_rev" : "@2df57a1e26dd88e8d0614207d4b062c73209917d",
   "csslib_tag" : "@0.12.0",
   "dart2js_info_rev" : "@0a221eaf16aec3879c45719de656680ccb80d8a1",
   "glob_rev": "@704cf75e4f26b417505c5c611bdaacd8808467dd",
   "html_tag" : "@0.12.1+1",
   "http_rev" : "@9b93e1542c753090c50b46ef1592d44bc858bfe7",
   "http_multi_server_tag" : "@1.3.2",
   "http_parser_rev" : "@8b179e36aba985208e4c5fb15cfddd386b6370a4",
   "http_throttle_rev" : "@a81f08be942cdd608883c7b67795c12226abc235",
   "json_rpc_2_rev": "@a38eefd116d910199de205f962af92fed87c164c",
   "kernel_rev": "@9677d68402ea15d0eca6430d64f631bb3e505499",
   "logging_rev": "@85d83e002670545e9039ad3985f0018ab640e597",
   "matcher_tag": "@0.12.0",
   "mime_rev": "@75890811d4af5af080351ba8a2853ad4c8df98dd",
   "metatest_rev": "@e5aa8e4e19fc4188ac2f6d38368a47d8f07c3df1",
   "oauth2_rev": "@1bff41f4d54505c36f2d1a001b83b8b745c452f5",
   "observatory_pub_packages_rev": "@26aad88f1c1915d39bbcbff3cad589e2402fdcf1",
   "package_config_rev": "@0.1.3",
+  "package_resolver_tag": "@1.0.2",
   "path_rev": "@b657c0854d1cf41c014986fa9d2321f1173df805",
   "plugin_tag": "@0.1.0",
   "pool_rev": "@22e12aeb16ad0b626900dbe79e4a25391ddfb28c",
   "pub_rev": "@9d707158fedc86fc2b02f62cdfe804902b098d9d",
   "pub_semver_tag": "@1.2.0",
   "quiver_tag": "@0.21.4",
   "root_certificates_rev": "@aed07942ce98507d2be28cbd29e879525410c7fc",
   "shelf_rev": "@1e87b79b21ac5e6fa2f93576d6c06eaa65285ef4",
   "shelf_web_socket_rev": "@ff170cec2c0e4e5722cdf47c557be63b5035a602",
   "source_span_rev": "@42501132e43599a151ba6727d340e44442f86c05",
@@ skipping 26 matching lines @@
       (Var("github_mirror") % "barback") + Var("barback_rev"),
   "src/dart/third_party/pkg/charcode":
       (Var("github_mirror") % "charcode") + Var("charcode_tag"),
   "src/dart/third_party/pkg/crypto":
       (Var("github_mirror") % "crypto") + Var("crypto_rev"),
   "src/dart/third_party/pkg/csslib":
       (Var("github_mirror") % "csslib") + Var("csslib_tag"),
   "src/dart/third_party/pkg/dart2js_info":
       (Var("github_mirror") % "dart2js_info") + Var("dart2js_info_rev"),
   "src/dart/third_party/pkg/collection":
-      (Var("github_mirror") % "collection") + Var("collection_rev"),
+      (Var("github_mirror") % "collection") + Var("collection_tag"),
   "src/dart/third_party/pkg/glob":
       (Var("github_mirror") % "glob") + Var("glob_rev"),
   "src/dart/third_party/pkg/html":
       (Var("github_mirror") % "html") + Var("html_tag"),
   "src/dart/third_party/pkg/json_rpc_2":
       (Var("github_mirror") % "json_rpc_2") + Var("json_rpc_2_rev"),
   "src/dart/third_party/pkg/http":
       (Var("github_mirror") % "http") + Var("http_rev"),
   "src/dart/third_party/pkg/http_multi_server":
       (Var("github_mirror") % "http_multi_server") +
@@ skipping 10 matching lines @@
       (Var("github_mirror") % "matcher") + Var("matcher_tag"),
   "src/dart/third_party/pkg/metatest":
       (Var("github_mirror") % "metatest") + Var("metatest_rev"),
   "src/dart/third_party/pkg/mime":
       (Var("github_mirror") % "mime") + Var("mime_rev"),
   "src/dart/third_party/pkg/oauth2":
       (Var("github_mirror") % "oauth2") + Var("oauth2_rev"),
   "src/dart/third_party/observatory_pub_packages":
       (Var("github_mirror") % "observatory_pub_packages") +
       Var("observatory_pub_packages_rev"),
-  "src/dart/third_party/pkg/package_config":
+  "src/dart/third_party/pkg_tested/package_config":
       (Var("github_mirror") % "package_config") + Var("package_config_rev"),
+  "src/dart/third_party/pkg_tested/package_resolver":
+      "https://github.com/dart-lang/package_resolver.git" +
+      Var("package_resolver_tag"),
   "src/dart/third_party/pkg/path":
       (Var("github_mirror") % "path") + Var("path_rev"),
   "src/dart/third_party/pkg/plugin":
       (Var("github_mirror") % "plugin") + Var("plugin_tag"),
   "src/dart/third_party/pkg/pool":
       (Var("github_mirror") % "pool") + Var("pool_rev"),
   "src/dart/third_party/pkg/pub":
       (Var("github_mirror") % "pub") + Var("pub_rev"),
   "src/dart/third_party/pkg/pub_semver":
       (Var("github_mirror") % "pub_semver") + Var("pub_semver_tag"),
@@ skipping 83 matching lines @@
     "--no_resume",
     "--bucket",
     "dart-dependencies",
     "--recursive",
     "--auto_platform",
     "--extract",
     "--directory",
     "src/dart/tools/sdks",
   ],
 })
+hooks.append({
+  "name": "unittest",
+  # Unittest is an early version, 0.11.6, of the package "test"
+  # Do not use it in any new tests.
+  "pattern": ".",
+  "action": [
+    "download_from_google_storage",
+    "--no_auth",
+    "--no_resume",
+    "--bucket",
+    "dart-dependencies",
+    "--extract",
+    "-s",
+    "src/dart/third_party/pkg/unittest.tar.gz.sha1",
+  ],
+})