Fix merge resolution in r41267.

pkg/analysis_server/test/timing/timing_framework.dart

Index: pkg/analysis_server/test/timing/timing_framework.dart
diff --git a/pkg/analysis_server/test/timing/timing_framework.dart b/pkg/analysis_server/test/timing/timing_framework.dart
index a71a4f36ce2f71bca6a2d2c4218030b87a9a6b04..273bef805323ada9f46aec0ec767c0217b6131e9 100644
--- a/pkg/analysis_server/test/timing/timing_framework.dart
+++ b/pkg/analysis_server/test/timing/timing_framework.dart
@@ -90,8 +90,8 @@ abstract class TimingTest extends IntegrationTestMixin {
       serverConnected.complete();
     });
     skipShutdown = true;
-    return server.start(dispatchNotification, profileServer: true).then((params) {
-server.listenToOutput(dispatchNotification);
+    return server.start(profileServer: true).then((params) {
+      server.listenToOutput(dispatchNotification);
       server.exitCode.then((_) {
         skipShutdown = true;
       });