Pub test updated.

tools/dom/docs/lib/docs.dart

 // Copyright (c) 2013, 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.
 
 /**
  * A library for extracting the documentation from the various HTML libraries
  * ([dart:html], [dart:svg], [dart:web_audio], [dart:indexed_db]) and saving
  * those documentation comments to a JSON file.
  */
 
 library docs;
 
 import '../../../../sdk/lib/_internal/dartdoc/lib/src/dart2js_mirrors.dart';
 import '../../../../sdk/lib/_internal/compiler/implementation/mirrors/mirrors.dart';
+import '../../../../sdk/lib/_internal/compiler/implementation/mirrors/mirrors_util.dart';
 import '../../../../sdk/lib/_internal/dartdoc/lib/dartdoc.dart';
 import '../../../../sdk/lib/_internal/dartdoc/lib/src/json_serializer.dart';
 import '../../../../utils/apidoc/lib/metadata.dart';
 import 'dart:async';
 import 'dart:io';
 
 /// The various HTML libraries.
 const List<String> HTML_LIBRARY_NAMES = const ['dart:html',
                                                'dart:indexed_db',
                                                'dart:svg',
@@ skipping 55 matching lines @@
 
   // Sort the libraries by name (not key).
   var sortedLibraries = new List<LibraryMirror>.from(
       mirrors.libraries.values.where(
           (e) => HTML_LIBRARY_NAMES.indexOf(e.uri.toString()) >= 0))
       ..sort((x, y) =>
         x.uri.toString().toUpperCase().compareTo(
         y.uri.toString().toUpperCase()));
 
   for (LibraryMirror libMirror in sortedLibraries) {
-    print('Extracting documentation from ${libMirror.displayName}.');
+    print('Extracting documentation from ${libMirror.simpleName}.');
 
     var libraryJson = {};
     var sortedClasses = _sortAndFilterMirrors(
         libMirror.classes.values.toList(), ignoreDocsEditable: true);
 
     for (ClassMirror classMirror in sortedClasses) {
       var classJson = {};
       var sortedMembers = _sortAndFilterMirrors(
           classMirror.members.values.toList());
 
@@ skipping 26 matching lines @@
             membersJson);
       }
 
       if (!classJson.isEmpty) {
         libraryJson.putIfAbsent(domNames(classMirror)[0], () =>
             classJson);
       }
     }
 
     if (!libraryJson.isEmpty) {
-      convertedJson.putIfAbsent(libMirror.displayName, () =>
+      convertedJson.putIfAbsent(libMirror.simpleName, () =>
           libraryJson);
     }
   }
 
   return convertedJson;
 }
 
 /// Filter out mirrors that are private, or which are not part of this docs
 /// process. That is, ones without the DocsEditable annotation.
 /// If [ignoreDocsEditable] is true, relax the restriction on @DocsEditable.
 /// This is to account for classes that are defined in a template, but whose
 /// members are generated.
 List<DeclarationMirror> _sortAndFilterMirrors(List<DeclarationMirror> mirrors,
     {ignoreDocsEditable: false}) {
 
   var filteredMirrors = mirrors.where((DeclarationMirror c) =>
       !domNames(c).isEmpty &&
-      !c.displayName.startsWith('_') &&
+      !displayName(c).startsWith('_') &&
       (!ignoreDocsEditable ? (findMetadata(c.metadata, 'DocsEditable') != null)
           : true))
       .toList();
 
   filteredMirrors.sort((x, y) =>
     domNames(x)[0].toUpperCase().compareTo(
     domNames(y)[0].toUpperCase()));
 
   return filteredMirrors;
 }
@@ skipping 18 matching lines @@
     for (var s in tags.reflectee.split(',')) {
       domNames.add(s.trim());
     }
 
     if (domNames.length == 1 && domNames[0] == 'none') return <String>[];
     return domNames;
   } else {
     return <String>[];
   }
 }