Chromium Code Reviews| Index: device/usb/mojo/device_manager_impl_unittest.cc |
| diff --git a/device/usb/mojo/device_manager_impl_unittest.cc b/device/usb/mojo/device_manager_impl_unittest.cc |
| index a8d24c8f1ff5b58f7c27010cbc7b7915710ac768..4987fe73bdffc7ee070c19725e0dafdafc048e50 100644 |
| --- a/device/usb/mojo/device_manager_impl_unittest.cc |
| +++ b/device/usb/mojo/device_manager_impl_unittest.cc |
| @@ -85,7 +85,7 @@ class MockDeviceManagerClient : public DeviceManagerClient { |
| void ExpectDevicesAndThen(const std::set<std::string>& expected_guids, |
| const base::Closure& continuation, |
| - mojo::Array<DeviceInfoPtr> results) { |
| + std::vector<DeviceInfoPtr> results) { |
| EXPECT_EQ(expected_guids.size(), results.size()); |
| std::set<std::string> actual_guids; |
| for (size_t i = 0; i < results.size(); ++i) |
| @@ -121,10 +121,11 @@ TEST_F(USBDeviceManagerImplTest, GetDevices) { |
| DeviceManagerPtr device_manager = ConnectToDeviceManager(); |
| EnumerationOptionsPtr options = EnumerationOptions::New(); |
| - options->filters = mojo::Array<DeviceFilterPtr>::New(1); |
| - options->filters[0] = DeviceFilter::New(); |
| - options->filters[0]->has_vendor_id = true; |
| - options->filters[0]->vendor_id = 0x1234; |
| + auto filter = DeviceFilter::New(); |
| + filter->has_vendor_id = true; |
| + filter->vendor_id = 0x1234; |
| + options->filters.emplace(); |
|
dcheng
2016/08/15 18:18:15
?
Isn't option->filters a vector here? How does a
Reilly Grant (use Gerrit)
2016/08/15 21:39:02
option->filters is a base::Optional<std::vector<>>
|
| + options->filters->push_back(std::move(filter)); |
| std::set<std::string> guids; |
| guids.insert(device0->guid()); |