device/bluetooth/test/mock_bluetooth_adapter.h - Issue 2567903004: Replace ScopedVector/ScopedPtrHashMap with std::vector and std::unordered_map

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2567903004: Replace ScopedVector/ScopedPtrHashMap with std::vector and std::unordered_map (Closed)

Patch Set: Replace ScopedVector/ScopedPtrHashMap with std::vector and std::unordered_map 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:

Index: device/bluetooth/test/mock_bluetooth_adapter.h

diff --git a/device/bluetooth/test/mock_bluetooth_adapter.h b/device/bluetooth/test/mock_bluetooth_adapter.h

index 6aa43b06d3bd495c1beeec8a6236c6156c128236..4c15f672f5764f80db5151d8423b7536a699315d 100644

--- a/device/bluetooth/test/mock_bluetooth_adapter.h

+++ b/device/bluetooth/test/mock_bluetooth_adapter.h

@@ -147,7 +147,7 @@ class MockBluetoothAdapter : public BluetoothAdapter {

MOCK_METHOD1(RemovePairingDelegateInternal,

void(BluetoothDevice::PairingDelegate* pairing_delegate));

- ScopedVector<MockBluetoothDevice> mock_devices_;

+ std::vector<std::unique_ptr<MockBluetoothDevice>> mock_devices_;

};

} // namespace device