Revert "Revert "Revert "Removed usage of std::map and std::vector from kernel code. Issue #28064."""

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>
 
@@ skipping 16 matching lines @@
   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);
-    if (pair != NULL) {
-      *handle = pair->value;
+    typename MapType::iterator value = map_.find(node);
+    if (value != map_.end()) {
+      *handle = value->second;
       return true;
     }
     return false;
   }
 
-  void Insert(KernelType* node, VmType* object) { map_.Insert(node, object); }
+  void Insert(KernelType* node, VmType* object) { map_[node] = object; }
 
  private:
-  typedef Map<KernelType, VmType*> MapType;
+  typedef typename std::map<KernelType*, VmType*> MapType;
   MapType map_;
 };
 
 class KernelReader {
  public:
   explicit KernelReader(Program* program);
 
   // Returns either a library or a failure object.
   dart::Object& ReadProgram();
 
@@ skipping 50 matching lines @@
 
   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_