Merge pull request dart-archive/package_config#3 from dart-lang/normalize_path

Fixed path normalization (Fix dart-lang/package_config#2).

Author: pq

pkgs/package_config/.travis.yml

@@ -1,3 +1,4 @@
 language: dart
+dart: dev
 script: ./tool/travis.sh
 sudo: false

pkgs/package_config/lib/packagemap.dart

@@ -31,7 +31,7 @@ class Packages {
           uri, "uri", "Path must not start with '/'.");
     }
     // Normalizes the path by removing '.' and '..' segments.
-    uri = _normalizePath(uri);
+    uri = uri.normalizePath();
     String path = uri.path;
     var slashIndex = path.indexOf('/');
     String packageName;
@@ -51,10 +51,6 @@ class Packages {
     return packageLocation.resolveUri(new Uri(path: rest));
   }
 
-  /// A stand in for uri.normalizePath(), coming in 1.11
-  static Uri _normalizePath(Uri existingUri) =>
-      new Uri().resolveUri(existingUri);
-
   /// Parses a `packages.cfg` file into a `Packages` object.
   ///
   /// The [baseLocation] is used as a base URI to resolve all relative
@@ -189,12 +185,12 @@ class Packages {
       }
     }
 
-    baseUri = _normalizePath(baseUri);
+    baseUri = baseUri.normalizePath();
     List<String> base = baseUri.pathSegments.toList();
     if (base.isNotEmpty) {
       base = new List<String>.from(base)..removeLast();
     }
-    uri = _normalizePath(uri);
+    uri = uri.normalizePath();
     List<String> target = uri.pathSegments.toList();
     int index = 0;
     while (index < base.length && index < target.length) {