Revert "Use canonical names for some name-based lookup."

runtime/vm/kernel_reader.h

Index: runtime/vm/kernel_reader.h
diff --git a/runtime/vm/kernel_reader.h b/runtime/vm/kernel_reader.h
index 5912c3694d2e9dd3b4e37a2837ee8ebb103644d9..092b90d3702c9cfda1f11eaf51d54cac0a307300 100644
--- a/runtime/vm/kernel_reader.h
+++ b/runtime/vm/kernel_reader.h
@@ -23,8 +23,8 @@ class BuildingTranslationHelper : public TranslationHelper {
       : TranslationHelper(thread), reader_(reader) {}
   virtual ~BuildingTranslationHelper() {}
 
-  virtual RawLibrary* LookupLibraryByKernelLibrary(CanonicalName* library);
-  virtual RawClass* LookupClassByKernelClass(CanonicalName* klass);
+  virtual RawLibrary* LookupLibraryByKernelLibrary(Library* library);
+  virtual RawClass* LookupClassByKernelClass(Class* klass);
 
  private:
   KernelReader* reader_;
@@ -92,8 +92,8 @@ class KernelReader {
   void SetupFieldAccessorFunction(const dart::Class& klass,
                                   const dart::Function& function);
 
-  dart::Library& LookupLibrary(CanonicalName* library);
-  dart::Class& LookupClass(CanonicalName* klass);
+  dart::Library& LookupLibrary(Library* library);
+  dart::Class& LookupClass(Class* klass);
 
   dart::RawFunction::Kind GetFunctionType(Procedure* kernel_procedure);
 
@@ -107,8 +107,8 @@ class KernelReader {
   BuildingTranslationHelper translation_helper_;
   DartTypeTranslator type_translator_;
 
-  Mapping<CanonicalName, dart::Library> libraries_;
-  Mapping<CanonicalName, dart::Class> classes_;
+  Mapping<Library, dart::Library> libraries_;
+  Mapping<Class, dart::Class> classes_;
 };
 
 }  // namespace kernel