Roll back 16364004 and 16206027.

sdk/lib/_internal/dartdoc/lib/dartdoc.dart

Index: sdk/lib/_internal/dartdoc/lib/dartdoc.dart
diff --git a/sdk/lib/_internal/dartdoc/lib/dartdoc.dart b/sdk/lib/_internal/dartdoc/lib/dartdoc.dart
index 17b84ba11e520db1864d4a4aac016c711ed257fa..dfc0f457bde7c3b2608f2be37d42e7af33a4fc03 100644
--- a/sdk/lib/_internal/dartdoc/lib/dartdoc.dart
+++ b/sdk/lib/_internal/dartdoc/lib/dartdoc.dart
@@ -319,12 +319,6 @@ class Dartdoc {
   /** 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;
@@ -789,49 +783,32 @@ class Dartdoc {
     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);
     }
   }