| Index: chrome/browser/devtools/device/usb/android_usb_device.cc
|
| diff --git a/chrome/browser/devtools/device/usb/android_usb_device.cc b/chrome/browser/devtools/device/usb/android_usb_device.cc
|
| index c3f57540f78980ba6476182495584c162fa6f804..e822dd64997baec6d29bcf8398e0ef29d84272a7 100644
|
| --- a/chrome/browser/devtools/device/usb/android_usb_device.cc
|
| +++ b/chrome/browser/devtools/device/usb/android_usb_device.cc
|
| @@ -21,6 +21,7 @@
|
| #include "components/usb_service/usb_service.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "crypto/rsa_private_key.h"
|
| +#include "device/common/device_client.h"
|
| #include "net/base/ip_endpoint.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/socket/stream_socket.h"
|
| @@ -224,7 +225,7 @@ static void OpenAndroidDeviceOnFileThread(
|
|
|
| static int CountOnFileThread() {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
|
| - UsbService* service = UsbService::GetInstance();
|
| + UsbService* service = device::DeviceClient::Get()->GetUsbService();
|
| UsbDevices usb_devices;
|
| if (service != NULL)
|
| service->GetDevices(&usb_devices);
|
| @@ -249,7 +250,7 @@ static void EnumerateOnFileThread(
|
| scoped_refptr<base::MessageLoopProxy> caller_message_loop_proxy) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
|
|
|
| - UsbService* service = UsbService::GetInstance();
|
| + UsbService* service = device::DeviceClient::Get()->GetUsbService();
|
| UsbDevices usb_devices;
|
| if (service != NULL)
|
| service->GetDevices(&usb_devices);
|
|
|