--- old/src/hotspot/share/memory/metaspace.hpp	2018-02-26 14:42:53.321503000 +0100
+++ new/src/hotspot/share/memory/metaspace.hpp	2018-02-26 14:42:52.949472000 +0100
@@ -89,6 +89,7 @@
   friend class MetaspaceShared;
   friend class CollectedHeap;
   friend class PrintCLDMetaspaceInfoClosure;
+  friend class MetaspaceAllocationTest;
 
  public:
   enum MetadataType {
@@ -176,6 +177,11 @@
     return mdtype == ClassType ? chunk_manager_class() : chunk_manager_metadata();
   }
 
+  // convenience function
+  static ChunkManager* get_chunk_manager(bool is_class) {
+    return is_class ? chunk_manager_class() : chunk_manager_metadata();
+  }
+
   static const MetaspaceTracer* tracer() { return _tracer; }
   static void freeze() {
     assert(DumpSharedSpaces, "sanity");