| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include "device/usb/mojo/device_manager_impl.h" | 5 #include "device/usb/mojo/device_manager_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 scoped_refptr<MockUsbDevice> device2 = | 115 scoped_refptr<MockUsbDevice> device2 = |
| 116 new MockUsbDevice(0x1234, 0x567a, "ACME", "Frobinator Mk II", "MNOPQR"); | 116 new MockUsbDevice(0x1234, 0x567a, "ACME", "Frobinator Mk II", "MNOPQR"); |
| 117 | 117 |
| 118 device_client_.usb_service()->AddDevice(device0); | 118 device_client_.usb_service()->AddDevice(device0); |
| 119 device_client_.usb_service()->AddDevice(device1); | 119 device_client_.usb_service()->AddDevice(device1); |
| 120 device_client_.usb_service()->AddDevice(device2); | 120 device_client_.usb_service()->AddDevice(device2); |
| 121 | 121 |
| 122 DeviceManagerPtr device_manager = ConnectToDeviceManager(); | 122 DeviceManagerPtr device_manager = ConnectToDeviceManager(); |
| 123 | 123 |
| 124 EnumerationOptionsPtr options = EnumerationOptions::New(); | 124 EnumerationOptionsPtr options = EnumerationOptions::New(); |
| 125 auto filter = DeviceFilter::New(); | 125 UsbDeviceFilter filter; |
| 126 filter->has_vendor_id = true; | 126 filter.vendor_id = 0x1234; |
| 127 filter->vendor_id = 0x1234; | |
| 128 options->filters.emplace(); | 127 options->filters.emplace(); |
| 129 options->filters->push_back(std::move(filter)); | 128 options->filters->push_back(filter); |
| 130 | 129 |
| 131 std::set<std::string> guids; | 130 std::set<std::string> guids; |
| 132 guids.insert(device0->guid()); | 131 guids.insert(device0->guid()); |
| 133 guids.insert(device1->guid()); | 132 guids.insert(device1->guid()); |
| 134 guids.insert(device2->guid()); | 133 guids.insert(device2->guid()); |
| 135 | 134 |
| 136 base::RunLoop loop; | 135 base::RunLoop loop; |
| 137 device_manager->GetDevices( | 136 device_manager->GetDevices( |
| 138 std::move(options), | 137 std::move(options), |
| 139 base::Bind(&ExpectDevicesAndThen, guids, loop.QuitClosure())); | 138 base::Bind(&ExpectDevicesAndThen, guids, loop.QuitClosure())); |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 .WillOnce(ExpectGuidAndThen(device0->guid(), barrier)) | 214 .WillOnce(ExpectGuidAndThen(device0->guid(), barrier)) |
| 216 .WillOnce(ExpectGuidAndThen(device2->guid(), barrier)); | 215 .WillOnce(ExpectGuidAndThen(device2->guid(), barrier)); |
| 217 EXPECT_CALL(mock_client, DoOnDeviceAdded(_)) | 216 EXPECT_CALL(mock_client, DoOnDeviceAdded(_)) |
| 218 .WillOnce(ExpectGuidAndThen(device3->guid(), barrier)); | 217 .WillOnce(ExpectGuidAndThen(device3->guid(), barrier)); |
| 219 loop.Run(); | 218 loop.Run(); |
| 220 } | 219 } |
| 221 } | 220 } |
| 222 | 221 |
| 223 } // namespace usb | 222 } // namespace usb |
| 224 } // namespace device | 223 } // namespace device |
| OLD | NEW |