Changed StackZone and ApiZone to be containers for Zone.

runtime/vm/code_descriptors_test.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/globals.h"
 #if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64)
 
 #include "vm/ast.h"
 #include "vm/assembler.h"
@@ skipping 174 matching lines @@
 static void NativeFunc(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle i = Dart_GetNativeArgument(args, 0);
   Dart_Handle k = Dart_GetNativeArgument(args, 1);
   int64_t value = -1;
   EXPECT_VALID(Dart_IntegerToInt64(i, &value));
   EXPECT_EQ(10, value);
   EXPECT_VALID(Dart_IntegerToInt64(k, &value));
   EXPECT_EQ(20, value);
   Isolate::Current()->heap()->CollectAllGarbage();
+  Dart_ExitScope();
 }
 
 
 static Dart_NativeFunction native_resolver(Dart_Handle name,
                                            int argument_count) {
   return reinterpret_cast<Dart_NativeFunction>(&NativeFunc);
 }
 
 
 TEST_CASE(StackmapGC) {
@@ skipping 74 matching lines @@
   GrowableArray<const Object*> arguments;
   const Array& kNoArgumentNames = Array::Handle();
   Object& result = Object::Handle();
   result = DartEntry::InvokeStatic(function_foo, arguments, kNoArgumentNames);
   EXPECT(!result.IsError());
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32 || defined(TARGET_ARCH_X64)