Address review comments from a previous CL.

vm/raw_object_snapshot.cc

Index: vm/raw_object_snapshot.cc
===================================================================
--- vm/raw_object_snapshot.cc	(revision 9828)
+++ vm/raw_object_snapshot.cc	(working copy)
@@ -86,7 +86,7 @@
       (kind == Snapshot::kScript &&
        !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this)))) {
     // Write out the class and tags information.
-    writer->WriteObjectHeader(Object::kClassClass, writer->GetObjectTags(this));
+    writer->WriteObjectHeader(kClass, writer->GetObjectTags(this));
 
     // Write out all the non object pointer fields.
     // NOTE: cpp_vtable_ is not written.
@@ -147,8 +147,7 @@
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
-  writer->WriteObjectHeader(Object::kUnresolvedClassClass,
-                            writer->GetObjectTags(this));
+  writer->WriteObjectHeader(kUnresolvedClass, writer->GetObjectTags(this));
 
   // Write out all the non object pointer fields.
   writer->WriteIntptrValue(ptr()->token_pos_);
@@ -219,7 +218,7 @@
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
-  writer->WriteObjectHeader(Object::kTypeClass, writer->GetObjectTags(this));
+  writer->WriteObjectHeader(kType, writer->GetObjectTags(this));
 
   // Write out all the non object pointer fields.
   writer->WriteIntptrValue(ptr()->token_pos_);
@@ -272,8 +271,7 @@
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
-  writer->WriteObjectHeader(Object::kTypeParameterClass,
-                            writer->GetObjectTags(this));
+  writer->WriteObjectHeader(kTypeParameter, writer->GetObjectTags(this));
 
   // Write out all the non object pointer fields.
   writer->WriteIntptrValue(ptr()->index_);
@@ -344,8 +342,7 @@
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
-  writer->WriteObjectHeader(Object::kTypeArgumentsClass,
-                            writer->GetObjectTags(this));
+  writer->WriteObjectHeader(kTypeArguments, writer->GetObjectTags(this));
 
   // Write out the length field.
   writer->Write<RawObject*>(ptr()->length_);
@@ -397,7 +394,7 @@
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
-  writer->WriteObjectHeader(Object::kInstantiatedTypeArgumentsClass,
+  writer->WriteObjectHeader(kInstantiatedTypeArguments,
                             writer->GetObjectTags(this));
 
   // Write out all the object pointer fields.
@@ -457,8 +454,7 @@
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
-  writer->WriteObjectHeader(Object::kFunctionClass,
-                            writer->GetObjectTags(this));
+  writer->WriteObjectHeader(kFunction, writer->GetObjectTags(this));
 
   // Write out all the non object fields.
   writer->WriteIntptrValue(ptr()->token_pos_);
@@ -522,7 +518,7 @@
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
-  writer->WriteObjectHeader(Object::kFieldClass, writer->GetObjectTags(this));
+  writer->WriteObjectHeader(kField, writer->GetObjectTags(this));
 
   // Write out all the non object fields.
   writer->WriteIntptrValue(ptr()->token_pos_);
@@ -573,8 +569,7 @@
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
-  writer->WriteObjectHeader(Object::kLiteralTokenClass,
-                            writer->GetObjectTags(this));
+  writer->WriteObjectHeader(kLiteralToken, writer->GetObjectTags(this));
 
   // Write out the kind field.
   writer->Write<intptr_t>(ptr()->kind_);
@@ -629,8 +624,7 @@
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
-  writer->WriteObjectHeader(Object::kTokenStreamClass,
-                            writer->GetObjectTags(this));
+  writer->WriteObjectHeader(kTokenStream, writer->GetObjectTags(this));
 
   // Write out the length field and the token stream.
   intptr_t len = Smi::Value(ptr()->length_);
@@ -683,7 +677,7 @@
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
-  writer->WriteObjectHeader(Object::kScriptClass, writer->GetObjectTags(this));
+  writer->WriteObjectHeader(kScript, writer->GetObjectTags(this));
 
   // Write out all the object pointer fields.
   writer->WriteObjectImpl(ptr()->url_);
@@ -754,7 +748,7 @@
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
-  writer->WriteObjectHeader(Object::kLibraryClass, writer->GetObjectTags(this));
+  writer->WriteObjectHeader(kLibrary, writer->GetObjectTags(this));
 
   if (RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) {
     ASSERT(kind != Snapshot::kFull);
@@ -824,8 +818,7 @@
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
-  writer->WriteObjectHeader(Object::kLibraryPrefixClass,
-                            writer->GetObjectTags(this));
+  writer->WriteObjectHeader(kLibraryPrefix, writer->GetObjectTags(this));
 
   // Write out all non object fields.
   writer->WriteIntptrValue(ptr()->num_libs_);
@@ -977,7 +970,7 @@
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
-  writer->WriteObjectHeader(Object::kContextClass, writer->GetObjectTags(this));
+  writer->WriteObjectHeader(kContext, writer->GetObjectTags(this));
 
   // Write out num of variables in the context.
   writer->WriteIntptrValue(ptr()->num_variables_);
@@ -1028,8 +1021,7 @@
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
-  writer->WriteObjectHeader(Object::kContextScopeClass,
-                            writer->GetObjectTags(this));
+  writer->WriteObjectHeader(kContextScope, writer->GetObjectTags(this));
 
   // Serialize number of variables.
   writer->WriteIntptrValue(ptr()->num_variables_);
@@ -1206,8 +1198,7 @@
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
-  writer->WriteObjectHeader(ObjectStore::kMintClass,
-                            writer->GetObjectTags(this));
+  writer->WriteObjectHeader(kMint, writer->GetObjectTags(this));
 
   // Write out the 64 bit value.
   writer->Write<int64_t>(ptr()->value_);
@@ -1254,8 +1245,7 @@
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
-  writer->WriteObjectHeader(ObjectStore::kBigintClass,
-                            writer->GetObjectTags(this));
+  writer->WriteObjectHeader(kBigint, writer->GetObjectTags(this));
 
   // Write out the bigint value as a HEXCstring.
   intptr_t length = ptr()->signed_length_;
@@ -1324,8 +1314,7 @@
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
-  writer->WriteObjectHeader(ObjectStore::kDoubleClass,
-                            writer->GetObjectTags(this));
+  writer->WriteObjectHeader(kDouble, writer->GetObjectTags(this));
 
   // Write out the double value.
   writer->Write<double>(ptr()->value_);
@@ -1492,7 +1481,7 @@
 
   // Write out the string.
   if (len > 0) {
-    if (class_id == ObjectStore::kOneByteStringClass) {
+    if (class_id == kOneByteString) {
       writer->WriteBytes(reinterpret_cast<const uint8_t*>(data), len);
     } else {
       for (intptr_t i = 0; i < len; i++) {
@@ -1509,7 +1498,7 @@
   StringWriteTo(writer,
                 object_id,
                 kind,
-                ObjectStore::kOneByteStringClass,
+                kOneByteString,
                 writer->GetObjectTags(this),
                 ptr()->length_,
                 ptr()->hash_,
@@ -1523,7 +1512,7 @@
   StringWriteTo(writer,
                 object_id,
                 kind,
-                ObjectStore::kTwoByteStringClass,
+                kTwoByteString,
                 writer->GetObjectTags(this),
                 ptr()->length_,
                 ptr()->hash_,
@@ -1537,7 +1526,7 @@
   StringWriteTo(writer,
                 object_id,
                 kind,
-                ObjectStore::kFourByteStringClass,
+                kFourByteString,
                 writer->GetObjectTags(this),
                 ptr()->length_,
                 ptr()->hash_,
@@ -1582,7 +1571,7 @@
   StringWriteTo(writer,
                 object_id,
                 kind,
-                ObjectStore::kOneByteStringClass,
+                kOneByteString,
                 writer->GetObjectTags(this),
                 ptr()->length_,
                 ptr()->hash_,
@@ -1597,7 +1586,7 @@
   StringWriteTo(writer,
                 object_id,
                 kind,
-                ObjectStore::kTwoByteStringClass,
+                kTwoByteString,
                 writer->GetObjectTags(this),
                 ptr()->length_,
                 ptr()->hash_,
@@ -1612,7 +1601,7 @@
   StringWriteTo(writer,
                 object_id,
                 kind,
-                ObjectStore::kFourByteStringClass,
+                kFourByteString,
                 writer->GetObjectTags(this),
                 ptr()->length_,
                 ptr()->hash_,
@@ -1680,7 +1669,7 @@
                        intptr_t object_id,
                        Snapshot::Kind kind) {
   writer->ArrayWriteTo(object_id,
-                       ObjectStore::kArrayClass,
+                       kArray,
                        writer->GetObjectTags(this),
                        ptr()->length_,
                        ptr()->type_arguments_,
@@ -1692,7 +1681,7 @@
                                 intptr_t object_id,
                                 Snapshot::Kind kind) {
   writer->ArrayWriteTo(object_id,
-                       ObjectStore::kImmutableArrayClass,
+                       kImmutableArray,
                        writer->GetObjectTags(this),
                        ptr()->length_,
                        ptr()->type_arguments_,
@@ -1736,7 +1725,7 @@
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
-  writer->WriteObjectHeader(ObjectStore::kGrowableObjectArrayClass,
+  writer->WriteObjectHeader(kGrowableObjectArray,
                             writer->GetObjectTags(this));
 
   // Write out the used length field.
@@ -1872,7 +1861,7 @@
   ByteArrayWriteTo(writer,                                                     \
                    object_id,                                                  \
                    kind,                                                       \
-                   ObjectStore::k##name##ArrayClass,                           \
+                   k##name##Array,                                             \
                    writer->GetObjectTags(this),                                \
                    ptr()->length_,                                             \
                    reinterpret_cast<uint8_t*>(ptr()->data_));                  \
@@ -1890,7 +1879,7 @@
   ByteArrayWriteTo(writer,                                                     \
                    object_id,                                                  \
                    kind,                                                       \
-                   ObjectStore::k##name##ArrayClass,                           \
+                   k##name##Array,                                             \
                    writer->GetObjectTags(this),                                \
                    ptr()->length_,                                             \
                    reinterpret_cast<uint8_t*>(ptr()->external_data_->data())); \
@@ -1976,8 +1965,7 @@
   writer->WriteSerializationMarker(kInlined, object_id);
 
   // Write out the class and tags information.
-  writer->WriteObjectHeader(ObjectStore::kJSRegExpClass,
-                            writer->GetObjectTags(this));
+  writer->WriteObjectHeader(kJSRegExp, writer->GetObjectTags(this));
 
   // Write out the data length field.
   writer->Write<RawObject*>(ptr()->data_length_);