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

runtime/vm/kernel_reader.h

 // Copyright (c) 2016, 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.
 
 #ifndef RUNTIME_VM_KERNEL_READER_H_
 #define RUNTIME_VM_KERNEL_READER_H_
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
 #include <map>
 
 #include "vm/kernel.h"
 #include "vm/kernel_to_il.h"
 #include "vm/object.h"
 
 namespace dart {
 namespace kernel {
 
 class KernelReader;
 
 class BuildingTranslationHelper : public TranslationHelper {
  public:
   BuildingTranslationHelper(KernelReader* reader, dart::Thread* thread)
       : 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_;
 };
 
 template <typename KernelType, typename VmType>
 class Mapping {
  public:
   bool Lookup(KernelType* node, VmType** handle) {
     typename MapType::Pair* pair = map_.LookupPair(node);
@@ skipping 47 matching lines @@
                                  intptr_t source_uri_index);
   Script& ScriptAt(intptr_t source_uri_index, String* import_uri = NULL);
 
   void GenerateFieldAccessors(const dart::Class& klass,
                               const dart::Field& field,
                               Field* kernel_field);
 
   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);
 
   Program* program_;
 
   dart::Thread* thread_;
   dart::Zone* zone_;
   dart::Isolate* isolate_;
   Array& scripts_;
   ActiveClass active_class_;
   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
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)
 #endif  // RUNTIME_VM_KERNEL_READER_H_