Kill ScopedPtrMap and friends

device/bluetooth/dbus/fake_bluetooth_device_client.h

 // Copyright (c) 2013 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 DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_DEVICE_CLIENT_H_
 #define DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_DEVICE_CLIENT_H_
 
 #include <map>
 #include <vector>
 
 #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"
 #include "device/bluetooth/bluetooth_export.h"
 #include "device/bluetooth/dbus/bluetooth_agent_service_provider.h"
 #include "device/bluetooth/dbus/bluetooth_device_client.h"
 #include "device/bluetooth/dbus/bluetooth_profile_service_provider.h"
 
 namespace bluez {
 
@@ skipping 266 matching lines @@
   void DisconnectionCallback(
       const dbus::ObjectPath& object_path,
       const base::Closure& callback,
       const ErrorCallback& error_callback,
       BluetoothProfileServiceProvider::Delegate::Status status);
 
   // List of observers interested in event notifications from us.
   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_;
   uint32_t discovery_simulation_step_;
   uint32_t incoming_pairing_simulation_step_;
   bool pairing_cancelled_;
 
   int16 connection_rssi_;
   int16 transmit_power_;
   int16 max_transmit_power_;
 
   // Controls the fake behavior to allow more extensive UI testing without
   // having to cycle the discovery simulation.
   bool delay_start_discovery_;
 };
 
 }  // namespace bluez
 
 #endif  // DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_DEVICE_CLIENT_H_