Revert "Fix observatory tests broken by running dartfmt."

runtime/bin/builtin.dart

 // Copyright (c) 2012, 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.
 
 library builtin;
-
 // NOTE: Do not import 'dart:io' in builtin.
 import 'dart:async';
 import 'dart:collection';
 import 'dart:_internal' hide Symbol;
 import 'dart:isolate';
 import 'dart:typed_data';
 
 // Embedder sets this to true if the --trace-loading flag was passed on the
 // command line.
 bool _traceLoading = false;
 
+
 // Before handling an embedder entrypoint we finalize the setup of the
 // dart:_builtin library.
 bool _setupCompleted = false;
 
+
 // The root library (aka the script) is imported into this library. The
 // standalone embedder uses this to lookup the main entrypoint in the
 // root library's namespace.
 Function _getMainClosure() => main;
 
+
 // 'print' implementation.
 // The standalone embedder registers the closurized _print function with the
 // dart:core library.
 void _printString(String s) native "Builtin_PrintString";
 
+
 void _print(arg) {
   _printString(arg.toString());
 }
 
+
 _getPrintClosure() => _print;
 
+
 // Corelib 'Uri.base' implementation.
 // Uri.base is susceptible to changes in the current working directory.
 _getCurrentDirectoryPath() native "Builtin_GetCurrentDirectory";
 
+
 Uri _uriBase() {
   // We are not using Dircetory.current here to limit the dependency
   // on dart:io. This code is the same as:
   //   return new Uri.directory(Directory.current.path);
   var path = _getCurrentDirectoryPath();
   return new Uri.directory(path);
 }
 
+
 _getUriBaseClosure() => _uriBase;
 
 // Asynchronous loading of resources.
 // The embedder forwards loading requests to the service isolate.
 
 // A port for communicating with the service isolate for I/O.
 SendPort _loadPort;
 
 // The isolateId used to communicate with the service isolate for I/O.
 int _isolateId;
 
 // Requests made to the service isolate over the load port.
 
 // Extra requests. Keep these in sync between loader.dart and builtin.dart.
-const _Dart_kInitLoader = 4; // Initialize the loader.
-const _Dart_kResourceLoad = 5; // Resource class support.
-const _Dart_kGetPackageRootUri = 6; // Uri of the packages/ directory.
-const _Dart_kGetPackageConfigUri = 7; // Uri of the .packages file.
-const _Dart_kResolvePackageUri = 8; // Resolve a package: uri.
+const _Dart_kInitLoader = 4;           // Initialize the loader.
+const _Dart_kResourceLoad = 5;         // Resource class support.
+const _Dart_kGetPackageRootUri = 6;    // Uri of the packages/ directory.
+const _Dart_kGetPackageConfigUri = 7;  // Uri of the .packages file.
+const _Dart_kResolvePackageUri = 8;    // Resolve a package: uri.
 
 // Make a request to the loader. Future will complete with result which is
 // either a Uri or a List<int>.
 Future _makeLoaderRequest(int tag, String uri) {
   assert(_isolateId != null);
   assert(_loadPort != null);
   Completer completer = new Completer();
   RawReceivePort port = new RawReceivePort();
   port.handler = (msg) {
     // Close the port.
     port.close();
     completer.complete(msg);
   };
   _loadPort.send([_traceLoading, _isolateId, tag, port.sendPort, uri]);
   return completer.future;
 }
 
+
 // The current working directory when the embedder was launched.
 Uri _workingDirectory;
 // The URI that the root script was loaded from. Remembered so that
 // package imports can be resolved relative to it. The root script is the basis
 // for the root library in the VM.
 Uri _rootScript;
 // The package root set on the command line.
 Uri _packageRoot;
 
 // Special handling for Windows paths so that they are compatible with URI
@@ skipping 190 matching lines @@
 String _filePathFromUri(String userUri) {
   var uri = Uri.parse(userUri);
   if (_traceLoading) {
     _log('Getting file path from: $uri');
   }
 
   var path;
   switch (uri.scheme) {
     case '':
     case 'file':
-      return uri.toFilePath();
+    return uri.toFilePath();
     case 'package':
-      return _filePathFromUri(_resolvePackageUri(uri).toString());
+    return _filePathFromUri(_resolvePackageUri(uri).toString());
     case 'data':
     case 'http':
     case 'https':
-      return uri.toString();
+    return uri.toString();
     default:
-      // Only handling file, http, and package URIs
-      // in standalone binary.
-      if (_traceLoading) {
-        _log('Unknown scheme (${uri.scheme}) in $uri.');
-      }
-      throw 'Not a known scheme: $uri';
+    // Only handling file, http, and package URIs
+    // in standalone binary.
+    if (_traceLoading) {
+      _log('Unknown scheme (${uri.scheme}) in $uri.');
+    }
+    throw 'Not a known scheme: $uri';
   }
 }
 
 // Embedder Entrypoint.
 _libraryFilePath(String libraryUri) {
   if (!_setupCompleted) {
     _setupHooks();
   }
   int index = libraryUri.lastIndexOf('/');
   var path;
@@ skipping 45 matching lines @@
   if (_traceLoading) {
     _log("Request for package Uri resolution from user code: $packageUri");
   }
   if (packageUri.scheme != "package") {
     if (_traceLoading) {
       _log("Non-package Uri, returning unmodified: $packageUri");
     }
     // Return the incoming parameter if not passed a package: URI.
     return packageUri;
   }
-  var result =
-      await _makeLoaderRequest(_Dart_kResolvePackageUri, packageUri.toString());
+  var result = await _makeLoaderRequest(_Dart_kResolvePackageUri,
+                                        packageUri.toString());
   if (result is! Uri) {
     if (_traceLoading) {
       _log("Exception when resolving package URI: $packageUri");
     }
     result = null;
   }
   if (_traceLoading) {
     _log("Resolved '$packageUri' to '$result'");
   }
   return result;
 }