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

Unified Diff: device/usb/mojo/device_manager_impl_unittest.cc

Issue 2234443002: Mojo C++ binding: make device/usb mojom targets use STD string/vector types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move the vector converter into a private header. Created 4 years, 4 months 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/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();
+ options->filters->push_back(std::move(filter));
std::set<std::string> guids;
guids.insert(device0->guid());

Powered by Google App Engine
This is Rietveld 408576698