| Index: device/usb/usb_device_android.cc
|
| diff --git a/device/usb/usb_device_android.cc b/device/usb/usb_device_android.cc
|
| index 7f98ec6f5d02f4092f4b73282247d9ca444bd9d0..a924a8497ef161abeb1a5e7e71e42c96ad2ce564 100644
|
| --- a/device/usb/usb_device_android.cc
|
| +++ b/device/usb/usb_device_android.cc
|
| @@ -27,7 +27,6 @@ namespace device {
|
| scoped_refptr<UsbDeviceAndroid> UsbDeviceAndroid::Create(
|
| JNIEnv* env,
|
| base::WeakPtr<UsbServiceAndroid> service,
|
| - scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
|
| const JavaRef<jobject>& usb_device) {
|
| ScopedJavaLocalRef<jobject> wrapper =
|
| Java_ChromeUsbDevice_create(env, usb_device);
|
| @@ -51,8 +50,7 @@ scoped_refptr<UsbDeviceAndroid> UsbDeviceAndroid::Create(
|
| Java_ChromeUsbDevice_getDeviceProtocol(env, wrapper),
|
| Java_ChromeUsbDevice_getVendorId(env, wrapper),
|
| Java_ChromeUsbDevice_getProductId(env, wrapper), device_version,
|
| - manufacturer_string, product_string, serial_number, blocking_task_runner,
|
| - wrapper));
|
| + manufacturer_string, product_string, serial_number, wrapper));
|
| }
|
|
|
| void UsbDeviceAndroid::RequestPermission(const ResultCallback& callback) {
|
| @@ -72,8 +70,7 @@ void UsbDeviceAndroid::Open(const OpenCallback& callback) {
|
| ScopedJavaLocalRef<jobject> connection =
|
| service_->OpenDevice(env, j_object_);
|
| if (!connection.is_null()) {
|
| - device_handle = UsbDeviceHandleAndroid::Create(
|
| - env, this, blocking_task_runner_, connection);
|
| + device_handle = UsbDeviceHandleAndroid::Create(env, this, connection);
|
| handles().push_back(device_handle.get());
|
| }
|
| }
|
| @@ -98,7 +95,6 @@ UsbDeviceAndroid::UsbDeviceAndroid(
|
| const base::string16& manufacturer_string,
|
| const base::string16& product_string,
|
| const base::string16& serial_number,
|
| - scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
|
| const JavaRef<jobject>& wrapper)
|
| : UsbDevice(usb_version,
|
| device_class,
|
| @@ -110,7 +106,6 @@ UsbDeviceAndroid::UsbDeviceAndroid(
|
| manufacturer_string,
|
| product_string,
|
| serial_number),
|
| - blocking_task_runner_(blocking_task_runner),
|
| device_id_(Java_ChromeUsbDevice_getDeviceId(env, wrapper)),
|
| service_(service),
|
| j_object_(wrapper) {
|
|
|