Replace IDMap with std::unordered_map in ResourceManager

ui/android/resources/resource_manager_impl.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_ANDROID_RESOURCES_RESOURCE_MANAGER_IMPL_H_
 #define UI_ANDROID_RESOURCES_RESOURCE_MANAGER_IMPL_H_
 
 #include <memory>
 
-#include "base/id_map.h"
 #include "base/macros.h"
+#include "third_party/skia/include/core/SkColor.h"
 #include "ui/android/resources/resource_manager.h"
 #include "ui/android/ui_android_export.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace cc {
 class UIResourceManager;
 }  // namespace cc
 
 namespace ui {
 
 class UI_ANDROID_EXPORT ResourceManagerImpl : public ResourceManager {
  public:
   static ResourceManagerImpl* FromJavaObject(jobject jobj);
 
   explicit ResourceManagerImpl(gfx::NativeWindow native_window);
   ~ResourceManagerImpl() override;
 
   void Init(cc::UIResourceManager* ui_resource_manager);
 
   // ResourceManager implementation.
   base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override;
   Resource* GetResource(AndroidResourceType res_type, int res_id) override;
   Resource* GetStaticResourceWithTint(
-      int res_id, int tint_color) override;
+      int res_id, SkColor tint_color) override;
   void RemoveUnusedTints(const std::unordered_set<int>& used_tints) override;
   void PreloadResource(AndroidResourceType res_type, int res_id) override;
   CrushedSpriteResource* GetCrushedSpriteResource(
       int bitmap_res_id, int metadata_res_id) override;
 
   // Called from Java
   // ----------------------------------------------------------
   void OnResourceReady(JNIEnv* env,
                        const base::android::JavaRef<jobject>& jobj,
                        jint res_type,
@@ skipping 36 matching lines @@
 
   // Start loading the resource. virtual for testing.
   virtual void PreloadResourceFromJava(AndroidResourceType res_type,
                                        int res_id);
   virtual void RequestResourceFromJava(AndroidResourceType res_type,
                                        int res_id);
   virtual void RequestCrushedSpriteResourceFromJava(int bitmap_res_id,
                                                     int metadata_res_id,
                                                     bool reloading);
 
-  typedef IDMap<Resource, IDMapOwnPointer> ResourceMap;
-  typedef IDMap<CrushedSpriteResource, IDMapOwnPointer>
-      CrushedSpriteResourceMap;
-  typedef std::unordered_map<int, std::unique_ptr<ResourceMap> >
-      TintedResourceMap;
+  using ResourceMap = std::unordered_map<int, std::unique_ptr<Resource>>;
+  using CrushedSpriteResourceMap =
+      std::unordered_map<int, std::unique_ptr<CrushedSpriteResource>>;
+  using TintedResourceMap =
+      std::unordered_map<SkColor, std::unique_ptr<ResourceMap>>;
 
   cc::UIResourceManager* ui_resource_manager_;
   ResourceMap resources_[ANDROID_RESOURCE_TYPE_COUNT];
   CrushedSpriteResourceMap crushed_sprite_resources_;
   TintedResourceMap tinted_resources_;
 
   base::android::ScopedJavaGlobalRef<jobject> java_obj_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceManagerImpl);
 };
 
 }  // namespace ui
 
 #endif  // UI_ANDROID_RESOURCES_RESOURCE_MANAGER_IMPL_H_