Index: chrome/browser/usb/usb_chooser_controller.cc |
diff --git a/chrome/browser/usb/usb_chooser_controller.cc b/chrome/browser/usb/usb_chooser_controller.cc |
index 3bc7d435a32a4920155f8a15a856569a98c0d769..6a2479433e72c0eb7dcd12e4c89123f7f6e24c0f 100644 |
--- a/chrome/browser/usb/usb_chooser_controller.cc |
+++ b/chrome/browser/usb/usb_chooser_controller.cc |
@@ -72,7 +72,7 @@ base::string16 GetDeviceName(scoped_refptr<device::UsbDevice> device) { |
UsbChooserController::UsbChooserController( |
content::RenderFrameHost* owner, |
- mojo::Array<device::usb::DeviceFilterPtr> device_filters, |
+ const std::vector<device::usb::DeviceFilterPtr>& device_filters, |
content::RenderFrameHost* render_frame_host, |
const device::usb::ChooserService::GetPermissionCallback& callback) |
: ChooserController(owner, |
@@ -90,8 +90,8 @@ UsbChooserController::UsbChooserController( |
if (!usb_service_observer_.IsObserving(usb_service)) |
usb_service_observer_.Add(usb_service); |
- if (!device_filters.is_null()) |
- filters_ = device_filters.To<std::vector<device::UsbDeviceFilter>>(); |
+ filters_ = |
+ mojo::ConvertTo<std::vector<device::UsbDeviceFilter>>(device_filters); |
usb_service->GetDevices(base::Bind(&UsbChooserController::GotUsbDeviceList, |
weak_factory_.GetWeakPtr())); |