Index: extensions/browser/api/usb/usb_api.cc |
diff --git a/extensions/browser/api/usb/usb_api.cc b/extensions/browser/api/usb/usb_api.cc |
index 93ac6c133b75aef37677e0ce92b314d1dbc6564c..428439a06c5b5e4204d81fbd16b75fccd97f22da 100644 |
--- a/extensions/browser/api/usb/usb_api.cc |
+++ b/extensions/browser/api/usb/usb_api.cc |
@@ -464,15 +464,15 @@ UsbAsyncApiFunction::GetDeviceHandleOrCompleteWithError( |
return NULL; |
} |
- if (!resource->device() || !resource->device()->device()) { |
+ if (!resource->device() || !resource->device()->GetDevice()) { |
CompleteWithError(kErrorDisconnect); |
manager_->Remove(extension_->id(), input_device_handle.handle); |
return NULL; |
} |
- if (resource->device()->device()->vendor_id() != |
+ if (resource->device()->GetDevice()->vendor_id() != |
input_device_handle.vendor_id || |
- resource->device()->device()->product_id() != |
+ resource->device()->GetDevice()->product_id() != |
input_device_handle.product_id) { |
CompleteWithError(kErrorNoDevice); |
return NULL; |
@@ -721,8 +721,8 @@ void UsbOpenDeviceFunction::AsyncWorkStart() { |
SetResult(PopulateConnectionHandle( |
manager_->Add(new UsbDeviceResource(extension_->id(), handle_)), |
- handle_->device()->vendor_id(), |
- handle_->device()->product_id())); |
+ handle_->GetDevice()->vendor_id(), |
+ handle_->GetDevice()->product_id())); |
AsyncWorkCompleted(); |
} |
@@ -745,7 +745,7 @@ void UsbListInterfacesFunction::AsyncWorkStart() { |
return; |
scoped_refptr<UsbConfigDescriptor> config = |
- device_handle->device()->ListInterfaces(); |
+ device_handle->GetDevice()->ListInterfaces(); |
if (!config) { |
SetError(kErrorCannotListInterfaces); |