Kill ScopedPtrMap and friends

device/bluetooth/dbus/fake_bluetooth_device_client.h

Index: device/bluetooth/dbus/fake_bluetooth_device_client.h
diff --git a/device/bluetooth/dbus/fake_bluetooth_device_client.h b/device/bluetooth/dbus/fake_bluetooth_device_client.h
index 67d760b44e70906d734b3610c1c07a982e6df600..cdf678b77308d3f3dc34cad71365c5dd04e5445d 100644
--- a/device/bluetooth/dbus/fake_bluetooth_device_client.h
+++ b/device/bluetooth/dbus/fake_bluetooth_device_client.h
@@ -10,7 +10,6 @@
 
 #include "base/bind.h"
 #include "base/callback.h"
-#include "base/containers/scoped_ptr_map.h"
 #include "base/observer_list.h"
 #include "dbus/object_path.h"
 #include "dbus/property.h"
@@ -297,15 +296,14 @@ class DEVICE_BLUETOOTH_EXPORT FakeBluetoothDeviceClient
   base::ObserverList<Observer> observers_;
 
   using PropertiesMap =
-      base::ScopedPtrMap<const dbus::ObjectPath, scoped_ptr<Properties>>;
+      std::map<const dbus::ObjectPath, scoped_ptr<Properties>>;
   PropertiesMap properties_map_;
   std::vector<dbus::ObjectPath> device_list_;
 
   // Properties which are used to decied which method of pairing should
   // be done on request.
   using PairingOptionsMap =
-      base::ScopedPtrMap<const dbus::ObjectPath,
-                         scoped_ptr<SimulatedPairingOptions>>;
+      std::map<const dbus::ObjectPath, scoped_ptr<SimulatedPairingOptions>>;
   PairingOptionsMap pairing_options_map_;

[vmpstr, 2015/12/02 00:09:36]

This one might need the DISALLOW_COPY_AND_ASSIGN (if windows bots complain)

[Nico, 2015/12/02 02:09:09]

dbus/ is probably not built on windows

 
   int simulation_interval_ms_;