Make Uri.parse("data:...") go through UriData.parse.

sdk/lib/core/uri.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of dart.core;
 
 /**
  * A parsed URI, such as a URL.
  *
  * **See also:**
@@ skipping 482 matching lines @@
         break;
       }
       if (char == _SLASH) {
         state = (i == start) ? ALLOW_AUTH : IN_PATH;
         break;
       }
       if (char == _COLON) {
         if (i == start) _fail(uri, start, "Invalid empty scheme");
         scheme = _makeScheme(uri, start, i);
         i++;
+        if (scheme == "data") {
+          // This generates a URI that is (potentially) not path normalized.
+          // Applying part normalization to a non-hierarchial URI isn't
+          // meaningful.
+          return UriData._parse(uri, i, null).uri;
+        }
         pathStart = i;
         if (i == end) {
           char = EOI;
           state = NOT_IN_PATH;
         } else {
           char = uri.codeUnitAt(i);
           if (char == _QUESTION || char == _NUMBER_SIGN) {
             state = NOT_IN_PATH;
           } else if (char == _SLASH) {
             state = ALLOW_AUTH;
@@ skipping 2520 matching lines @@
     String path = _text;
     String query = null;
     int colonIndex = _separatorIndices[0];
     int queryIndex = _text.indexOf('?', colonIndex + 1);
     int end = null;
     if (queryIndex >= 0) {
       query = _text.substring(queryIndex + 1);
       end = queryIndex;
     }
     path = _text.substring(colonIndex + 1, end);
-    // TODO(lrn): This is probably too simple. We should ensure URI
-    // normalization before passing in the raw strings, maybe using
-    // Uri._makePath, Uri._makeQuery.
+    // TODO(lrn): This can generate a URI that isn't path normalized.
+    // That's perfectly reasonable - data URIs are not hierarchical,
+    // but it may make some consumers stumble.
+    // Should we at least do escape normalization?
     _uriCache = new Uri._internal("data", "", null, null, path, query, null);
     return _uriCache;
   }
 
   /**
    * The MIME type of the data URI.
    *
    * A data URI consists of a "media type" followed by data.
    * The media type starts with a MIME type and can be followed by
    * extra parameters.
@@ skipping 289 matching lines @@
   // All non-escape RFC-2396 uric characters.
   //
   //  uric        =  reserved | unreserved | escaped
   //  reserved    =  ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | "$" | ","
   //  unreserved  =  alphanum | mark
   //  mark        =  "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"
   //
   // This is the same characters as in a URI query (which is URI pchar plus '?')
   static const _uricTable = Uri._queryCharTable;
 }