Pass a Uri to package:http APIs

test/web_socket_test.dart

@@ -68,16 +68,16 @@ void main() {
   });
 
   group('with a set of allowed origins', () {
-    var server;
-    var url;
+    HttpServer server;
+    Uri url;
     setUp(() async {
       server = await shelf_io.serve(
           webSocketHandler((webSocket) {
             webSocket.sink.close();
           }, allowedOrigins: ['pub.dartlang.org', 'GoOgLe.CoM']),
           'localhost',
           0);
-      url = 'http://localhost:${server.port}/';
+      url = Uri.http('localhost:${server.port}', '');
     });
 
     tearDown(() => server.close());
@@ -117,21 +117,21 @@ void main() {
       webSocket.sink.close();
     }), 'localhost', 0);
 
-    var url = 'http://localhost:${server.port}/';
+    var url = Uri.http('localhost:${server.port}', '');
     var headers = _handshakeHeaders;
     headers['Connection'] = 'Other-Token, Upgrade';
     expect(http.get(url, headers: headers).whenComplete(server.close),
         hasStatus(101));
   });
 
   group('HTTP errors', () {
-    var server;
-    var url;
+    HttpServer server;
+    Uri url;
     setUp(() async {
       server = await shelf_io.serve(webSocketHandler((_) {
         fail('should not create a WebSocket');
       }), 'localhost', 0);
-      url = 'http://localhost:${server.port}/';
+      url = Uri.http('localhost:${server.port}', '');
     });
 
     tearDown(() => server.close());