Rework instrumentation API

pkg/analysis_server/test/domain_completion_test.dart

Index: pkg/analysis_server/test/domain_completion_test.dart
diff --git a/pkg/analysis_server/test/domain_completion_test.dart b/pkg/analysis_server/test/domain_completion_test.dart
index 95dd24017f47abe2d968789e9722d5987e1dad2a..fafd3919933842c6a23c7963eac809cd3d7f1830 100644
--- a/pkg/analysis_server/test/domain_completion_test.dart
+++ b/pkg/analysis_server/test/domain_completion_test.dart
@@ -51,7 +51,7 @@ class CompletionManagerTest extends AbstractAnalysisTest {
         index,
         new AnalysisServerOptions(),
         new MockSdk(),
-        new NullInstrumentationServer());
+        InstrumentationService.NULL_SERVICE);
   }
 
   void sendRequest(String path) {
@@ -520,7 +520,7 @@ class Test_AnalysisServer extends AnalysisServer {
   Test_AnalysisServer(ServerCommunicationChannel channel,
       ResourceProvider resourceProvider, PackageMapProvider packageMapProvider,
       Index index, AnalysisServerOptions analysisServerOptions, DartSdk defaultSdk,
-      InstrumentationServer instrumentationServer)
+      InstrumentationService instrumentationService)
       : super(
           channel,
           resourceProvider,
@@ -528,7 +528,7 @@ class Test_AnalysisServer extends AnalysisServer {
           index,
           analysisServerOptions,
           defaultSdk,
-          instrumentationServer);
+          instrumentationService);
 
   AnalysisContext getAnalysisContext(String path) {
     return mockContext;