Finish moving service protocol to json rpc.

runtime/observatory/lib/service_common.dart

 // Copyright (c) 2014, 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 service_common;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:typed_data';
 
@@ skipping 40 matching lines @@
       'networkAddress': networkAddress,
     };
   }
 }
 
 class _WebSocketRequest {
   final String method;
   final Map params;
   final Completer<String> completer;
 
-   _WebSocketRequest.old(this.method)
-      : params = null, completer = new Completer<String>();
-
-   _WebSocketRequest.rpc(this.method, this.params)
+  _WebSocketRequest(this.method, this.params)
       : completer = new Completer<String>();
 }
 
 /// Minimal common interface for 'WebSocket' in [dart:io] and [dart:html].
 abstract class CommonWebSocket {
   void connect(String address,
                void onOpen(),
                void onMessage(dynamic data),
                void onError(),
                void onClose());
@@ skipping 46 matching lines @@
   Future get onDisconnect => _disconnected.future;
 
   void disconnect() {
     if (_hasInitiatedConnect) {
       _webSocket.close();
     }
     _cancelAllRequests();
     _notifyDisconnect();
   }
 
-  Future<String> getStringDeprecated(String id) {
-    if (!_hasInitiatedConnect) {
-      _hasInitiatedConnect = true;
-      _webSocket.connect(
-          target.networkAddress, _onOpen, _onMessage, _onError, _onClose);
-    }
-    return _makeRequest(id);
-  }
-
-  /// Add a request for [id] to pending requests.
-  Future<String> _makeRequest(String id) {
-    assert(_hasInitiatedConnect);
-    // Create request.
-    String serial = (_requestSerial++).toString();
-    var request = new _WebSocketRequest.old(id);
-    if (_webSocket.isOpen) {
-      // Already connected, send request immediately.
-      _sendRequest(serial, request);
-    } else {
-      // Not connected yet, add to delayed requests.
-      _delayedRequests[serial] = request;
-    }
-    return request.completer.future;
-  }
-
   Future<String> invokeRpcRaw(String method, Map params) {
     if (!_hasInitiatedConnect) {
       _hasInitiatedConnect = true;
       _webSocket.connect(
           target.networkAddress, _onOpen, _onMessage, _onError, _onClose);
     }
     String serial = (_requestSerial++).toString();
-    var request = new _WebSocketRequest.rpc(method, params);
+    var request = new _WebSocketRequest(method, params);
     if (_webSocket.isOpen) {
       // Already connected, send request immediately.
       _sendRequest(serial, request);
     } else {
       // Not connected yet, add to delayed requests.
       _delayedRequests[serial] = request;
     }
     return request.completer.future;
   }
 
@@ skipping 108 matching lines @@
     Logger.root.info('Sending all delayed requests.');
     // Send all delayed requests.
     _delayedRequests.forEach(_sendRequest);
     // Clear all delayed requests.
     _delayedRequests.clear();
   }
 
   /// Send the request over WebSocket.
   void _sendRequest(String serial, _WebSocketRequest request) {
     assert (_webSocket.isOpen);
-    if (request.method != 'getTagProfile') {
+    if (request.method != 'getTagProfile' &&
+        request.method != 'getIsolateMetric' &&
+        request.method != 'getVMMetric') {
       Logger.root.info('GET ${request.method} from ${target.networkAddress}');
     }
     // Mark request as pending.
     assert(_pendingRequests.containsKey(serial) == false);
     _pendingRequests[serial] = request;
     var message;
     // Encode message.
     if (target.chrome) {
       message = JSON.encode({
         'id': int.parse(serial),
         'method': 'Dart.observatoryQuery',
         'params': {
           'id': serial,
           'query': request.method
         }
       });
     } else {
       message = JSON.encode({'id': serial,
                              'method': request.method,
                              'params': request.params});
     }
     // Send message.
     _webSocket.send(message);
   }
 }