| Index: media/midi/usb_midi_device_factory_android.cc
|
| diff --git a/media/midi/usb_midi_device_factory_android.cc b/media/midi/usb_midi_device_factory_android.cc
|
| index 455a65ef01fb043b1381848e51c284542e416d35..82c1fb98934932d6b8e92623b7aaf67ec6693181 100644
|
| --- a/media/midi/usb_midi_device_factory_android.cc
|
| +++ b/media/midi/usb_midi_device_factory_android.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include <stddef.h>
|
|
|
| -#include "base/android/context_utils.h"
|
| #include "base/bind.h"
|
| #include "base/containers/hash_tables.h"
|
| #include "base/memory/ptr_util.h"
|
| @@ -30,8 +29,7 @@ UsbMidiDeviceFactoryAndroid::UsbMidiDeviceFactoryAndroid() : delegate_(NULL) {}
|
| UsbMidiDeviceFactoryAndroid::~UsbMidiDeviceFactoryAndroid() {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| if (!raw_factory_.is_null())
|
| - Java_UsbMidiDeviceFactoryAndroid_close(
|
| - env, raw_factory_, base::android::GetApplicationContext());
|
| + Java_UsbMidiDeviceFactoryAndroid_close(env, raw_factory_);
|
| }
|
|
|
| void UsbMidiDeviceFactoryAndroid::EnumerateDevices(
|
| @@ -40,14 +38,12 @@ void UsbMidiDeviceFactoryAndroid::EnumerateDevices(
|
| DCHECK(!delegate_);
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| uintptr_t pointer = reinterpret_cast<uintptr_t>(this);
|
| - raw_factory_.Reset(Java_UsbMidiDeviceFactoryAndroid_create(
|
| - env, base::android::GetApplicationContext(), pointer));
|
| + raw_factory_.Reset(Java_UsbMidiDeviceFactoryAndroid_create(env, pointer));
|
|
|
| delegate_ = delegate;
|
| callback_ = callback;
|
|
|
| - if (Java_UsbMidiDeviceFactoryAndroid_enumerateDevices(
|
| - env, raw_factory_, base::android::GetApplicationContext())) {
|
| + if (Java_UsbMidiDeviceFactoryAndroid_enumerateDevices(env, raw_factory_)) {
|
| // Asynchronous operation.
|
| return;
|
| }
|
|
|