Port metrics to RPC

runtime/observatory/test/metrics_test.dart

Index: runtime/observatory/test/metrics_test.dart
diff --git a/runtime/observatory/test/metrics_test.dart b/runtime/observatory/test/metrics_test.dart
index 9a72e23a95fd6729e8db2497ae88e12523a242cf..ef227c418732a9a8782d634cb62765e66d3124a2 100644
--- a/runtime/observatory/test/metrics_test.dart
+++ b/runtime/observatory/test/metrics_test.dart
@@ -17,27 +17,25 @@ void script() {
 var tests = [
 
 (Isolate isolate) =>
-  isolate.getDeprecated('metrics').then((ServiceMap metrics) {
-    expect(metrics['type'], equals('MetricList'));
-    var members = metrics['members'];
-    expect(members, isList);
-    expect(members.length, equals(1));
-    var counter = members[0];
+  isolate.refreshDartMetrics().then((Map metrics) {
+    expect(metrics.length, equals(1));
+    var counter = metrics['metrics/a.b.c'];
     expect(counter.name, equals('a.b.c'));
     expect(counter.value, equals(1234.5));
 }),
 
 (Isolate isolate) =>
-  isolate.getDeprecated('metrics/a.b.c').then((ServiceMetric counter) {
+  isolate.invokeRpc('getIsolateMetric', { 'metricId': 'metrics/a.b.c' })
+      .then((ServiceMetric counter) {
     expect(counter.name, equals('a.b.c'));
     expect(counter.value, equals(1234.5));
-}),
+  }),
 
 (Isolate isolate) =>
-  isolate.getDeprecated('metrics/a.b.d').then((DartError err) {
+  isolate.invokeRpc('getIsolateMetric', { 'metricId': 'metrics/a.b.d' })
+      .then((DartError err) {
     expect(err is DartError, isTrue);
-}),
-
+  }),
 ];
 
 main(args) => runIsolateTests(args, tests, testeeBefore: script);