Roll back changes that broke the bots (TBR)

pkg/analyzer/tool/task_dependency_graph/generate.dart

 // Copyright (c) 2015, 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.
 
 /**
  * This file contains code to output a description of tasks and their
  * dependencies in ".dot" format.  Prior to running, the user should run "pub
  * get" in the analyzer directory to ensure that a "packages" folder exists.
  *
  * TODO(paulberry):
@@ skipping 13 matching lines @@
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.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/codegen/tools.dart';
 import 'package:analyzer/src/context/builder.dart';
 import 'package:analyzer/src/dart/sdk/sdk.dart';
 import 'package:analyzer/src/generated/constant.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:path/path.dart' as path;
 import 'package:path/path.dart';
 
 /**
  * Generate the target .dot file.
  */
 main() {
@@ skipping 109 matching lines @@
     resourceProvider = PhysicalResourceProvider.INSTANCE;
     DartSdk sdk = new FolderBasedDartSdk(resourceProvider,
         FolderBasedDartSdk.defaultSdkDirectory(resourceProvider));
     context = AnalysisEngine.instance.createAnalysisContext();
     String packageRootPath;
     if (Platform.packageRoot != null) {
       packageRootPath = Uri.parse(Platform.packageRoot).toFilePath();
     } else {
       packageRootPath = path.join(rootDir, 'packages');
     }
-    ContextBuilder builder = new ContextBuilder(resourceProvider, null, null);
+    JavaFile packagesDir = new JavaFile(packageRootPath);
     List<UriResolver> uriResolvers = [
       new DartUriResolver(sdk),
-      new PackageMapUriResolver(
-          resourceProvider,
-          builder
-              .convertPackagesToMap(builder.createPackageMap(packageRootPath))),
+      new PackageUriResolver(<JavaFile>[packagesDir]),
       new ResourceUriResolver(PhysicalResourceProvider.INSTANCE)
     ];
     context.sourceFactory = new SourceFactory(uriResolvers);
     Source dartDartSource =
         setupSource(path.join('lib', 'src', 'task', 'dart.dart'));
     Source taskSource = setupSource(path.join('lib', 'plugin', 'task.dart'));
     Source modelSource = setupSource(path.join('lib', 'task', 'model.dart'));
     Source enginePluginSource =
         setupSource(path.join('lib', 'src', 'plugin', 'engine_plugin.dart'));
     CompilationUnitElement modelElement = getUnit(modelSource).element;
@@ skipping 174 matching lines @@
   @override
   visitIdentifier(Identifier node) {
     Element element = node.staticElement;
     if (element is PropertyAccessorElement &&
         element.isGetter &&
         element.returnType.isSubtypeOf(type)) {
       callback(element);
     }
   }
 }