simplify contributors by resolving declarations in scope

pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart

Index: pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
diff --git a/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart b/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
index 0504f2264954ad66c98f6e14f9deae76b7572c92..59e5e699c363ae522c3a4a653a3245b7a8d4c8a5 100644
--- a/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
+++ b/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
@@ -383,23 +383,33 @@ abstract class DartCompletionContributorTest extends AbstractContextTest {
   Future computeSuggestions([int times = 200]) async {
     CompletionRequestImpl baseRequest = new CompletionRequestImpl(
         context, provider, searchEngine, testSource, completionOffset);
-    request = new DartCompletionRequestImpl.forRequest(baseRequest);
+
+    // Build the request
+    Completer<DartCompletionRequest> requestCompleter =
+        new Completer<DartCompletionRequest>();
+    DartCompletionRequestImpl
+        .from(baseRequest)
+        .then((DartCompletionRequest request) {
+      requestCompleter.complete(request);
+    });
+    request = await performAnalysis(times, requestCompleter);
+
     var range = new ReplacementRange.compute(request.offset, request.target);
     replacementOffset = range.offset;
     replacementLength = range.length;
-    Completer<List<CompletionSuggestion>> completer =
+    Completer<List<CompletionSuggestion>> suggestionCompleter =
         new Completer<List<CompletionSuggestion>>();
 
     // Request completions
     contributor
         .computeSuggestions(request)
         .then((List<CompletionSuggestion> computedSuggestions) {
-      completer.complete(computedSuggestions);
+      suggestionCompleter.complete(computedSuggestions);
     });
 
     // Perform analysis until the suggestions have been computed
     // or the max analysis cycles ([times]) has been reached
-    suggestions = await performAnalysis(times, completer);
+    suggestions = await performAnalysis(times, suggestionCompleter);
     expect(suggestions, isNotNull, reason: 'expected suggestions');
   }