Convert analysis server over to use ContextBuilder

pkg/analysis_server/test/integration/analysis/highlights_test2.dart

Index: pkg/analysis_server/test/integration/analysis/highlights_test2.dart
diff --git a/pkg/analysis_server/test/integration/analysis/highlights_test2.dart b/pkg/analysis_server/test/integration/analysis/highlights_test2.dart
index bd07449894ad0b1d8a51bfed8d125c4b11678b01..c8d75eec3b4a5ad469586a50317438ed7affacc2 100644
--- a/pkg/analysis_server/test/integration/analysis/highlights_test2.dart
+++ b/pkg/analysis_server/test/integration/analysis/highlights_test2.dart
@@ -20,10 +20,12 @@ main() {
 
 @reflectiveTest
 class AnalysisHighlightsTest extends AbstractAnalysisServerIntegrationTest {
-  Future startServer({int servicesPort, bool checked: true}) {
+  Future startServer(
+      {bool checked: true, int diagnosticPort, int servicesPort}) {
     return server.start(
-        servicesPort: servicesPort,
         checked: checked,
+        diagnosticPort: diagnosticPort,
+        servicesPort: servicesPort,
         useAnalysisHighlight2: true);
   }
 
@@ -109,6 +111,7 @@ int topLevelVariable;
         expect(highlights[type], equals(expected.toSet()));
         highlights.remove(type);
       }
+
       check(HighlightRegionType.ANNOTATION, ['@override']);
       check(HighlightRegionType.BUILT_IN,
           ['as', 'get', 'import', 'set', 'static', 'typedef']);