| 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 37878bb637116d385120428d5234df5696c65c9a..ff58e624d3989186b03db8df4565f2a38222343f 100644
|
| --- a/media/midi/usb_midi_device_android.cc
|
| +++ b/media/midi/usb_midi_device_android.cc
|
| @@ -17,19 +17,19 @@
|
| UsbMidiDeviceDelegate* delegate)
|
| : raw_device_(raw_device), delegate_(delegate) {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| - midi::Java_UsbMidiDeviceAndroid_registerSelf(
|
| + Java_UsbMidiDeviceAndroid_registerSelf(
|
| env, raw_device_.obj(), reinterpret_cast<jlong>(this));
|
| }
|
|
|
| UsbMidiDeviceAndroid::~UsbMidiDeviceAndroid() {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| - midi::Java_UsbMidiDeviceAndroid_close(env, raw_device_.obj());
|
| + Java_UsbMidiDeviceAndroid_close(env, raw_device_.obj());
|
| }
|
|
|
| std::vector<uint8> UsbMidiDeviceAndroid::GetDescriptor() {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| base::android::ScopedJavaLocalRef<jbyteArray> descriptors =
|
| - midi::Java_UsbMidiDeviceAndroid_getDescriptors(env, raw_device_.obj());
|
| + Java_UsbMidiDeviceAndroid_getDescriptors(env, raw_device_.obj());
|
|
|
| std::vector<uint8> ret;
|
| base::android::JavaByteArrayToByteVector(env, descriptors.obj(), &ret);
|
| @@ -43,7 +43,7 @@
|
| ScopedJavaLocalRef<jbyteArray> data_to_pass =
|
| base::android::ToJavaByteArray(env, head, data.size());
|
|
|
| - midi::Java_UsbMidiDeviceAndroid_send(
|
| + Java_UsbMidiDeviceAndroid_send(
|
| env, raw_device_.obj(), endpoint_number, data_to_pass.obj());
|
| }
|
|
|
| @@ -60,7 +60,7 @@
|
| }
|
|
|
| bool UsbMidiDeviceAndroid::RegisterUsbMidiDevice(JNIEnv* env) {
|
| - return midi::RegisterNativesImpl(env);
|
| + return RegisterNativesImpl(env);
|
| }
|
|
|
| } // namespace media
|
|
|