| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_ | 5 #ifndef DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_ |
| 6 #define DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_ | 6 #define DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 private: | 129 private: |
| 130 uint32_t bluetooth_class_; | 130 uint32_t bluetooth_class_; |
| 131 base::Optional<std::string> name_; | 131 base::Optional<std::string> name_; |
| 132 std::string address_; | 132 std::string address_; |
| 133 BluetoothDevice::UUIDSet uuids_; | 133 BluetoothDevice::UUIDSet uuids_; |
| 134 bool connected_; | 134 bool connected_; |
| 135 | 135 |
| 136 // Used by tests to save callbacks that will be run in the future. | 136 // Used by tests to save callbacks that will be run in the future. |
| 137 std::queue<base::Closure> pending_callbacks_; | 137 std::queue<base::Closure> pending_callbacks_; |
| 138 | 138 |
| 139 ScopedVector<MockBluetoothGattService> mock_services_; | 139 std::vector<std::unique_ptr<MockBluetoothGattService>> mock_services_; |
| 140 }; | 140 }; |
| 141 | 141 |
| 142 } // namespace device | 142 } // namespace device |
| 143 | 143 |
| 144 #endif // DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_ | 144 #endif // DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2567903004:
Replace ScopedVector/ScopedPtrHashMap with std::vector and std::unordered_map (Closed)
