Changed StackZone and ApiZone to be containers for Zone.

runtime/vm/base_isolate.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.
 
 #ifndef VM_BASE_ISOLATE_H_
 #define VM_BASE_ISOLATE_H_
 
 namespace dart {
 
 class HandleScope;
 class StackResource;
-class StackZone;
+class Zone;
 
 // A BaseIsolate contains just enough functionality to allocate
 // StackResources.  This allows us to inline the StackResource
 // constructor/destructor for performance.
 class BaseIsolate {
  public:
   StackResource* top_resource() const { return top_resource_; }
   void set_top_resource(StackResource* value) { top_resource_ = value; }
 
-  StackZone* current_zone() const { return current_zone_; }
-  void set_current_zone(StackZone* zone) { current_zone_ = zone; }
+  Zone* current_zone() const { return current_zone_; }
+  void set_current_zone(Zone* zone) { current_zone_ = zone; }
 
   HandleScope* top_handle_scope() const {
 #if defined(DEBUG)
     return top_handle_scope_;
 #else
     return 0;
 #endif
   }
 
   void set_top_handle_scope(HandleScope* handle_scope) {
@@ skipping 61 matching lines @@
 #else
         current_zone_(NULL)
 #endif
   {}
 
   ~BaseIsolate() {
     // Do not delete stack resources: top_resource_ and current_zone_.
   }
 
   StackResource* top_resource_;
-  StackZone* current_zone_;
+  Zone* current_zone_;
 #if defined(DEBUG)
   HandleScope* top_handle_scope_;
   int32_t no_handle_scope_depth_;
   int32_t no_gc_scope_depth_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BaseIsolate);
 };
 
 }  // namespace dart
 
 #endif  // VM_BASE_ISOLATE_H_