Fix errors in analyzer

pkg/analysis_server/test/integration/integration_tests.dart

Index: pkg/analysis_server/test/integration/integration_tests.dart
diff --git a/pkg/analysis_server/test/integration/integration_tests.dart b/pkg/analysis_server/test/integration/integration_tests.dart
index b1febef25e5cba143be2f0605d93ed16c4379a99..45a766657076745b42ce5bf859aaee913de1e6be 100644
--- a/pkg/analysis_server/test/integration/integration_tests.dart
+++ b/pkg/analysis_server/test/integration/integration_tests.dart
@@ -125,9 +125,6 @@ abstract class AbstractAnalysisServerIntegrationTest
    */
   bool _subscribedToServerStatus = false;
 
-  List<AnalysisError> getErrors(String pathname) =>
-      currentAnalysisErrors[pathname];
-
   AbstractAnalysisServerIntegrationTest() {
     initializeInttestMixin();
   }
@@ -169,6 +166,14 @@ abstract class AbstractAnalysisServerIntegrationTest
     server.debugStdio();
   }
 
+  List<AnalysisError> getErrors(String pathname) =>
+      currentAnalysisErrors[pathname];
+
+  /**
+   * Read a source file with the given absolute [pathname].
+   */
+  String readFile(String pathname) => new File(pathname).readAsStringSync();
+
   @override
   Future sendServerSetSubscriptions(List<ServerService> subscriptions) {
     _subscribedToServerStatus = subscriptions.contains(ServerService.STATUS);
@@ -281,24 +286,6 @@ abstract class AbstractAnalysisServerIntegrationTest
     file.writeAsStringSync(contents);
     return file.resolveSymbolicLinksSync();
   }
-
-  /**
-   * Read a source file with the given absolute [pathname].
-   */
-  String readFile(String pathname) => new File(pathname).readAsStringSync();
-}
-
-/**
- * An error result from a server request.
- */
-class ServerErrorMessage {
-  final Map message;
-
-  ServerErrorMessage(this.message);
-
-  dynamic get error => message['error'];
-
-  String toString() => message.toString();
 }
 
 /**
@@ -558,7 +545,7 @@ class Server {
   /**
    * Stop the server.
    */
-  Future kill(String reason) {
+  Future<int> kill(String reason) {
     debugStdio();
     _recordStdio('FORCIBLY TERMINATING PROCESS: $reason');
     _process.kill();
@@ -771,6 +758,19 @@ class Server {
 }
 
 /**
+ * An error result from a server request.
+ */
+class ServerErrorMessage {
+  final Map message;
+
+  ServerErrorMessage(this.message);
+
+  dynamic get error => message['error'];
+
+  String toString() => message.toString();
+}
+
+/**
  * Matcher that matches a list of objects, each of which satisfies the given
  * matcher.
  */