Renaming type classes as discussed:

runtime/vm/snapshot_test.cc

 // 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.
 
 #include "vm/snapshot.h"
 
 #include "vm/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/unit_test.h"
@@ skipping 147 matching lines @@
   EXPECT_EQ(BigintOperations::ToInt64(bigint), BigintOperations::ToInt64(obj));
 }
 
 
 TEST_CASE(SerializeSingletons) {
   // Write snapshot with object content.
   uint8_t* buffer;
   SnapshotWriter writer(false, &buffer, &allocator);
   writer.WriteObject(Object::class_class());
   writer.WriteObject(Object::null_class());
-  writer.WriteObject(Object::parameterized_type_class());
+  writer.WriteObject(Object::type_class());
   writer.WriteObject(Object::type_parameter_class());
   writer.WriteObject(Object::instantiated_type_class());
   writer.WriteObject(Object::type_arguments_class());
   writer.WriteObject(Object::type_array_class());
   writer.WriteObject(Object::instantiated_type_arguments_class());
   writer.WriteObject(Object::function_class());
   writer.WriteObject(Object::field_class());
   writer.WriteObject(Object::token_stream_class());
   writer.WriteObject(Object::script_class());
   writer.WriteObject(Object::library_class());
   writer.WriteObject(Object::code_class());
   writer.WriteObject(Object::instructions_class());
   writer.WriteObject(Object::pc_descriptors_class());
   writer.WriteObject(Object::exception_handlers_class());
   writer.WriteObject(Object::context_class());
   writer.WriteObject(Object::context_scope_class());
   writer.FinalizeBuffer();
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   Isolate* isolate= Isolate::Current();
   SnapshotReader reader(snapshot, isolate->heap(), isolate->object_store());
   EXPECT(Object::class_class() == reader.ReadObject());
   EXPECT(Object::null_class() == reader.ReadObject());
-  EXPECT(Object::parameterized_type_class() == reader.ReadObject());
+  EXPECT(Object::type_class() == reader.ReadObject());
   EXPECT(Object::type_parameter_class() == reader.ReadObject());
   EXPECT(Object::instantiated_type_class() == reader.ReadObject());
   EXPECT(Object::type_arguments_class() == reader.ReadObject());
   EXPECT(Object::type_array_class() == reader.ReadObject());
   EXPECT(Object::instantiated_type_arguments_class() == reader.ReadObject());
   EXPECT(Object::function_class() == reader.ReadObject());
   EXPECT(Object::field_class() == reader.ReadObject());
   EXPECT(Object::token_stream_class() == reader.ReadObject());
   EXPECT(Object::script_class() == reader.ReadObject());
   EXPECT(Object::library_class() == reader.ReadObject());
@@ skipping 239 matching lines @@
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 
   free(buffer);
 }
 #endif  // TARGET_ARCH_IA32.
 
 }  // namespace dart