Unify class ids and snapshot object ids list so that we don't have disparate and sometimes confusin…

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 109 matching lines @@
 
   // Returns the value of a Smi.
   static intptr_t SmiValue(Dart_Handle handle) {
     uword value = *(reinterpret_cast<uword*>(handle));
     return Smi::ValueFromRaw(value);
   }
 
   static intptr_t ClassId(Dart_Handle handle) {
     RawObject* raw = *(reinterpret_cast<RawObject**>(handle));
     if (!raw->IsHeapObject()) {
-      return kSmi;
+      return kSmiCid;
     }
     return raw->GetClassId();
   }
 
   // Generates a handle used to designate an error return.
   static Dart_Handle NewError(const char* format, ...);
 
   // Gets a handle to Null.
   static Dart_Handle Null(Isolate* isolate);
 
@@ skipping 27 matching lines @@
   }
  private:
   Isolate* saved_isolate_;
 
   DISALLOW_COPY_AND_ASSIGN(IsolateSaver);
 };
 
 }  // namespace dart.
 
 #endif  // VM_DART_API_IMPL_H_