Revert "Support ES6 Map and Set in heap profiler"

src/objects.h

Index: src/objects.h
diff --git a/src/objects.h b/src/objects.h
index 8dd7cb1a85ff83e0866bd778f2a47dad67bc3801..007d4c10a0ff8db1521d53271490d5a62dbad7f9 100644
--- a/src/objects.h
+++ b/src/objects.h
@@ -44,9 +44,8 @@
 //         - JSArrayBufferView
 //           - JSTypedArray
 //           - JSDataView
-//         - JSCollection
-//           - JSSet
-//           - JSMap
+//         - JSSet
+//         - JSMap
 //         - JSSetIterator
 //         - JSMapIterator
 //         - JSWeakCollection
@@ -10079,42 +10078,41 @@ class JSFunctionProxy: public JSProxy {
 };
 
 
-class JSCollection : public JSObject {
+// The JSSet describes EcmaScript Harmony sets
+class JSSet: public JSObject {
  public:
-  // [table]: the backing hash table
+  // [set]: the backing hash set containing keys.
   DECL_ACCESSORS(table, Object)
 
-  static const int kTableOffset = JSObject::kHeaderSize;
-  static const int kSize = kTableOffset + kPointerSize;
-
- private:
-  DISALLOW_IMPLICIT_CONSTRUCTORS(JSCollection);
-};
-
-
-// The JSSet describes EcmaScript Harmony sets
-class JSSet : public JSCollection {
- public:
   DECLARE_CAST(JSSet)
 
   // Dispatched behavior.
   DECLARE_PRINTER(JSSet)
   DECLARE_VERIFIER(JSSet)
 
+  static const int kTableOffset = JSObject::kHeaderSize;
+  static const int kSize = kTableOffset + kPointerSize;
+
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(JSSet);
 };
 
 
 // The JSMap describes EcmaScript Harmony maps
-class JSMap : public JSCollection {
+class JSMap: public JSObject {
  public:
+  // [table]: the backing hash table mapping keys to values.
+  DECL_ACCESSORS(table, Object)
+
   DECLARE_CAST(JSMap)
 
   // Dispatched behavior.
   DECLARE_PRINTER(JSMap)
   DECLARE_VERIFIER(JSMap)
 
+  static const int kTableOffset = JSObject::kHeaderSize;
+  static const int kSize = kTableOffset + kPointerSize;
+
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(JSMap);
 };