| Index: pkg/analysis_server/lib/src/socket_server.dart
 | 
| diff --git a/pkg/analysis_server/lib/src/socket_server.dart b/pkg/analysis_server/lib/src/socket_server.dart
 | 
| index 887e1b730b06b51c4482d80d5e6966e306ac0a7c..81a36ef0d4b099212a5663e0b6c12df468521ae6 100644
 | 
| --- a/pkg/analysis_server/lib/src/socket_server.dart
 | 
| +++ b/pkg/analysis_server/lib/src/socket_server.dart
 | 
| @@ -12,7 +12,6 @@ import 'package:analysis_server/src/services/index/index.dart';
 | 
|  import 'package:analyzer/file_system/physical_file_system.dart';
 | 
|  import 'package:analyzer/instrumentation/instrumentation.dart';
 | 
|  import 'package:analyzer/plugin/resolver_provider.dart';
 | 
| -import 'package:analyzer/source/pub_package_map_provider.dart';
 | 
|  import 'package:analyzer/src/generated/sdk.dart';
 | 
|  import 'package:plugin/plugin.dart';
 | 
|  
 | 
| @@ -89,15 +88,8 @@ class SocketServer {
 | 
|        index = createMemoryIndex();
 | 
|      }
 | 
|  
 | 
| -    analysisServer = new AnalysisServer(
 | 
| -        serverChannel,
 | 
| -        resourceProvider,
 | 
| -        new PubPackageMapProvider(resourceProvider, defaultSdk),
 | 
| -        index,
 | 
| -        serverPlugin,
 | 
| -        analysisServerOptions,
 | 
| -        sdkManager,
 | 
| -        instrumentationService,
 | 
| +    analysisServer = new AnalysisServer(serverChannel, resourceProvider, index,
 | 
| +        serverPlugin, analysisServerOptions, sdkManager, instrumentationService,
 | 
|          fileResolverProvider: fileResolverProvider,
 | 
|          packageResolverProvider: packageResolverProvider,
 | 
|          useSingleContextManager: useSingleContextManager,
 | 
| 
 |