Make AnalysisServer.onAnalysisComplete a Future and wait for it before refactoring.

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 6f51d828385f8baa883a3de84add065c51d54b7b..c017c636075540493d636c722fc572498a980c7a 100644
--- a/pkg/analysis_server/test/mocks.dart
+++ b/pkg/analysis_server/test/mocks.dart
@@ -67,23 +67,6 @@ Future pumpEventQueue([int times = 50]) {
   return new Future.delayed(Duration.ZERO, () => pumpEventQueue(times - 1));
 }
 
-/**
- * Returns a [Future] that completes when the given [AnalysisServer] finished
- * all its scheduled tasks.
- */
-Future waitForServerOperationsPerformed(AnalysisServer server) {
-  if (server.isAnalysisComplete()) {
-    return new Future.value();
-  }
-  // We use a delayed future to allow microtask events to finish. The
-  // Future.value or Future() constructors use scheduleMicrotask themselves and
-  // would therefore not wait for microtask callbacks that are scheduled after
-  // invoking this method.
-  return new Future.delayed(
-      Duration.ZERO,
-      () => waitForServerOperationsPerformed(server));
-}
-
 typedef void MockServerOperationPerformFunction(AnalysisServer server);
 
 class MockAnalysisContext extends StringTypedMock implements AnalysisContext {