| Index: device/usb/usb_device_handle_android.cc
|
| diff --git a/device/usb/usb_device_handle_android.cc b/device/usb/usb_device_handle_android.cc
|
| index 5041f60a3ed7ab01f693af5c16ddf4ed08f7555b..e2e0dc03d8916f15dced5183d73b0d485be5a23f 100644
|
| --- a/device/usb/usb_device_handle_android.cc
|
| +++ b/device/usb/usb_device_handle_android.cc
|
| @@ -20,9 +20,8 @@ scoped_refptr<UsbDeviceHandleAndroid> UsbDeviceHandleAndroid::Create(
|
| scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
|
| const base::android::JavaRef<jobject>& usb_connection) {
|
| ScopedJavaLocalRef<jobject> wrapper =
|
| - Java_ChromeUsbConnection_create(env, usb_connection.obj());
|
| - base::ScopedFD fd(
|
| - Java_ChromeUsbConnection_getFileDescriptor(env, wrapper.obj()));
|
| + Java_ChromeUsbConnection_create(env, usb_connection);
|
| + base::ScopedFD fd(Java_ChromeUsbConnection_getFileDescriptor(env, wrapper));
|
| return make_scoped_refptr(new UsbDeviceHandleAndroid(
|
| device, std::move(fd), blocking_task_runner, wrapper));
|
| }
|
| @@ -45,7 +44,7 @@ void UsbDeviceHandleAndroid::CloseBlocking() {
|
|
|
| void UsbDeviceHandleAndroid::CloseConnection() {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| - Java_ChromeUsbConnection_close(env, j_object_.obj());
|
| + Java_ChromeUsbConnection_close(env, j_object_);
|
| j_object_.Reset();
|
| }
|
|
|
|
|