| Index: pkg/analysis_server/test/analysis_server_test.dart
 | 
| diff --git a/pkg/analysis_server/test/analysis_server_test.dart b/pkg/analysis_server/test/analysis_server_test.dart
 | 
| index a79dea602ee176ec8c0ac0946cbbdadcd6dcd5ee..3812974eb1a395c59387619953d1268d89d04fbc 100644
 | 
| --- a/pkg/analysis_server/test/analysis_server_test.dart
 | 
| +++ b/pkg/analysis_server/test/analysis_server_test.dart
 | 
| @@ -9,7 +9,6 @@ import 'package:analysis_server/protocol/protocol_constants.dart';
 | 
|  import 'package:analysis_server/protocol/protocol_generated.dart';
 | 
|  import 'package:analysis_server/src/analysis_server.dart';
 | 
|  import 'package:analysis_server/src/domain_server.dart';
 | 
| -import 'package:analysis_server/src/plugin/server_plugin.dart';
 | 
|  import 'package:analyzer/file_system/file_system.dart';
 | 
|  import 'package:analyzer/file_system/memory_file_system.dart';
 | 
|  import 'package:analyzer/instrumentation/instrumentation.dart';
 | 
| @@ -86,18 +85,16 @@ class AnalysisServerTest {
 | 
|      }
 | 
|    }
 | 
|  
 | 
| -  void processRequiredPlugins(ServerPlugin serverPlugin) {
 | 
| +  void processRequiredPlugins() {
 | 
|      List<Plugin> plugins = <Plugin>[];
 | 
|      plugins.addAll(AnalysisEngine.instance.requiredPlugins);
 | 
| -    plugins.add(serverPlugin);
 | 
|  
 | 
|      ExtensionManager manager = new ExtensionManager();
 | 
|      manager.processPlugins(plugins);
 | 
|    }
 | 
|  
 | 
|    void setUp() {
 | 
| -    ServerPlugin serverPlugin = new ServerPlugin();
 | 
| -    processRequiredPlugins(serverPlugin);
 | 
| +    processRequiredPlugins();
 | 
|      channel = new MockServerChannel();
 | 
|      resourceProvider = new MemoryResourceProvider();
 | 
|      // Create an SDK in the mock file system.
 | 
| @@ -107,7 +104,6 @@ class AnalysisServerTest {
 | 
|          channel,
 | 
|          resourceProvider,
 | 
|          packageMapProvider,
 | 
| -        serverPlugin,
 | 
|          new AnalysisServerOptions(),
 | 
|          new DartSdkManager('/', false),
 | 
|          InstrumentationService.NULL_SERVICE);
 | 
| 
 |