Refactor Observatory

runtime/bin/vmservice/client/lib/src/elements/breakpoint_list.dart

Index: runtime/bin/vmservice/client/lib/src/elements/breakpoint_list.dart
diff --git a/runtime/bin/vmservice/client/lib/src/observatory_elements/breakpoint_list.dart b/runtime/bin/vmservice/client/lib/src/elements/breakpoint_list.dart
similarity index 62%
rename from runtime/bin/vmservice/client/lib/src/observatory_elements/breakpoint_list.dart
rename to runtime/bin/vmservice/client/lib/src/elements/breakpoint_list.dart
index 5b8b1a1d4fda712f0af03d43ffc5c2e7557b5383..7a3f55b58cc6eaa944d87af73b25dec9d0f6d02f 100644
--- a/runtime/bin/vmservice/client/lib/src/observatory_elements/breakpoint_list.dart
+++ b/runtime/bin/vmservice/client/lib/src/elements/breakpoint_list.dart
@@ -4,22 +4,22 @@
 
 library breakpoint_list_element;
 
-import 'observatory_element.dart';
+import 'isolate_element.dart';
 import 'package:logging/logging.dart';
 import 'package:polymer/polymer.dart';
 
+// TODO(turnidge): Is a breakpoint list associated with a VM or an isolate?
 @CustomTag('breakpoint-list')
-class BreakpointListElement extends ObservatoryElement {
+class BreakpointListElement extends IsolateElement {
   @published Map msg = toObservable({});
 
   BreakpointListElement.created() : super.created();
 
   void refresh(var done) {
-    var url = app.locationManager.currentIsolateRelativeLink("breakpoints");
-    app.requestManager.requestMap(url).then((map) {
-        msg = map;
+    isolate.getMap('breakpoints').then((map) {
+      msg = map;
     }).catchError((e, trace) {
-          Logger.root.severe('Error while refreshing breakpoint-list: $e\n$trace');
+      Logger.root.severe('Error while refreshing breakpoint-list: $e\n$trace');
     }).whenComplete(done);
   }
 }