| Index: extensions/browser/api/usb_private/usb_private_api.cc
|
| diff --git a/extensions/browser/api/usb_private/usb_private_api.cc b/extensions/browser/api/usb_private/usb_private_api.cc
|
| index 860a13a513f5f47e480bed9ce01587a88ac5c7e1..22c11ba6a78224c3afcfc3466d9b69bcd675440a 100644
|
| --- a/extensions/browser/api/usb_private/usb_private_api.cc
|
| +++ b/extensions/browser/api/usb_private/usb_private_api.cc
|
| @@ -12,6 +12,7 @@
|
| #include "components/usb_service/usb_device_filter.h"
|
| #include "components/usb_service/usb_device_handle.h"
|
| #include "components/usb_service/usb_service.h"
|
| +#include "device/core/device_client.h"
|
| #include "device/usb/usb_ids.h"
|
| #include "extensions/common/api/usb_private.h"
|
|
|
| @@ -19,6 +20,7 @@ namespace usb_private = extensions::core_api::usb_private;
|
| namespace GetDevices = usb_private::GetDevices;
|
| namespace GetDeviceInfo = usb_private::GetDeviceInfo;
|
|
|
| +using content::BrowserThread;
|
| using usb_service::UsbDevice;
|
| using usb_service::UsbDeviceFilter;
|
| using usb_service::UsbDeviceHandle;
|
| @@ -47,7 +49,7 @@ bool UsbPrivateGetDevicesFunction::Prepare() {
|
| }
|
|
|
| void UsbPrivateGetDevicesFunction::AsyncWorkStart() {
|
| - UsbService* service = UsbService::GetInstance();
|
| + UsbService* service = device::DeviceClient::Get()->GetUsbService();
|
| if (!service) {
|
| CompleteWithError(kErrorInitService);
|
| return;
|
| @@ -117,7 +119,7 @@ bool UsbPrivateGetDeviceInfoFunction::Prepare() {
|
| }
|
|
|
| void UsbPrivateGetDeviceInfoFunction::AsyncWorkStart() {
|
| - UsbService* service = UsbService::GetInstance();
|
| + UsbService* service = device::DeviceClient::Get()->GetUsbService();
|
| if (!service) {
|
| CompleteWithError(kErrorInitService);
|
| return;
|
|
|