Speculatively revert "Make the object store visible in Observatory."

runtime/observatory/lib/src/service/object.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.
 
 part of service;
 
 // Some value smaller than the object ring, so requesting a large array
 // doesn't result in an expired ref because the elements lapped it in the
 // object ring.
 const int kDefaultFieldLimit = 100;
@@ skipping 235 matching lines @@
             obj = new ObjectPool._empty(owner);
             break;
           case 'PcDescriptors':
             obj = new PcDescriptors._empty(owner);
             break;
           case 'TokenStream':
             obj = new TokenStream._empty(owner);
             break;
         }
         break;
-      case '_ObjectStore':
-        obj = new ObjectStore._empty(owner);
-        break;
       case 'Event':
         obj = new ServiceEvent._empty(owner);
         break;
       case 'Script':
         obj = new Script._empty(owner);
         break;
       case 'Socket':
         obj = new Socket._empty(owner);
         break;
       case 'Instance':
@@ skipping 1061 matching lines @@
 
   Future<ObservableMap> _fetchDirect({int count: kDefaultFieldLimit}) async {
     return invokeRpcNoUpgrade('getIsolate', {});
   }
 
   @observable Class objectClass;
   @observable final rootClasses = new ObservableList<Class>();
   Map<int, Class> _classesByCid = new Map<int, Class>();
 
   @observable Library rootLibrary;
-  @observable ObjectStore objectStore;
   @observable ObservableList<Library> libraries =
       new ObservableList<Library>();
   @observable Frame topFrame;
 
   @observable String name;
   @observable String vmName;
   @observable ServiceFunction entry;
 
   final HeapSpace newSpace = new HeapSpace();
   final HeapSpace oldSpace = new HeapSpace();
@@ skipping 61 matching lines @@
     number = int.parse(map['number'], onError:(_) => null);
     if (mapIsRef) {
       return;
     }
     _loaded = true;
     loading = false;
     runnable = map['runnable'] == true;
     _upgradeCollection(map, isolate);
     originNumber = int.parse(map['_originNumber'], onError:(_) => null);
     rootLibrary = map['rootLib'];
-    objectStore = map['_objectStore'];
     if (map['entry'] != null) {
       entry = map['entry'];
     }
     var savedStartTime = startTime;
     int startTimeInMillis = map['startTime'];
     startTime = new DateTime.fromMillisecondsSinceEpoch(startTimeInMillis);
     notifyPropertyChange(#upTime, 0, 1);
     var countersMap = map['_tagCounters'];
     if (countersMap != null) {
       var names = countersMap['names'];
@@ skipping 309 matching lines @@
     return _refreshMetrics('Native', nativeMetrics);
   }
 
   Future refreshMetrics() {
     return Future.wait([refreshDartMetrics(), refreshNativeMetrics()]);
   }
 
   String toString() => "Isolate($name)";
 }
 
-
-class NamedField {
-  final String name;
-  final ServiceObject value;
-  NamedField(this.name, this.value);
-}
-
-
-class ObjectStore extends ServiceObject {
-  @observable List<NamedField> fields = new List<NamedField>();
-
-  ObjectStore._empty(ServiceObjectOwner owner) : super._empty(owner);
-
-  void _update(ObservableMap map, bool mapIsRef) {
-    // Extract full properties.
-    _upgradeCollection(map, isolate);
-
-    if (mapIsRef) {
-      return;
-    }
-
-    fields.clear();
-    map['fields'].forEach((key, value) {
-      fields.add(new NamedField(key, value));
-    });
-    _loaded = true;
-  }
-}
-
-
 /// A [ServiceObject] which implements [ObservableMap].
 class ServiceMap extends ServiceObject implements ObservableMap {
   final ObservableMap _map = new ObservableMap();
   static String objectIdRingPrefix = 'objects/';
 
   bool get canCache {
     return (_type == 'Class' ||
             _type == 'Function' ||
             _type == 'Field') &&
            !_id.startsWith(objectIdRingPrefix);
@@ skipping 2316 matching lines @@
     var v = list[i];
     if ((v is ObservableMap) && _isServiceMap(v)) {
       list[i] = owner.getFromMap(v);
     } else if (v is ObservableList) {
       _upgradeObservableList(v, owner);
     } else if (v is ObservableMap) {
       _upgradeObservableMap(v, owner);
     }
   }
 }