Index: chrome/browser/devtools/device/usb/android_usb_device.h |
diff --git a/chrome/browser/devtools/device/usb/android_usb_device.h b/chrome/browser/devtools/device/usb/android_usb_device.h |
index e2a744f13c7a05de881b1b942293a00ab4b68cc3..f27df163cc068b6c2da002b0b9152c6463cda546 100644 |
--- a/chrome/browser/devtools/device/usb/android_usb_device.h |
+++ b/chrome/browser/devtools/device/usb/android_usb_device.h |
@@ -10,7 +10,7 @@ |
#include <vector> |
#include "base/memory/ref_counted.h" |
#include "base/memory/weak_ptr.h" |
-#include "chrome/browser/usb/usb_device_handle.h" |
+#include "components/usb_service/usb_device_handle.h" |
namespace base { |
class MessageLoop; |
@@ -73,7 +73,7 @@ class AndroidUsbDevice : public base::RefCountedThreadSafe<AndroidUsbDevice> { |
static void CountDevices(const base::Callback<void(int)>& callback); |
AndroidUsbDevice(crypto::RSAPrivateKey* rsa_key, |
- scoped_refptr<UsbDeviceHandle> device, |
+ scoped_refptr<usb_service::UsbDeviceHandle> device, |
const std::string& serial, |
int inbound_address, |
int outbound_address, |
@@ -89,7 +89,9 @@ class AndroidUsbDevice : public base::RefCountedThreadSafe<AndroidUsbDevice> { |
uint32 arg1, |
const std::string& body); |
- scoped_refptr<UsbDeviceHandle> usb_device() { return usb_handle_; } |
+ scoped_refptr<usb_service::UsbDeviceHandle> usb_device() { |
+ return usb_handle_; |
+ } |
std::string serial() { return serial_; } |
@@ -101,12 +103,12 @@ class AndroidUsbDevice : public base::RefCountedThreadSafe<AndroidUsbDevice> { |
void Queue(scoped_refptr<AdbMessage> message); |
void ProcessOutgoing(); |
- void OutgoingMessageSent(UsbTransferStatus status, |
+ void OutgoingMessageSent(usb_service::UsbTransferStatus status, |
scoped_refptr<net::IOBuffer> buffer, |
size_t result); |
void ReadHeader(); |
- void ParseHeader(UsbTransferStatus status, |
+ void ParseHeader(usb_service::UsbTransferStatus status, |
scoped_refptr<net::IOBuffer> buffer, |
size_t result); |
@@ -116,15 +118,16 @@ class AndroidUsbDevice : public base::RefCountedThreadSafe<AndroidUsbDevice> { |
void ParseBody(scoped_refptr<AdbMessage> message, |
uint32 data_length, |
uint32 data_check, |
- UsbTransferStatus status, |
+ usb_service::UsbTransferStatus status, |
scoped_refptr<net::IOBuffer> buffer, |
size_t result); |
void HandleIncoming(scoped_refptr<AdbMessage> message); |
- void TransferError(UsbTransferStatus status); |
+ void TransferError(usb_service::UsbTransferStatus status); |
- void TerminateIfReleased(scoped_refptr<UsbDeviceHandle> usb_handle); |
+ void TerminateIfReleased( |
+ scoped_refptr<usb_service::UsbDeviceHandle> usb_handle); |
void Terminate(); |
void SocketDeleted(uint32 socket_id); |
@@ -134,7 +137,7 @@ class AndroidUsbDevice : public base::RefCountedThreadSafe<AndroidUsbDevice> { |
scoped_ptr<crypto::RSAPrivateKey> rsa_key_; |
// Device info |
- scoped_refptr<UsbDeviceHandle> usb_handle_; |
+ scoped_refptr<usb_service::UsbDeviceHandle> usb_handle_; |
std::string serial_; |
int inbound_address_; |
int outbound_address_; |