Changed StackZone and ApiZone to be containers for Zone.

runtime/vm/growable_array.h

 // Copyright (c) 2012, 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.
 // Defines growable array classes, that differ where they are allocated:
 // - GrowableArray: allocate on stack.
 // - ZoneGrowableArray: allocated in the zone.
 
 #ifndef VM_GROWABLE_ARRAY_H_
 #define VM_GROWABLE_ARRAY_H_
 
@@ skipping 105 matching lines @@
   length_ = new_length;
 }
 
 
 template<typename T>
 class GrowableArray : public BaseGrowableArray<T, ValueObject> {
  public:
   explicit GrowableArray(int initial_capacity)
       : BaseGrowableArray<T, ValueObject>(
           initial_capacity,
-          Isolate::Current()->current_zone()->GetBaseZone()) {}
+          Isolate::Current()->current_zone()) {}
   GrowableArray()
       : BaseGrowableArray<T, ValueObject>(
-          Isolate::Current()->current_zone()->GetBaseZone()) {}
+          Isolate::Current()->current_zone()) {}
 };
 
 
 template<typename T>
 class ZoneGrowableArray : public BaseGrowableArray<T, ZoneAllocated> {
  public:
   explicit ZoneGrowableArray(int initial_capacity)
       : BaseGrowableArray<T, ZoneAllocated>(
           initial_capacity,
-          Isolate::Current()->current_zone()->GetBaseZone()) {}
+          Isolate::Current()->current_zone()) {}
   ZoneGrowableArray() :
       BaseGrowableArray<T, ZoneAllocated>(
-          Isolate::Current()->current_zone()->GetBaseZone()) {}
+          Isolate::Current()->current_zone()) {}
 };
 
 }  // namespace dart
 
 #endif  // VM_GROWABLE_ARRAY_H_