Remove various getClassId methods

compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java

@@ -89,12 +89,6 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment {
                 return actualNamespace;
             }
 
-            @NotNull
-            @Override
-            protected ClassId getClassId(@NotNull ClassDescriptor classDescriptor) {
-                return BuiltinsDeserializationTest.getClassId(classDescriptor);
-            }
-
             @Nullable
             @Override
             protected ClassData getClassData(@NotNull ClassId classId) {
@@ -145,7 +139,7 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment {
             public void writeClass(
                     @NotNull ClassDescriptor classDescriptor, @NotNull ProtoBuf.Class classProto
             ) {
-                classProtos.put(getClassId(classDescriptor), classProto);
+                classProtos.put(ClassSerializationUtil.getClassId(classDescriptor), classProto);
             }
         });
         return classProtos;
@@ -186,8 +180,4 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment {
             }
         }
     }
-
-    private static ClassId getClassId(ClassDescriptor classDescriptor) {
-        return ClassSerializationUtil.getClassId(classDescriptor);
-    }
 }

compiler/tests/org/jetbrains/jet/descriptors/serialization/WriteSerializedInfoTest.java

@@ -87,12 +87,6 @@ public class WriteSerializedInfoTest extends CodegenTestCase {
             return namespace;
         }
 
-        @NotNull
-        @Override
-        protected ClassId getClassId(@NotNull ClassDescriptor classDescriptor) {
-            return ClassSerializationUtil.getClassId(classDescriptor);
-        }
-
         @Override
         protected void classDescriptorCreated(@NotNull ClassDescriptor classDescriptor) {
         }