Remove base::ScopedPtrHashMap from ozone.

ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.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_EVENTS_OZONE_EVDEV_LIBGESTURES_GLUE_GESTURE_PROPERTY_PROVIDER_H_
 #define UI_EVENTS_OZONE_EVDEV_LIBGESTURES_GLUE_GESTURE_PROPERTY_PROVIDER_H_
 
 #include <gestures/gestures.h>
 #include <libevdev/libevdev.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <ostream>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
-#include "base/containers/scoped_ptr_hash_map.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/events/ozone/evdev/event_device_info.h"
 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
 
 namespace ui {
 
 class GesturesPropFunctionsWrapper;
 class GestureInterpreterLibevdevCros;
 
@@ skipping 75 matching lines @@
 
   // Get the (Evdev) device name. Mostly used for the logging purpose.
   std::string GetDeviceNameById(const DeviceId device_id);
 
  private:
   friend class GesturesPropFunctionsWrapper;
 
   // Mapping table from a device id to its device pointer.
   typedef std::map<DeviceId, DevicePtr> DeviceMap;
 
-  // Mapping table from a device id to its property data.
-  // GestureDevicePropertyData contains both properties in use and default
-  // properties whose values will be applied upon the device attachment.
-  typedef base::ScopedPtrHashMap<
-      DeviceId,
-      std::unique_ptr<internal::GestureDevicePropertyData>>
-      ScopedDeviceDataMap;
-
   // Register a device. Setup data-structures and the device's default
   // properties.
   void RegisterDevice(const DeviceId id, const DevicePtr device);
 
   // Unregister a device. Remove all of its properties being tracked.
   void UnregisterDevice(const DeviceId id);
 
   // Called by functions in GesturesPropFunctionsWrapper to manipulate
   // properties. Note these functions do not new/delete the GesturesProp
   // pointers. It is caller's responsibility to manage them.
@@ skipping 26 matching lines @@
   // Create a property that comes from the conf files.
   std::unique_ptr<GesturesProp> CreateDefaultProperty(const std::string& name,
                                                       const std::string& value);
 
   // Setup default property values for a newly found device.
   void SetupDefaultProperties(const DeviceId device_id, const DevicePtr device);
 
   // Map from device ids to device pointers.
   DeviceMap device_map_;
 
-  // GestureDevicePropertyData indexed by their respective device ids. Owns the
-  // objects.
-  ScopedDeviceDataMap device_data_map_;
+  // Mapping table from a device id to its property data.
+  // GestureDevicePropertyData contains both properties in use and default
+  // properties whose values will be applied upon the device attachment.
+  std::unordered_map<DeviceId,
+                     std::unique_ptr<internal::GestureDevicePropertyData>>
+      device_data_map_;
 
   // A vector of parsed sections in configuration files. Owns MatchCriterias,
   // GesturesProps and ConfigurationSections in it.
   std::vector<std::unique_ptr<internal::ConfigurationSection>> configurations_;
 
   DISALLOW_COPY_AND_ASSIGN(GesturePropertyProvider);
 };
 
 // Wrapper of GesturesProp related functions. We group them together so that we
 // can friend them all at once.
@@ skipping 155 matching lines @@
   // Handler function pointers and the data to be passed to them when the
   // property is accessed.
   GesturesPropGetHandler get_;
   GesturesPropSetHandler set_;
   void* handler_data_;
 
   DISALLOW_COPY_AND_ASSIGN(GesturesProp);
 };
 
 #endif  // UI_EVENTS_OZONE_EVDEV_LIBGESTURES_GLUE_GESTURE_PROPERTY_PROVIDER_H_