Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(365)

Unified Diff: device/bluetooth/bluetooth_discovery_filter.h

Issue 2614753004: Remove ScopedVector from bluetooth. (Closed)
Patch Set: last win bits Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/bluetooth/bluetooth_device_win_unittest.cc ('k') | device/bluetooth/bluetooth_discovery_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_discovery_filter.h
diff --git a/device/bluetooth/bluetooth_discovery_filter.h b/device/bluetooth/bluetooth_discovery_filter.h
index 1c83ee72e9da079be8e648d45aee9d262f0aed91..1ca9ab85987cc67b57b23ff0d3da88d0c6926cff 100644
--- a/device/bluetooth/bluetooth_discovery_filter.h
+++ b/device/bluetooth/bluetooth_discovery_filter.h
@@ -9,9 +9,9 @@
#include <memory>
#include <set>
+#include <vector>
#include "base/macros.h"
-#include "base/memory/scoped_vector.h"
#include "device/bluetooth/bluetooth_common.h"
#include "device/bluetooth/bluetooth_export.h"
#include "device/bluetooth/bluetooth_uuid.h"
@@ -26,7 +26,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDiscoveryFilter {
// These getters return true when given field is set in filter, and copy this
// value to |out_*| parameter. If value is not set, returns false.
- // Thes setters assign given value to proper filter field.
+ // These setters assign given value to proper filter field.
bool GetRSSI(int16_t* out_rssi) const;
void SetRSSI(int16_t rssi);
bool GetPathloss(uint16_t* out_pathloss) const;
@@ -62,7 +62,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDiscoveryFilter {
std::unique_ptr<int16_t> rssi_;
std::unique_ptr<uint16_t> pathloss_;
BluetoothTransport transport_;
- ScopedVector<device::BluetoothUUID> uuids_;
+ std::vector<std::unique_ptr<device::BluetoothUUID>> uuids_;
DISALLOW_COPY_AND_ASSIGN(BluetoothDiscoveryFilter);
};
« no previous file with comments | « device/bluetooth/bluetooth_device_win_unittest.cc ('k') | device/bluetooth/bluetooth_discovery_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698