cleanup to tools/testing/dart

tools/testing/dart/lib/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:convert' show HtmlEscape;
 import 'dart:io';
 
-import 'dart:convert' show
-    HtmlEscape;
+import '../vendored_pkg/args/args.dart';
 
 import 'path.dart';
-import 'test_suite.dart';  // For TestUtils.
-// TODO(efortuna): Rewrite to not use the args library and simply take an
-// expected number of arguments, so test.dart doesn't rely on the args library?
-// See discussion on https://codereview.chromium.org/11931025/.
-import 'vendored_pkg/args/args.dart';
+import 'test_utils.dart';
 import 'utils.dart';
 
 class DispatchingServer {
   HttpServer server;
   Map<String, Function> _handlers = new Map<String, Function>();
   Function _notFound;
 
   DispatchingServer(this.server,
                     void onError(e),
                     void this._notFound(HttpRequest request)) {
@@ skipping 427 matching lines @@
 class _Entry implements Comparable {
   final String name;
   final String displayName;
 
   _Entry(this.name, this.displayName);
 
   int compareTo(_Entry other) {
     return name.compareTo(other.name);
   }
 }