Merge libv1.

runtime/vm/dart_api_impl.h

 // Copyright (c) 2011, 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_DART_API_IMPL_H_
 #define VM_DART_API_IMPL_H_
 
 #include "vm/allocation.h"
 #include "vm/object.h"
 
@@ skipping 63 matching lines @@
   static Dart_Handle NewHandle(Isolate* isolate, RawObject* raw);
 
   // Unwraps the raw object from the handle.
   static RawObject* UnwrapHandle(Dart_Handle object);
 
   // Unwraps a raw Type from the handle.  The handle will be null if
   // the object was not of the requested Type.
 #define DECLARE_UNWRAP(Type)                                                   \
   static const Type& Unwrap##Type##Handle(Isolate* isolate,                    \
                                           Dart_Handle object);
-  CLASS_LIST_NO_OBJECT(DECLARE_UNWRAP)
+  CLASS_LIST_FOR_HANDLES(DECLARE_UNWRAP)
 #undef DECLARE_UNWRAP
 
   // Validates and converts the passed in handle as a local handle.
   static LocalHandle* UnwrapAsLocalHandle(const ApiState& state,
                                           Dart_Handle object);
 
   // Validates and converts the passed in handle as a persistent handle.
   static PersistentHandle* UnwrapAsPersistentHandle(const ApiState& state,
                                                     Dart_Handle object);
 
@@ skipping 76 matching lines @@
   }
  private:
   Isolate* saved_isolate_;
 
   DISALLOW_COPY_AND_ASSIGN(IsolateSaver);
 };
 
 }  // namespace dart.
 
 #endif  // VM_DART_API_IMPL_H_