Tighten up a bunch of types in test.dart.

tools/testing/dart/http_server.dart

 // Copyright (c) 2013, 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.
 
 library http_server;
 
 import 'dart:async';
 import 'dart:io';
 
 import 'dart:convert' show HtmlEscape;
@@ skipping 44 matching lines @@
 ///      as the default. This will serve file lib/BAR from the package PAZ.
 /// /ws: This will upgrade the connection to a WebSocket connection and echo
 ///      all data back to the client.
 ///
 /// In case a path does not refer to a file but rather to a directory, a
 /// directory listing will be displayed.
 
 const PREFIX_BUILDDIR = 'root_build';
 const PREFIX_DARTDIR = 'root_dart';
 
-main(List<String> arguments) {
+void main(List<String> arguments) {
   // This script is in [dart]/tools/testing/dart.
   TestUtils.setDartDirUri(Platform.script.resolve('../../..'));
   /** Convenience method for local testing. */
   var parser = new ArgParser();
   parser.addOption('port',
       abbr: 'p',
       help: 'The main server port we wish to respond to requests.',
       defaultsTo: '0');
   parser.addOption('crossOriginPort',
       abbr: 'c',
@@ skipping 38 matching lines @@
   static final _HARMLESS_REQUEST_PATH_ENDINGS = [
     "/apple-touch-icon.png",
     "/apple-touch-icon-precomposed.png",
     "/favicon.ico",
     "/foo",
     "/bar",
     "/NonExistingFile",
     "IntentionallyMissingFile",
   ];
 
-  List _serverList = [];
-  Uri _buildDirectory = null;
-  Uri _dartDirectory = null;
+  final List<HttpServer> _serverList = [];
+  Uri _buildDirectory;
+  Uri _dartDirectory;
   Uri _packageRoot;
   Uri _packages;
   final bool useContentSecurityPolicy;
   final String runtime;
   DispatchingServer _server;
   SyncPackageResolver _resolver;
 
   TestingServers(String buildDirectory, this.useContentSecurityPolicy,
       [String this.runtime = 'none',
       String dartDirectory,
@@ skipping 73 matching lines @@
 
   void _onError(e) {
     DebugLogger.error('HttpServer: an error occured', e);
   }
 
   Future _startHttpServer(String host, {int port: 0, int allowedPort: -1}) {
     return HttpServer.bind(host, port).then((HttpServer httpServer) {
       var server = new DispatchingServer(httpServer, _onError, _sendNotFound);
       server.addHandler('/echo', _handleEchoRequest);
       server.addHandler('/ws', _handleWebSocketRequest);
-      fileHandler(request) {
+      fileHandler(HttpRequest request) {
         _handleFileOrDirectoryRequest(request, allowedPort);
       }
 
       server.addHandler('/$PREFIX_BUILDDIR', fileHandler);
       server.addHandler('/$PREFIX_DARTDIR', fileHandler);
       server.addHandler('/packages', fileHandler);
       _serverList.add(httpServer);
       return server;
     });
   }
 
-  _handleFileOrDirectoryRequest(HttpRequest request, int allowedPort) async {
+  Future _handleFileOrDirectoryRequest(
+      HttpRequest request, int allowedPort) async {
     // Enable browsers to cache file/directory responses.
     var response = request.response;
     response.headers
         .set("Cache-Control", "max-age=$_CACHE_EXPIRATION_IN_SECONDS");
     var path = _getFileUriFromRequestUri(request.uri);
     if (path != null) {
       var file = new File.fromUri(path);
       var directory = new Directory.fromUri(path);
       if (await file.exists()) {
         _sendFileContent(request, response, allowedPort, file);
@@ skipping 62 matching lines @@
     if (pathSegments[0] == PREFIX_BUILDDIR) {
       return _buildDirectory.resolve(pathSegments.skip(1).join('/'));
     }
     if (pathSegments[0] == PREFIX_DARTDIR) {
       return _dartDirectory.resolve(pathSegments.skip(1).join('/'));
     }
     return null;
   }
 
   Future<List<_Entry>> _listDirectory(Directory directory) {
-    var completer = new Completer();
-    var entries = [];
+    var completer = new Completer<List<_Entry>>();
+    var entries = <_Entry>[];
 
     directory.list().listen((FileSystemEntity fse) {
       var segments = fse.uri.pathSegments;
       if (fse is File) {
         var filename = segments.last;
         entries.add(new _Entry(filename, filename));
       } else if (fse is Directory) {
         var dirname = segments[segments.length - 2];
         entries.add(new _Entry(dirname, '$dirname/'));
       }
@@ skipping 33 matching lines @@
     response.done.catchError((e) {
       DebugLogger.warning(
           'HttpServer: error while closing the response stream', e);
     });
   }
 
   void _sendFileContent(
       HttpRequest request, HttpResponse response, int allowedPort, File file) {
     if (allowedPort != -1) {
       var headerOrigin = request.headers.value('Origin');
-      var allowedOrigin;
+      String allowedOrigin;
       if (headerOrigin != null) {
         var origin = Uri.parse(headerOrigin);
         // Allow loading from http://*:$allowedPort in browsers.
         allowedOrigin = '${origin.scheme}://${origin.host}:${allowedPort}';
       } else {
         // IE10 appears to be bugged and is not sending the Origin header
         // when making CORS requests to the same domain but different port.
         allowedOrigin = '*';
       }
 
@@ skipping 82 matching lines @@
 class _Entry implements Comparable<_Entry> {
   final String name;
   final String displayName;
 
   _Entry(this.name, this.displayName);
 
   int compareTo(_Entry other) {
     return name.compareTo(other.name);
   }
 }