Gentle start with removing explicit interfaces

runtime/vm/snapshot.cc

Index: runtime/vm/snapshot.cc
===================================================================
--- runtime/vm/snapshot.cc	(revision 11241)
+++ runtime/vm/snapshot.cc	(working copy)
@@ -59,8 +59,8 @@
     case kNullType: return object_store->null_type();
     case kDynamicType: return object_store->dynamic_type();
     case kVoidType: return object_store->void_type();
-    case kFunctionInterface: return object_store->function_interface();
-    case kNumberInterface: return object_store->number_interface();
+    case kFunctionType: return object_store->function_type();
+    case kNumberType: return object_store->number_type();
     case kDoubleInterface: return object_store->double_interface();
     case kIntInterface: return object_store->int_interface();
     case kBoolInterface: return object_store->bool_interface();
@@ -84,10 +84,10 @@
     return kDynamicType;
   } else if (raw_type == object_store->void_type()) {
     return kVoidType;
-  } else if (raw_type == object_store->function_interface()) {
-    return kFunctionInterface;
-  } else if (raw_type == object_store->number_interface()) {
-    return kNumberInterface;
+  } else if (raw_type == object_store->function_type()) {
+    return kFunctionType;
+  } else if (raw_type == object_store->number_type()) {
+    return kNumberType;
   } else if (raw_type == object_store->double_interface()) {
     return kDoubleInterface;
   } else if (raw_type == object_store->int_interface()) {
@@ -414,7 +414,7 @@
   ASSERT(kind_ == Snapshot::kFull);
   ASSERT(isolate()->no_gc_scope_depth() != 0);
   if (class_id < kNumPredefinedCids) {
-    ASSERT((class_id >= kInstanceCid) && (class_id <= kWeakPropertyCid));
+    ASSERT((class_id >= kInstanceCid) && (class_id <= kDartFunctionCid));
     return isolate()->class_table()->At(class_id);
   }
   cls_ = Object::class_class();