Changed StackZone and ApiZone to be containers for Zone.

runtime/vm/native_message_handler.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 "vm/native_message_handler.h"
 
 #include "vm/dart_api_message.h"
 #include "vm/isolate.h"
 #include "vm/message.h"
 #include "vm/snapshot.h"
@@ skipping 18 matching lines @@
 #if defined(DEBUG)
 void NativeMessageHandler::CheckAccess() {
   ASSERT(Isolate::Current() == NULL);
 }
 #endif
 
 
 static uint8_t* zone_allocator(uint8_t* ptr,
                                intptr_t old_size,
                                intptr_t new_size) {
-  ApiZone* zone = ApiNativeScope::Current()->zone();
+  Zone* zone = ApiNativeScope::Current()->zone();
   return zone->Realloc<uint8_t>(ptr, old_size, new_size);
 }
 
 
 bool NativeMessageHandler::HandleMessage(Message* message) {
   if (message->IsOOB()) {
     // We currently do not use OOB messages for native ports.
     UNREACHABLE();
   }
   // Enter a native scope for handling the message. This will create a
   // zone for allocating the objects for decoding the message.
   ApiNativeScope scope;
   ApiMessageReader reader(message->data(), message->len(), zone_allocator);
   Dart_CObject* object = reader.ReadMessage();
   (*func())(message->dest_port(), message->reply_port(), object);
   delete message;
   return true;
 }
 
 }  // namespace dart