Clean-up and progress on analysis server

pkg/analysis_server/test/mocks.dart

Index: pkg/analysis_server/test/mocks.dart
diff --git a/pkg/analysis_server/test/mocks.dart b/pkg/analysis_server/test/mocks.dart
index d9cfbcc8b070c38f9b88167e8029db31b026b0bc..a5ffb42c8ea61b11e23bb73971e6552afba7aa04 100644
--- a/pkg/analysis_server/test/mocks.dart
+++ b/pkg/analysis_server/test/mocks.dart
@@ -7,6 +7,8 @@ library mocks;
 import 'dart:async';
 import 'dart:io';
 
+import 'package:analyzer/src/generated/engine.dart';
+import 'package:analyzer/src/generated/source.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/channel.dart';
 import 'package:analysis_server/src/protocol.dart';
@@ -82,7 +84,7 @@ class MockServerChannel implements ServerCommunicationChannel {
   }
 
   @override
-  void listen(void onRequest(Request request), {void onError(), void onDone()}) {
+  void listen(void onRequest(Request request), {Function onError, void onDone()}) {
     requestController.stream.listen(onRequest, onError: onError, onDone: onDone);
   }