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

sdk/lib/io/websocket_impl.dart

Index: sdk/lib/io/websocket_impl.dart
diff --git a/sdk/lib/io/websocket_impl.dart b/sdk/lib/io/websocket_impl.dart
index 3cef0ad606f7c15279ad9d2e3311d67a442466af..f0c5abd53f87fece3cf7554876c25223bf10927e 100644
--- a/sdk/lib/io/websocket_impl.dart
+++ b/sdk/lib/io/websocket_impl.dart
@@ -660,13 +660,13 @@ class _WebSocketImpl extends Stream implements WebSocket {
     }
     String nonce = CryptoUtils.bytesToBase64(nonceData);
 
-    uri = new Uri.fromComponents(scheme: uri.scheme == "wss" ? "https" : "http",
-                                 userInfo: uri.userInfo,
-                                 domain: uri.domain,
-                                 port: uri.port,
-                                 path: uri.path,
-                                 query: uri.query,
-                                 fragment: uri.fragment);
+    uri = new Uri(scheme: uri.scheme == "wss" ? "https" : "http",
+                  userInfo: uri.userInfo,
+                  host: uri.host,
+                  port: uri.port,
+                  path: uri.path,
+                  query: uri.query,
+                  fragment: uri.fragment);
     return _httpClient.openUrl("GET", uri)
       .then((request) {
         // Setup the initial handshake.