Fix merge resolution in r41267.

pkg/analysis_server/test/integration/integration_tests.dart

Index: pkg/analysis_server/test/integration/integration_tests.dart
diff --git a/pkg/analysis_server/test/integration/integration_tests.dart b/pkg/analysis_server/test/integration/integration_tests.dart
index 28e6b5dcf4b5ee0b5db73575cbedafe528bebf29..ac9d69bc809095d74055e81aac0805fd20aa3d45 100644
--- a/pkg/analysis_server/test/integration/integration_tests.dart
+++ b/pkg/analysis_server/test/integration/integration_tests.dart
@@ -150,7 +150,7 @@ abstract class AbstractAnalysisServerIntegrationTest extends
       expect(serverConnected.isCompleted, isFalse);
       serverConnected.complete();
     });
-    return server.start(null).then((_) {
+    return server.start().then((_) {
       server.listenToOutput(dispatchNotification);
       server.exitCode.then((_) {
         skipShutdown = true;
@@ -684,8 +684,7 @@ class Server {
    * `true`, the server will be started with "--observe" and
    * "--pause-isolates-on-exit", allowing the observatory to be used.
    */
-  Future start(NotificationProcessor notificationProcessor, {bool debugServer:
-      false, bool profileServer: false}) {
+  Future start({bool debugServer: false, bool profileServer: false}) {
     if (_process != null) {
       throw new Exception('Process already started');
     }