Merge the dart:uri library into dart:core and update the Uri class

samples/swarm/DataSource.dart

 // Copyright (c) 2011, 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 swarmlib;
 
 /** The top-level collection of all sections for a user. */
 // TODO(jimhug): This is known as UserData in the server model.
 class Sections extends IterableBase<Section> {
   final List<Section> _sections;
@@ skipping 169 matching lines @@
       this.srcUrl, this.hasThumbnail, this.textBody,
       {htmlBody: null, bool unread: true, this.error: false})
     : unread = new ObservableValue<bool>(unread), this._htmlBody = htmlBody;
 
   String get htmlBody {
     _ensureLoaded();
     return _htmlBody;
   }
 
   String get dataUri {
-    return Uri.encodeComponent(id).replaceAll('%2F', '/').
+    return SwarmUri.encodeComponent(id).replaceAll('%2F', '/').
         replaceAll('%253A', '%3A');
   }
 
   String get thumbUrl {
     if (!hasThumbnail) return null;
 
     var home;
     if (Sections.runningFromFile) {
       home = 'http://dart.googleplex.com';
     } else {
@@ skipping 30 matching lines @@
     final hasThumbnail = decoder.readBool();
     final author = decoder.readString();
     final dateInSeconds = decoder.readInt();
     final snippet = decoder.readString();
     final date =
         new DateTime.fromMillisecondsSinceEpoch(dateInSeconds*1000, isUtc: true);
     return new Article(source, id, date, title, author, srcUrl, hasThumbnail,
         snippet);
   }
 }