Remove final references to PackageUriResolver

pkg/analyzer/benchmark/errors_in_all_libraries.dart

 #!/usr/bin/env dart
 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /// Resolves this library and everything it transitively imports and generates
 /// errors in all of those libraries. Does this in an infinite loop, starting
 /// from scratch each time, to show how VM warm-up affects things and to make
 /// it easier to connect to this with observatory.
 import 'dart:io';
 
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
+import 'package:analyzer/source/package_map_resolver.dart';
+import 'package:analyzer/src/context/builder.dart';
 import 'package:analyzer/src/dart/sdk/sdk.dart';
 import 'package:analyzer/src/generated/engine.dart';
-import 'package:analyzer/src/generated/java_io.dart';
-import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:analyzer/src/source/source_resource.dart';
 import 'package:path/path.dart' as p;
 
 void main(List<String> args) {
   // Assumes you have run "pub get" in the analyzer directory itself and uses
   // that "packages" directory as its package root.
   var packageRoot =
       p.normalize(p.join(p.dirname(p.fromUri(Platform.script)), "packages"));
 
   var best = new Duration(days: 1);
   while (true) {
     var start = new DateTime.now();
     AnalysisEngine.instance.clearCaches();
 
+    AnalysisOptionsImpl options = new AnalysisOptionsImpl();
+    options.strongMode = true;
+    options.strongModeHints = true;
+
     PhysicalResourceProvider resourceProvider =
         PhysicalResourceProvider.INSTANCE;
-    DartSdk sdk = new FolderBasedDartSdk(
+    FolderBasedDartSdk sdk = new FolderBasedDartSdk(
         resourceProvider, resourceProvider.getFolder(args[0]));
+    sdk.analysisOptions = options;
+
+    ContextBuilder builder = new ContextBuilder(resourceProvider, null, null);
     AnalysisContext context = AnalysisEngine.instance.createAnalysisContext();
     context.sourceFactory = new SourceFactory([
       new DartUriResolver(sdk),
       new ResourceUriResolver(resourceProvider),
-      new PackageUriResolver([new JavaFile(packageRoot)])
+      new PackageMapUriResolver(resourceProvider,
+          builder.convertPackagesToMap(builder.createPackageMap(packageRoot)))
     ]);
-
-    AnalysisOptionsImpl options = context.analysisOptions;
-    options.strongMode = true;
-    options.strongModeHints = true;
+    context.analysisOptions = options;
 
     var mainSource =
         new FileSource(resourceProvider.getFile(p.fromUri(Platform.script)));
     context.applyChanges(new ChangeSet()..addedSource(mainSource));
 
     var initialLibrary =
         context.resolveCompilationUnit2(mainSource, mainSource);
 
     // Walk all of the transitively referenced libraries and compute errors.
     var errorCount = 0;
@@ skipping 25 matching lines @@
     if (seen.contains(lib)) return;
     seen.add(lib);
     results.add(lib);
     lib.importedLibraries.forEach(find);
     lib.exportedLibraries.forEach(find);
   }
 
   find(start);
   return results;
 }