Mojo C++ binding: make device/usb mojom targets use STD string/vector types

device/usb/mojo/device_manager_impl_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/usb/mojo/device_manager_impl.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <set>
@@ skipping 67 matching lines @@
   void OnDeviceRemoved(DeviceInfoPtr device_info) {
     DoOnDeviceRemoved(device_info.get());
   }
 
  private:
   mojo::Binding<DeviceManagerClient> m_binding;
 };
 
 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)
     actual_guids.insert(results[i]->guid);
   EXPECT_EQ(expected_guids, actual_guids);
   continuation.Run();
 }
 
 void ExpectDeviceInfoAndThen(const std::string& expected_guid,
                              const base::Closure& continuation,
@@ skipping 15 matching lines @@
   scoped_refptr<MockUsbDevice> device2 =
       new MockUsbDevice(0x1234, 0x567a, "ACME", "Frobinator Mk II", "MNOPQR");
 
   device_client_.usb_service()->AddDevice(device0);
   device_client_.usb_service()->AddDevice(device1);
   device_client_.usb_service()->AddDevice(device2);
 
   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 call to emplace() with no
arguments work?

[Reilly Grant (use Gerrit), 2016/08/15 21:39:02]

option->filters is a base::Optional<std::vector<>>. Calling emplace() runs the
std::vector<> constructor so that the ->push_back() call on the next line is
valid.

+  options->filters->push_back(std::move(filter));
 
   std::set<std::string> guids;
   guids.insert(device0->guid());
   guids.insert(device1->guid());
   guids.insert(device2->guid());
 
   base::RunLoop loop;
   device_manager->GetDevices(
       std::move(options),
       base::Bind(&ExpectDevicesAndThen, guids, loop.QuitClosure()));
@@ skipping 75 matching lines @@
         .WillOnce(ExpectGuidAndThen(device0->guid(), barrier))
         .WillOnce(ExpectGuidAndThen(device2->guid(), barrier));
     EXPECT_CALL(mock_client, DoOnDeviceAdded(_))
         .WillOnce(ExpectGuidAndThen(device3->guid(), barrier));
     loop.Run();
   }
 }
 
 }  // namespace usb
 }  // namespace device