refactor ContributionSorter to use new API

pkg/analysis_server/lib/src/services/completion/dart_completion_manager.dart

Index: pkg/analysis_server/lib/src/services/completion/dart_completion_manager.dart
diff --git a/pkg/analysis_server/lib/src/services/completion/dart_completion_manager.dart b/pkg/analysis_server/lib/src/services/completion/dart_completion_manager.dart
index 90c3e0b29fdfc767c23cf3f3ad4078b6406af09b..975ecf222ec4c688a8ea274aad5b8b44a390007c 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart_completion_manager.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart_completion_manager.dart
@@ -9,13 +9,13 @@ import 'dart:async';
 import 'package:analysis_server/completion/completion_core.dart'
     show CompletionRequest;
 import 'package:analysis_server/completion/completion_dart.dart' as newApi;
+import 'package:analysis_server/completion/dart/completion_target.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analysis_server/src/services/completion/arglist_contributor.dart';
 import 'package:analysis_server/src/services/completion/combinator_contributor.dart';
 import 'package:analysis_server/src/services/completion/common_usage_computer.dart';
 import 'package:analysis_server/src/services/completion/completion_manager.dart';
-import 'package:analysis_server/src/services/completion/completion_target.dart';
 import 'package:analysis_server/src/services/completion/contribution_sorter.dart';
 import 'package:analysis_server/src/services/completion/dart_completion_cache.dart';
 import 'package:analysis_server/src/services/completion/imported_reference_contributor.dart';
@@ -76,12 +76,12 @@ abstract class DartCompletionContributor {
  * Manages code completion for a given Dart file completion request.
  */
 class DartCompletionManager extends CompletionManager {
-
   /**
    * The [defaultContributionSorter] is a long-lived object that isn't allowed
    * to maintain state between calls to [ContributionSorter#sort(...)].
    */
-  static ContributionSorter defaultContributionSorter = new CommonUsageComputer();
+  static ContributionSorter defaultContributionSorter =
+      new CommonUsageComputer();
 
   final SearchEngine searchEngine;
   final DartCompletionCache cache;
@@ -181,7 +181,8 @@ class DartCompletionManager extends CompletionManager {
           return c.computeFast(request);
         });
       });
-      contributionSorter.sort(request);
+      contributionSorter.sort(
+          new OldRequestWrapper(request), request.suggestions);
       sendResults(request, todo.isEmpty);
       return todo;
     });
@@ -219,7 +220,8 @@ class DartCompletionManager extends CompletionManager {
               performance.logElapseTime(completeTag);
               bool last = --count == 0;
               if (changed || last) {
-                contributionSorter.sort(request);
+                contributionSorter.sort(
+                    new OldRequestWrapper(request), request.suggestions);
                 sendResults(request, last);
               }
             });
@@ -484,6 +486,9 @@ class OldRequestWrapper implements newApi.DartCompletionRequest {
   Source get source => request.source;
 
   @override
+  CompletionTarget get target => request.target;
+
+  @override
   CompilationUnit get unit => request.unit;
 
   @override