diff options
| author | dcheng <dcheng@chromium.org> | 2014-09-03 21:22:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-04 04:24:53 +0000 |
| commit | 972bc39f4a28fa510bfb8c61f94e2e9b1897790f (patch) | |
| tree | 132ee11d49a8a11b669e30e568e9fe6b51dc6f8b /device | |
| parent | 97b7fc9ff9b9eade1654f1394b5992c2c2a17ef9 (diff) | |
| download | chromium_src-972bc39f4a28fa510bfb8c61f94e2e9b1897790f.zip chromium_src-972bc39f4a28fa510bfb8c61f94e2e9b1897790f.tar.gz chromium_src-972bc39f4a28fa510bfb8c61f94e2e9b1897790f.tar.bz2 | |
Fixups in components/ for scoped_refptr operator T* removal.
BUG=110610
TBR=rpaquay@chromium.org
Review URL: https://codereview.chromium.org/536623003
Cr-Commit-Position: refs/heads/master@{#293255}
Diffstat (limited to 'device')
| -rw-r--r-- | device/usb/usb_device_handle_impl.cc | 7 | ||||
| -rw-r--r-- | device/usb/usb_service_impl.cc | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/device/usb/usb_device_handle_impl.cc b/device/usb/usb_device_handle_impl.cc index c9d69a4..c88fb9b 100644 --- a/device/usb/usb_device_handle_impl.cc +++ b/device/usb/usb_device_handle_impl.cc @@ -564,8 +564,11 @@ void UsbDeviceHandleImpl::ControlTransfer( this, timeout); - PostOrSubmitTransfer( - transfer, USB_TRANSFER_CONTROL, resized_buffer, resized_length, callback); + PostOrSubmitTransfer(transfer, + USB_TRANSFER_CONTROL, + resized_buffer.get(), + resized_length, + callback); } void UsbDeviceHandleImpl::BulkTransfer(const UsbEndpointDirection direction, diff --git a/device/usb/usb_service_impl.cc b/device/usb/usb_service_impl.cc index 78846d3..29a8259 100644 --- a/device/usb/usb_service_impl.cc +++ b/device/usb/usb_service_impl.cc @@ -145,7 +145,7 @@ void UsbServiceImpl::RefreshDevices() { // Find disconnected devices. for (DeviceMap::iterator it = devices_.begin(); it != devices_.end(); ++it) { - if (!ContainsKey(connected_devices, it->second)) { + if (!ContainsKey(connected_devices, it->second.get())) { disconnected_devices.push_back(it->first); } } |