Reland of Remove ScopedVector from all other codes in media/

media/midi/usb_midi_device_factory_android.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/midi/usb_midi_device_factory_android.h"
 
 #include <stddef.h>
 
 #include "base/android/context_utils.h"
 #include "base/bind.h"
@@ skipping 34 matching lines @@
 
   delegate_ = delegate;
   callback_ = callback;
 
   if (Java_UsbMidiDeviceFactoryAndroid_enumerateDevices(
           env, raw_factory_, base::android::GetApplicationContext())) {
     // Asynchronous operation.
     return;
   }
   // No devices are found.
-  ScopedVector<UsbMidiDevice> devices;
+  UsbMidiDevice::Devices devices;
   callback.Run(true, &devices);
 }
 
 // Called from the Java world.
 void UsbMidiDeviceFactoryAndroid::OnUsbMidiDeviceRequestDone(
     JNIEnv* env,
     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);
 }
 
 // Called from the Java world.
 void UsbMidiDeviceFactoryAndroid::OnUsbMidiDeviceAttached(
     JNIEnv* env,
     const JavaParamRef<jobject>& caller,
     const JavaParamRef<jobject>& device) {
   delegate_->OnDeviceAttached(
       base::MakeUnique<UsbMidiDeviceAndroid>(device, delegate_));
 }
 
 // Called from the Java world.
 void UsbMidiDeviceFactoryAndroid::OnUsbMidiDeviceDetached(
     JNIEnv* env,
     const JavaParamRef<jobject>& caller,
     jint index) {
   delegate_->OnDeviceDetached(index);
 }
 
 bool UsbMidiDeviceFactoryAndroid::RegisterUsbMidiDeviceFactory(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace midi