Index: media/midi/usb_midi_device_android.cc |
diff --git a/media/midi/usb_midi_device_android.cc b/media/midi/usb_midi_device_android.cc |
index b9003d3f46dfce65406b36ab158b8c144610cbd1..6d6635a9436f21b578deaf8ab807922c7593435a 100644 |
--- a/media/midi/usb_midi_device_android.cc |
+++ b/media/midi/usb_midi_device_android.cc |
@@ -24,7 +24,7 @@ UsbMidiDeviceAndroid::UsbMidiDeviceAndroid( |
UsbMidiDeviceDelegate* delegate) |
: raw_device_(raw_device), delegate_(delegate) { |
JNIEnv* env = base::android::AttachCurrentThread(); |
- Java_UsbMidiDeviceAndroid_registerSelf(env, raw_device_.obj(), |
+ Java_UsbMidiDeviceAndroid_registerSelf(env, raw_device_, |
reinterpret_cast<jlong>(this)); |
GetDescriptorsInternal(); |
@@ -33,7 +33,7 @@ UsbMidiDeviceAndroid::UsbMidiDeviceAndroid( |
UsbMidiDeviceAndroid::~UsbMidiDeviceAndroid() { |
JNIEnv* env = base::android::AttachCurrentThread(); |
- Java_UsbMidiDeviceAndroid_close(env, raw_device_.obj()); |
+ Java_UsbMidiDeviceAndroid_close(env, raw_device_); |
} |
std::vector<uint8_t> UsbMidiDeviceAndroid::GetDescriptors() { |
@@ -59,8 +59,8 @@ void UsbMidiDeviceAndroid::Send(int endpoint_number, |
ScopedJavaLocalRef<jbyteArray> data_to_pass = |
base::android::ToJavaByteArray(env, head, data.size()); |
- Java_UsbMidiDeviceAndroid_send(env, raw_device_.obj(), endpoint_number, |
- data_to_pass.obj()); |
+ Java_UsbMidiDeviceAndroid_send(env, raw_device_, endpoint_number, |
+ data_to_pass); |
} |
void UsbMidiDeviceAndroid::OnData(JNIEnv* env, |
@@ -82,7 +82,7 @@ bool UsbMidiDeviceAndroid::RegisterUsbMidiDevice(JNIEnv* env) { |
void UsbMidiDeviceAndroid::GetDescriptorsInternal() { |
JNIEnv* env = base::android::AttachCurrentThread(); |
base::android::ScopedJavaLocalRef<jbyteArray> descriptors = |
- Java_UsbMidiDeviceAndroid_getDescriptors(env, raw_device_.obj()); |
+ Java_UsbMidiDeviceAndroid_getDescriptors(env, raw_device_); |
base::android::JavaByteArrayToByteVector(env, descriptors.obj(), |
&descriptors_); |
@@ -115,8 +115,7 @@ void UsbMidiDeviceAndroid::InitDeviceInfo() { |
std::vector<uint8_t> UsbMidiDeviceAndroid::GetStringDescriptor(int index) { |
JNIEnv* env = base::android::AttachCurrentThread(); |
base::android::ScopedJavaLocalRef<jbyteArray> descriptors = |
- Java_UsbMidiDeviceAndroid_getStringDescriptor(env, raw_device_.obj(), |
- index); |
+ Java_UsbMidiDeviceAndroid_getStringDescriptor(env, raw_device_, index); |
std::vector<uint8_t> ret; |
base::android::JavaByteArrayToByteVector(env, descriptors.obj(), &ret); |