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 "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 ui {
 
 class UI_ANDROID_EXPORT ResourceManagerImpl : public ResourceManager {
  public:
@@ skipping 58 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> >;

[aelias_OOO_until_Jul13, 2016/09/09 21:50:05]

Please use "AndroidResourceType" instead of raw int.

[aelias_OOO_until_Jul13, 2016/09/09 21:59:45]

Sorry, I realized this is not correct.  It looks like there is no typedef for
this ID space (these are not UIResourceIDs), unfortunately.  Not sure it's worth
defining one since these IDs are mainly used by Java anyway...

[mdjones, 2016/09/12 16:55:09]

At the very least it would help with the understanding of the code, but this
might be the only use of it.

+  using CrushedSpriteResourceMap =
+      std::unordered_map<int, std::unique_ptr<CrushedSpriteResource> >;

[aelias_OOO_until_Jul13, 2016/09/09 21:50:05]

nit: no need for space between ">" characters in C++11

[mdjones, 2016/09/12 16:55:09]

Done.

+  using TintedResourceMap =
+      std::unordered_map<int, std::unique_ptr<ResourceMap> >;

[aelias_OOO_until_Jul13, 2016/09/09 21:50:05]

Please use "SkColor" instead of raw int.

[mdjones, 2016/09/12 16:55:09]

Done.

 
   cc::LayerTreeHost* host_;
   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_