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

This reverts commit 2eb8408.

TBR=turnidge@google.com

Review URL: https://codereview.chromium.org/2002253005 .

runtime/observatory/lib/elements.dart

@@ -43,8 +43,6 @@ export 'package:observatory/src/elements/nav_bar.dart';
 export 'package:observatory/src/elements/object_common.dart';
 export 'package:observatory/src/elements/object_view.dart';
 export 'package:observatory/src/elements/objectpool_view.dart';
-export 'package:observatory/src/elements/objectstore_ref.dart';
-export 'package:observatory/src/elements/objectstore_view.dart';
 export 'package:observatory/src/elements/observatory_application.dart';
 export 'package:observatory/src/elements/observatory_element.dart';
 export 'package:observatory/src/elements/persistent_handles.dart';

runtime/observatory/lib/elements.html

@@ -36,8 +36,6 @@
 <link rel="import" href="src/elements/object_common.html">
 <link rel="import" href="src/elements/object_view.html">
 <link rel="import" href="src/elements/objectpool_view.html">
-<link rel="import" href="src/elements/objectstore_ref.html">
-<link rel="import" href="src/elements/objectstore_view.html">
 <link rel="import" href="src/elements/observatory_application.html">
 <link rel="import" href="src/elements/observatory_element.html">
 <link rel="import" href="src/elements/persistent_handles.html">

runtime/observatory/lib/src/elements/isolate_view.html

@@ -5,7 +5,6 @@
 <link rel="import" href="function_ref.html">
 <link rel="import" href="isolate_summary.html">
 <link rel="import" href="library_ref.html">
-<link rel="import" href="objectstore_ref.html">
 <link rel="import" href="nav_bar.html">
 <link rel="import" href="observatory_element.html">
 <link rel="import" href="script_inset.html">
@@ -95,12 +94,6 @@ <h1>isolate '{{ isolate.name }}'</h1>
               <div class="memberName">service protocol extensions</div>
               <div class="memberValue">{{ isolate.extensionRPCs }}</div>
             </div>
-            <div class="memberItem">
-              <div class="memberName">object store</div>
-              <div class="memberValue">
-                <objectstore-ref ref="{{ isolate.objectStore }}"></objectstore-ref>
-              </div>
-            </div>
 
             <div class="memberItem">
               <div class="memberName">

runtime/observatory/lib/src/elements/service_ref.dart

@@ -125,10 +125,6 @@ class AnyServiceRefElement extends ObservatoryElement {
         ServiceRefElement element = new Element.tag('object-ref');
         element.ref = ref;
         return element;
-      case '_ObjectStore':
-        ServiceRefElement element = new Element.tag('objectstore-ref');
-        element.ref = ref;
-        return element;
       case 'Script':
         ServiceRefElement element = new Element.tag('script-ref');
         element.ref = ref;

runtime/observatory/lib/src/elements/service_view.dart

@@ -104,11 +104,6 @@ class ServiceObjectViewElement extends ObservatoryElement {
               return element;
           }
         }(object);
-      case '_ObjectStore':
-        ObjectStoreViewElement element =
-            new Element.tag('objectstore-view');
-        element.objectStore = object;
-        return element;
       case 'SocketList':
         IOSocketListViewElement element =
             new Element.tag('io-socket-list-view');

runtime/observatory/lib/src/service/object.dart

@@ -253,9 +253,6 @@ abstract class ServiceObject extends Observable {
             break;
         }
         break;
-      case '_ObjectStore':
-        obj = new ObjectStore._empty(owner);
-        break;
       case 'Event':
         obj = new ServiceEvent._empty(owner);
         break;
@@ -1337,7 +1334,6 @@ class Isolate extends ServiceObjectOwner {
   Map<int, Class> _classesByCid = new Map<int, Class>();
 
   @observable Library rootLibrary;
-  @observable ObjectStore objectStore;
   @observable ObservableList<Library> libraries =
       new ObservableList<Library>();
   @observable Frame topFrame;
@@ -1419,7 +1415,6 @@ class Isolate extends ServiceObjectOwner {
     _upgradeCollection(map, isolate);
     originNumber = int.parse(map['_originNumber'], onError:(_) => null);
     rootLibrary = map['rootLib'];
-    objectStore = map['_objectStore'];
     if (map['entry'] != null) {
       entry = map['entry'];
     }
@@ -1749,36 +1744,6 @@ class Isolate extends ServiceObjectOwner {
   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();

runtime/observatory/observatory_sources.gypi

@@ -105,10 +105,6 @@
     'lib/src/elements/library_ref.html',
     'lib/src/elements/library_view.dart',
     'lib/src/elements/library_view.html',
-    'lib/src/elements/objectstore_ref.dart',
-    'lib/src/elements/objectstore_ref.html',
-    'lib/src/elements/objectstore_view.dart',
-    'lib/src/elements/objectstore_view.html',
     'lib/src/elements/logging.dart',
     'lib/src/elements/logging.html',
     'lib/src/elements/megamorphiccache_view.dart',

runtime/vm/isolate.cc

@@ -1900,11 +1900,6 @@ void Isolate::PrintJSON(JSONStream* stream, bool ref) {
     jsobj.AddProperty("rootLib", lib);
   }
 
-  {
-    JSONObject objectStore(&jsobj, "_objectStore");
-    object_store()->PrintToJSONObject(&objectStore);
-  }
-
   {
     JSONObject tagCounters(&jsobj, "_tagCounters");
     vm_tag_counters()->PrintToJSONObject(&tagCounters);

runtime/vm/object_store.cc

@@ -120,25 +120,6 @@ void ObjectStore::Init(Isolate* isolate) {
 }
 
 
-void ObjectStore::PrintToJSONObject(JSONObject* jsobj, bool ref) {
-  if (!FLAG_support_service) {
-    return;
-  }
-  jsobj->AddProperty("type", (ref ? "@_ObjectStore" : "_ObjectStore"));
-  jsobj->AddFixedServiceId("object_store");
-
-  {
-    JSONObject fields(jsobj, "fields");
-    Object& value = Object::Handle();
-#define PRINT_OBJECT_STORE_FIELD(type, name)                                   \
-    value = name;                                                              \
-    fields.AddProperty(#name, value);
-OBJECT_STORE_FIELD_LIST(PRINT_OBJECT_STORE_FIELD);
-#undef PRINT_OBJECT_STORE_FIELD
-  }
-}
-
-
 RawError* ObjectStore::PreallocateObjects() {
   Thread* thread = Thread::Current();
   Isolate* isolate = thread->isolate();