| 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..ccbaa0869437040e805470898186d63e37f0e037 100644
|
| --- a/media/midi/usb_midi_device_factory_android.cc
|
| +++ b/media/midi/usb_midi_device_factory_android.cc
|
| @@ -52,7 +52,7 @@ void UsbMidiDeviceFactoryAndroid::EnumerateDevices(
|
| return;
|
| }
|
| // No devices are found.
|
| - ScopedVector<UsbMidiDevice> devices;
|
| + UsbMidiDevice::Devices devices;
|
| callback.Run(true, &devices);
|
| }
|
|
|
| @@ -62,11 +62,12 @@ void UsbMidiDeviceFactoryAndroid::OnUsbMidiDeviceRequestDone(
|
| const JavaParamRef<jobject>& caller,
|
| const JavaParamRef<jobjectArray>& devices) {
|
| size_t size = env->GetArrayLength(devices);
|
| - ScopedVector<UsbMidiDevice> devices_to_pass;
|
| + UsbMidiDevice::Devices devices_to_pass;
|
| for (size_t i = 0; i < size; ++i) {
|
| base::android::ScopedJavaLocalRef<jobject> raw_device(
|
| env, env->GetObjectArrayElement(devices, i));
|
| - devices_to_pass.push_back(new UsbMidiDeviceAndroid(raw_device, delegate_));
|
| + devices_to_pass.push_back(
|
| + base::MakeUnique<UsbMidiDeviceAndroid>(raw_device, delegate_));
|
| }
|
|
|
| callback_.Run(true, &devices_to_pass);
|
|
|