Changed StackZone and ApiZone to be containers for Zone.

runtime/lib/isolate.cc

 // 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.
 
 #include "platform/assert.h"
 #include "vm/bootstrap_natives.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
@@ skipping 150 matching lines @@
   args.Add(&message);
   Exceptions::ThrowByType(Exceptions::kIsolateSpawn, args);
 }
 
 
 static bool CanonicalizeUri(Isolate* isolate,
                             const Library& library,
                             const String& uri,
                             char** canonical_uri,
                             char** error) {
-  StackZone* zone = isolate->current_zone();
+  Zone* zone = isolate->current_zone();
   Dart_LibraryTagHandler handler = isolate->library_tag_handler();
   if (handler == NULL) {
     *error = zone->PrintToString(
         "Unable to canonicalize uri '%s': no library tag handler found.",
         uri.ToCString());
     return false;
   }
   Dart_Handle result = handler(kCanonicalizeUrl,
                                Api::NewHandle(isolate, library.raw()),
                                Api::NewHandle(isolate, uri.raw()));
@@ skipping 265 matching lines @@
 
 DEFINE_NATIVE_ENTRY(isolate_getPortInternal, 0) {
   const Object& port = Object::Handle(ReceivePortCreate(isolate->main_port()));
   if (port.IsError()) {
     Exceptions::PropagateError(Error::Cast(port));
   }
   return port.raw();
 }
 
 }  // namespace dart