| Index: device/usb/mojo/device_manager_impl.cc
|
| diff --git a/device/usb/mojo/device_manager_impl.cc b/device/usb/mojo/device_manager_impl.cc
|
| index 9abf9d97925e0419170f8195493c5013f7e863b0..3836c9744b0aa73ba1573902ba3a6059bc400d6e 100644
|
| --- a/device/usb/mojo/device_manager_impl.cc
|
| +++ b/device/usb/mojo/device_manager_impl.cc
|
| @@ -76,10 +76,9 @@ void DeviceManagerImpl::GetDevice(
|
| if (!device)
|
| return;
|
|
|
| - DeviceInfoPtr device_info = DeviceInfo::From(*device);
|
| if (permission_provider_ &&
|
| - permission_provider_->HasDevicePermission(*device_info)) {
|
| - new DeviceImpl(device, std::move(device_info), permission_provider_,
|
| + permission_provider_->HasDevicePermission(device)) {
|
| + new DeviceImpl(device, DeviceInfo::From(*device), permission_provider_,
|
| std::move(device_request));
|
| }
|
| }
|
| @@ -95,10 +94,9 @@ void DeviceManagerImpl::OnGetDevices(
|
| mojo::Array<DeviceInfoPtr> device_infos;
|
| for (const auto& device : devices) {
|
| if (filters.empty() || UsbDeviceFilter::MatchesAny(device, filters)) {
|
| - DeviceInfoPtr device_info = DeviceInfo::From(*device);
|
| if (permission_provider_ &&
|
| - permission_provider_->HasDevicePermission(*device_info)) {
|
| - device_infos.push_back(std::move(device_info));
|
| + permission_provider_->HasDevicePermission(device)) {
|
| + device_infos.push_back(DeviceInfo::From(*device));
|
| }
|
| }
|
| }
|
| @@ -107,20 +105,18 @@ void DeviceManagerImpl::OnGetDevices(
|
| }
|
|
|
| void DeviceManagerImpl::OnDeviceAdded(scoped_refptr<UsbDevice> device) {
|
| - DeviceInfoPtr device_info = DeviceInfo::From(*device);
|
| if (permission_provider_ &&
|
| - permission_provider_->HasDevicePermission(*device_info)) {
|
| - devices_added_[device->guid()] = std::move(device_info);
|
| + permission_provider_->HasDevicePermission(device)) {
|
| + devices_added_[device->guid()] = DeviceInfo::From(*device);
|
| MaybeRunDeviceChangesCallback();
|
| }
|
| }
|
|
|
| void DeviceManagerImpl::OnDeviceRemoved(scoped_refptr<UsbDevice> device) {
|
| if (devices_added_.erase(device->guid()) == 0) {
|
| - DeviceInfoPtr device_info = DeviceInfo::From(*device);
|
| if (permission_provider_ &&
|
| - permission_provider_->HasDevicePermission(*device_info)) {
|
| - devices_removed_.push_back(std::move(device_info));
|
| + permission_provider_->HasDevicePermission(device)) {
|
| + devices_removed_.push_back(DeviceInfo::From(*device));
|
| MaybeRunDeviceChangesCallback();
|
| }
|
| }
|
|
|