Roll back 16364004 and 16206027.

sdk/lib/_internal/dartdoc/lib/dartdoc.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.
 
 /**
  * To generate docs for a library, run this script with the path to an
  * entrypoint .dart file, like:
  *
  *     $ dart dartdoc.dart foo.dart
  *
@@ skipping 301 matching lines @@
 
   /** The member that we're currently generating docs for. */
   MemberMirror _currentMember;
 
   /** The path to the file currently being written to, relative to [outdir]. */
   Path _filePath;
 
   /** The file currently being written to. */
   StringBuffer _file;
 
-  /**
-   * The temporary directory used for this instance of Dartdoc.
-   * Call [cleanup] to delete it.
-   */
-  Directory _tempDir;
-
   int _totalLibraries = 0;
   int _totalTypes = 0;
   int _totalMembers = 0;
 
   int get totalLibraries => _totalLibraries;
   int get totalTypes => _totalTypes;
   int get totalMembers => _totalMembers;
 
   // Check if the compilation has started and finished.
   bool _started = false;
@@ skipping 444 matching lines @@
   /**
    * Walks the libraries and creates a JSON object containing the data needed
    * to generate navigation for them.
    */
   void docNavigationJson() {
     startFile('nav.json');
     writeln(json.stringify(createNavigationInfo()));
     endFile();
   }
 
-  /// Whether dartdoc is running from within the Dart SDK or the
-  /// Dart source repository.
-  bool get runningFromSdk =>
-    pathos.extension(new Options().script) == '.snapshot';
-
-  /// Gets the path to the root directory of the SDK.
-  String get rootDirectory =>
-    pathos.dirname(pathos.dirname(new Options().executable));
-
-  /// Gets the path to the dartdoc directory normalized for running in different
-  /// places.
-  String get normalizedDartdocPath => runningFromSdk ?
-      pathos.join(rootDirectory, 'lib', '_internal', 'dartdoc') :
-      dartdocPath.toString();
-
-  /// The path to the temporary directory in the SDK.
-  // TODO(amouravski): Remove this and use a REAL temporary directory.
-  String get tempPath => pathos.join(normalizedDartdocPath, 'tmp');
-
   void docNavigationDart() {
-    _tempDir = new Directory(tempPath);
-    if (!_tempDir.existsSync()) {
+    final dir = new Directory.fromPath(tmpPath);
+    if (!dir.existsSync()) {
       // TODO(3914): Hack to avoid 'file already exists' exception
       // thrown due to invalid result from dir.existsSync() (probably due to
       // race conditions).
       try {
-        _tempDir.createSync();
+        dir.createSync();
       } on DirectoryIOException catch (e) {
         // Ignore.
       }
     }
     String jsonString = json.stringify(createNavigationInfo());
     String dartString = jsonString.replaceAll(r"$", r"\$");
-
-    var navPath = pathos.join(tempPath, 'nav.dart');
-    writeString(new File(navPath),
+    final filePath = tmpPath.append('nav.dart');
+    writeString(new File.fromPath(filePath),
         '''part of client;
-        get json => $dartString;''');
+           get json => $dartString;''');
   }
 
+  Path get tmpPath => dartdocPath.append('tmp');
+
   void cleanup() {
-    if (_tempDir.existsSync()) {
-      _tempDir.deleteSync(recursive: true);
+    final dir = new Directory.fromPath(tmpPath);
+    if (dir.existsSync()) {
+      dir.deleteSync(recursive: true);
     }
   }
 
   List createNavigationInfo() {
     final libraryList = [];
     for (final library in _sortedLibraries) {
       docLibraryNavigationJson(library, libraryList);
     }
     return libraryList;
   }
@@ skipping 1455 matching lines @@
    return '''
         <div class="mdn">
         $mdnComment
         <div class="mdn-note"><a href="$mdnUrl">from MDN</a></div>
         </div>
         ''';
   }
 
   String toString() => mdnComment;
 }