Replace ScopedVector/ScopedPtrHashMap with std::vector and std::unordered_map

device/bluetooth/bluetooth_task_manager_win.h

 // Copyright (c) 2012 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_BLUETOOTH_TASK_MANAGER_WIN_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_TASK_MANAGER_WIN_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 61 matching lines @@
     ~DeviceState();
 
     bool is_bluetooth_classic() const { return path.empty(); }
 
     // Properties common to Bluetooth Classic and LE devices.
     std::string address;  // This uniquely identifies the device.
     base::Optional<std::string> name;  // Friendly name
     bool visible;
     bool connected;
     bool authenticated;
-    ScopedVector<ServiceRecordState> service_record_states;
+    std::vector<std::unique_ptr<ServiceRecordState>> service_record_states;
     // Properties specific to Bluetooth Classic devices.
     uint32_t bluetooth_class;
     // Properties specific to Bluetooth LE devices.
     base::FilePath path;
   };
 
   class DEVICE_BLUETOOTH_EXPORT Observer {
    public:
      virtual ~Observer() {}
 
      virtual void AdapterStateChanged(const AdapterState& state) {}
      virtual void DiscoveryStarted(bool success) {}
      virtual void DiscoveryStopped() {}
      // Called when the adapter has just been polled for the list of *all* known
      // devices. This includes devices previously paired, devices paired using
      // the underlying Operating System UI, and devices discovered recently due
      // to an active discovery session. Note that for a given device (address),
      // the associated state can change over time. For example, during a
      // discovery session, the "friendly" name may initially be "unknown" before
      // the actual name is retrieved in subsequent poll events.
-     virtual void DevicesPolled(const ScopedVector<DeviceState>& devices) {}
+     virtual void DevicesPolled(
+         const std::vector<std::unique_ptr<DeviceState>>& devices) {}
   };
 
   explicit BluetoothTaskManagerWin(
       scoped_refptr<base::SequencedTaskRunner> ui_task_runner);
 
   static BluetoothUUID BluetoothLowEnergyUuidToBluetoothUuid(
       const BTH_LE_UUID& bth_le_uuid);
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
@@ skipping 85 matching lines @@
 
   // Logs Win32 errors occurring during polling on the worker thread. The method
   // may discard messages to avoid logging being too verbose.
   void LogPollingError(const char* message, int win32_error);
 
   // Notify all Observers of updated AdapterState. Should only be called on the
   // UI thread.
   void OnAdapterStateChanged(const AdapterState* state);
   void OnDiscoveryStarted(bool success);
   void OnDiscoveryStopped();
-  void OnDevicesPolled(const ScopedVector<DeviceState>* devices);
+  void OnDevicesPolled(const std::vector<std::unique_ptr<DeviceState>> devices);
 
   // Called on BluetoothTaskRunner.
   void StartPolling();
   void PollAdapter();
   void PostAdapterStateToUi();
   void SetPowered(bool powered,
                   const base::Closure& callback,
                   const BluetoothAdapter::ErrorCallback& error_callback);
 
   // Starts discovery. Once the discovery starts, it issues a discovery inquiry
@@ skipping 11 matching lines @@
 
   // Fetch already known device information. Similar to |StartDiscovery|, except
   // this function does not issue a discovery inquiry. Instead it gets the
   // device info cached in the adapter.
   void GetKnownDevices();
 
   // Looks for Bluetooth Classic and Low Energy devices, as well as the services
   // exposed by those devices.
   bool SearchDevices(int timeout_multiplier,
                      bool search_cached_devices_only,
-                     ScopedVector<DeviceState>* device_list);
+                     std::vector<std::unique_ptr<DeviceState>>& device_list);

[scheib, 2016/12/13 00:51:06]

pointers to containers

 
   // Sends a device search API call to the adapter to look for Bluetooth Classic
   // devices.
-  bool SearchClassicDevices(int timeout_multiplier,
-                            bool search_cached_devices_only,
-                            ScopedVector<DeviceState>* device_list);
+  bool SearchClassicDevices(
+      int timeout_multiplier,
+      bool search_cached_devices_only,
+      std::vector<std::unique_ptr<DeviceState>>& device_list);
 
   // Enumerate Bluetooth Low Energy devices.
-  bool SearchLowEnergyDevices(ScopedVector<DeviceState>* device_list);
+  bool SearchLowEnergyDevices(
+      std::vector<std::unique_ptr<DeviceState>>& device_list);
 
   // Discover services for the devices in |device_list|.
-  bool DiscoverServices(ScopedVector<DeviceState>* device_list,
+  bool DiscoverServices(std::vector<std::unique_ptr<DeviceState>>& device_list,
                         bool search_cached_services_only);
 
   // Discover Bluetooth Classic services for the given |device_address|.
   bool DiscoverClassicDeviceServices(
       const std::string& device_address,
       const GUID& protocol_uuid,
       bool search_cached_services_only,
-      ScopedVector<ServiceRecordState>* service_record_states);
+      std::vector<std::unique_ptr<ServiceRecordState>>& service_record_states);
 
   // Discover Bluetooth Classic services for the given |device_address|.
   // Returns a Win32 error code.
   int DiscoverClassicDeviceServicesWorker(
       const std::string& device_address,
       const GUID& protocol_uuid,
       bool search_cached_services_only,
-      ScopedVector<ServiceRecordState>* service_record_states);
+      std::vector<std::unique_ptr<ServiceRecordState>>& service_record_states);
 
   // Discover Bluetooth Low Energy services for the given |device_path|.
   bool DiscoverLowEnergyDeviceServices(
       const base::FilePath& device_path,
-      ScopedVector<ServiceRecordState>* service_record_states);
+      std::vector<std::unique_ptr<ServiceRecordState>>& service_record_states);
 
   // Search for device paths of the GATT services in |*service_record_states|
   // from |device_address|.
   bool SearchForGattServiceDevicePaths(
       const std::string device_address,
-      ScopedVector<ServiceRecordState>* service_record_states);
+      std::vector<std::unique_ptr<ServiceRecordState>>& service_record_states);
 
   // GATT service related functions.
   void GetGattIncludedCharacteristics(
       base::FilePath device_path,
       BluetoothUUID uuid,
       uint16_t attribute_handle,
       const GetGattIncludedCharacteristicsCallback& callback);
   void GetGattIncludedDescriptors(
       base::FilePath service_path,
       BTH_LE_GATT_CHARACTERISTIC characteristic,
@@ skipping 33 matching lines @@
   // Use for discarding too many log messages.
   base::TimeTicks current_logging_batch_ticks_;
   int current_logging_batch_count_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothTaskManagerWin);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_TASK_MANAGER_WIN_H_