Finish moving service protocol to json rpc.

runtime/bin/vmservice/server.dart

Index: runtime/bin/vmservice/server.dart
diff --git a/runtime/bin/vmservice/server.dart b/runtime/bin/vmservice/server.dart
index 46cff7b8ba1cc8ba302d62f5e556accb2debb574..55f36e040a7df083da18076762ae72e5f6a87c4f 100644
--- a/runtime/bin/vmservice/server.dart
+++ b/runtime/bin/vmservice/server.dart
@@ -32,15 +32,7 @@ class WebSocketClient extends Client {
       }
       var serial = map['id'];
 
-      // If the map contains 'params' then this is a JsonRPC message.
-      // We are currently in the process of switching the vmservice over to
-      // JsonRPC.
-      if (map['params'] != null) {
-        onMessage(serial, new Message.fromJsonRpc(map['method'],
-                                                  map['params']));
-      } else {
-        onMessage(serial, new Message.fromUri(Uri.parse(map['method'])));
-      }
+      onMessage(serial, new Message.fromJsonRpc(map['method'], map['params']));
     } else {
       socket.close(BINARY_MESSAGE_ERROR_CODE, 'Message must be a string.');
     }
@@ -219,4 +211,4 @@ class Server {
 }
 
 void _notifyServerState(String ip, int port)
-    native "VMServiceIO_NotifyServerState";
+    native "VMServiceIO_NotifyServerState";