Revert "Fix observatory tests broken by running dartfmt."

runtime/bin/vmservice/server.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.
 
 part of vmservice_io;
 
-final bool silentObservatory = const bool.fromEnvironment('SILENT_OBSERVATORY');
+final bool silentObservatory =
+    const bool.fromEnvironment('SILENT_OBSERVATORY');
 
 void serverPrint(String s) {
   if (silentObservatory) {
     // We've been requested to be silent.
     return;
   }
   print(s);
 }
 
 class WebSocketClient extends Client {
@@ skipping 37 matching lines @@
     }
   }
 
   void post(dynamic result) {
     if (result == null) {
       // Do nothing.
       return;
     }
     try {
       if (result is String || result is Uint8List) {
-        socket.add(result); // String or binary message.
+        socket.add(result);  // String or binary message.
       } else {
         // String message as external Uint8List.
         assert(result is List);
         Uint8List cstring = result[0];
         socket.addUtf8Text(cstring);
       }
     } catch (e, st) {
       serverPrint("Ignoring error posting over WebSocket.");
       serverPrint(e);
       serverPrint(st);
     }
   }
 
   dynamic toJson() {
     Map map = super.toJson();
     map['type'] = 'WebSocketClient';
     map['socket'] = '$socket';
     return map;
   }
 }
 
+
 class HttpRequestClient extends Client {
   static ContentType jsonContentType =
       new ContentType("application", "json", charset: "utf-8");
   final HttpRequest request;
 
   HttpRequestClient(this.request, VMService service)
-      : super(service, sendEvents: false);
+      : super(service, sendEvents:false);
 
   disconnect() {
     request.response.close();
     close();
   }
 
   void post(dynamic result) {
     if (result == null) {
       close();
       return;
     }
     HttpResponse response = request.response;
     // We closed the connection for bad origins earlier.
     response.headers.add('Access-Control-Allow-Origin', '*');
     response.headers.contentType = jsonContentType;
     if (result is String) {
       response.write(result);
     } else {
       assert(result is List);
-      Uint8List cstring = result[0]; // Already in UTF-8.
+      Uint8List cstring = result[0];  // Already in UTF-8.
       response.add(cstring);
     }
     response.close();
     close();
   }
 
   dynamic toJson() {
     Map map = super.toJson();
     map['type'] = 'HttpRequestClient';
     map['request'] = '$request';
@@ skipping 36 matching lines @@
     // Explicitly add localhost and 127.0.0.1 on any port (necessary for
     // adb port forwarding).
     if ((uri.host == 'localhost') ||
         (uri.host == '::1') ||
         (uri.host == '127.0.0.1')) {
       return true;
     }
 
     if ((uri.port == _server.port) &&
         ((uri.host == _server.address.address) ||
-            (uri.host == _server.address.host))) {
+         (uri.host == _server.address.host))) {
       return true;
     }
 
     return false;
   }
 
   bool _originCheck(HttpRequest request) {
     if (_originCheckDisabled || Platform.isFuchsia) {
       // Always allow.
       return true;
@@ skipping 27 matching lines @@
       // Malformed.
       return null;
     }
     // Check that we were given the auth token.
     final String authToken = requestPathSegments[0];
     if (authToken != serviceAuthToken) {
       // Malformed.
       return null;
     }
     // Construct the actual request path by chopping off the auth token.
-    return (requestPathSegments[1] == '')
-        ? ROOT_REDIRECT_PATH
-        : '/${requestPathSegments.sublist(1).join('/')}';
+    return (requestPathSegments[1] == '') ?
+        ROOT_REDIRECT_PATH : '/${requestPathSegments.sublist(1).join('/')}';
   }
 
   Future _requestHandler(HttpRequest request) async {
     if (!_originCheck(request)) {
       // This is a cross origin attempt to connect
       request.response.close();
       return;
     }
     if (request.method == 'PUT') {
       // PUT requests are forwarded to DevFS for processing.
@@ skipping 22 matching lines @@
         if (fsUri == null) {
           fsPathList = request.headers['dev_fs_path'];
           fsPathBase64List = request.headers['dev_fs_path_b64'];
           // If the 'dev_fs_path_b64' header field was sent, use that instead.
           if ((fsPathBase64List != null) && (fsPathBase64List.length > 0)) {
             fsPath = UTF8.decode(BASE64.decode(fsPathBase64List[0]));
           } else {
             fsPath = fsPathList[0];
           }
         }
-      } catch (e) {/* ignore */}
+      } catch (e) { /* ignore */ }
 
       String result;
       try {
         result = await _service.devfs.handlePutStream(
-            fsName, fsPath, fsUri, request.transform(GZIP.decoder));
-      } catch (e) {/* ignore */}
+            fsName,
+            fsPath,
+            fsUri,
+            request.transform(GZIP.decoder));
+      } catch (e) { /* ignore */ }
 
       if (result != null) {
         request.response.headers.contentType =
             HttpRequestClient.jsonContentType;
         request.response.write(result);
       }
       request.response.close();
       return;
     }
     if (request.method != 'GET') {
       // Not a GET request. Do nothing.
       request.response.close();
       return;
     }
 
     final String path = _checkAuthTokenAndGetPath(request.uri);
     if (path == null) {
       // Malformed.
       request.response.close();
       return;
     }
 
     if (path == WEBSOCKET_PATH) {
-      WebSocketTransformer.upgrade(request).then((WebSocket webSocket) {
+      WebSocketTransformer.upgrade(request).then(
+                                   (WebSocket webSocket) {
         new WebSocketClient(webSocket, _service);
       });
       return;
     }
 
     Asset asset = assets[path];
     if (asset != null) {
       // Serving up a static asset (e.g. .css, .html, .png).
-      request.response.headers.contentType = ContentType.parse(asset.mimeType);
+      request.response.headers.contentType =
+          ContentType.parse(asset.mimeType);
       request.response.add(asset.data);
       request.response.close();
       return;
     }
     // HTTP based service request.
     try {
       var client = new HttpRequestClient(request, _service);
       var message = new Message.fromUri(client, request.uri);
       client.onMessage(null, message);
     } catch (e) {
       serverPrint('Unexpected error processing HTTP request uri: '
-          '${request.uri}\n$e\n');
+                  '${request.uri}\n$e\n');
       rethrow;
     }
   }
 
   Future startup() async {
     if (_server != null) {
       // Already running.
       return this;
     }
 
@@ skipping 61 matching lines @@
       onServerAddressChange(null);
       return this;
     }).catchError((e, st) {
       _server = null;
       serverPrint('Could not shutdown Observatory HTTP server:\n$e\n$st\n');
       _notifyServerState("");
       onServerAddressChange(null);
       return this;
     });
   }
+
 }
 
-void _notifyServerState(String uri) native "VMServiceIO_NotifyServerState";
+void _notifyServerState(String uri)
+    native "VMServiceIO_NotifyServerState";