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

Unified Diff: device/bluetooth/test/bluetooth_test.h

Issue 2567903004: Replace ScopedVector/ScopedPtrHashMap with std::vector and std::unordered_map (Closed)
Patch Set: Mac bustage Created 4 years 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
Index: device/bluetooth/test/bluetooth_test.h
diff --git a/device/bluetooth/test/bluetooth_test.h b/device/bluetooth/test/bluetooth_test.h
index c85ab5d55ced88f2d1ecc999691cf5a10f2ef88d..52b6224174cf9a314d7a3983ab59dd6ff4fec8b2 100644
--- a/device/bluetooth/test/bluetooth_test.h
+++ b/device/bluetooth/test/bluetooth_test.h
@@ -474,11 +474,11 @@ class BluetoothTestBase : public testing::Test {
base::MessageLoop message_loop_;
scoped_refptr<BluetoothAdapter> adapter_;
- ScopedVector<BluetoothDiscoverySession> discovery_sessions_;
- ScopedVector<BluetoothGattConnection> gatt_connections_;
+ std::vector<std::unique_ptr<BluetoothDiscoverySession>> discovery_sessions_;
+ std::vector<std::unique_ptr<BluetoothGattConnection>> gatt_connections_;
enum BluetoothDevice::ConnectErrorCode last_connect_error_code_ =
BluetoothDevice::ERROR_UNKNOWN;
- ScopedVector<BluetoothGattNotifySession> notify_sessions_;
+ std::vector<std::unique_ptr<BluetoothGattNotifySession>> notify_sessions_;
std::vector<uint8_t> last_read_value_;
std::vector<uint8_t> last_write_value_;
BluetoothRemoteGattService::GattErrorCode last_gatt_error_code_;

Powered by Google App Engine
This is Rietveld 408576698