Reland of Remove ScopedVector from all other codes in media/

media/midi/midi_manager_usb_unittest.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/midi_manager_usb.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <memory>
 #include <string>
@@ skipping 247 matching lines @@
       0x02, 0x02, 0x20, 0x00, 0x00, 0x00, 0x00, 0x06, 0x25, 0x01, 0x02, 0x02,
       0x03, 0x09, 0x05, 0x82, 0x02, 0x20, 0x00, 0x00, 0x00, 0x00, 0x05, 0x25,
       0x01, 0x01, 0x07,
   };
   device->SetDescriptors(ToVector(descriptors));
   device->SetManufacturer("vendor1");
   device->SetProductName("device1");
   device->SetDeviceVersion("1.02");
 
   Initialize();
-  ScopedVector<UsbMidiDevice> devices;
+  UsbMidiDevice::Devices devices;
   devices.push_back(std::move(device));
   EXPECT_FALSE(IsInitializationCallbackInvoked());
   RunCallbackUntilCallbackInvoked(true, &devices);
   EXPECT_EQ(Result::OK, GetInitializationResult());
 
   ASSERT_EQ(1u, input_ports().size());
   EXPECT_EQ("usb:port-0-2", input_ports()[0].id);
   EXPECT_EQ("vendor1", input_ports()[0].manufacturer);
   EXPECT_EQ("device1", input_ports()[0].name);
   EXPECT_EQ("1.02", input_ports()[0].version);
@@ skipping 39 matching lines @@
   device1->SetDescriptors(ToVector(descriptors));
   device1->SetManufacturer("vendor1");
   device1->SetProductName("device1");
   device1->SetDeviceVersion("1.02");
   device2->SetDescriptors(ToVector(descriptors));
   device2->SetManufacturer("vendor2");
   device2->SetProductName("device2");
   device2->SetDeviceVersion("98.76");
 
   Initialize();
-  ScopedVector<UsbMidiDevice> devices;
+  UsbMidiDevice::Devices devices;
   devices.push_back(std::move(device1));
   devices.push_back(std::move(device2));
   EXPECT_FALSE(IsInitializationCallbackInvoked());
   RunCallbackUntilCallbackInvoked(true, &devices);
   EXPECT_EQ(Result::OK, GetInitializationResult());
 
   ASSERT_EQ(2u, input_ports().size());
   EXPECT_EQ("usb:port-0-2", input_ports()[0].id);
   EXPECT_EQ("vendor1", input_ports()[0].manufacturer);
   EXPECT_EQ("device1", input_ports()[0].name);
@@ skipping 42 matching lines @@
   RunCallbackUntilCallbackInvoked(false, NULL);
   EXPECT_EQ(Result::INITIALIZATION_ERROR, GetInitializationResult());
 }
 
 TEST_F(MidiManagerUsbTest, InitializeFailBecauseOfInvalidDescriptors) {
   std::unique_ptr<FakeUsbMidiDevice> device(new FakeUsbMidiDevice(&logger_));
   uint8_t descriptors[] = {0x04};
   device->SetDescriptors(ToVector(descriptors));
 
   Initialize();
-  ScopedVector<UsbMidiDevice> devices;
+  UsbMidiDevice::Devices devices;
   devices.push_back(std::move(device));
   EXPECT_FALSE(IsInitializationCallbackInvoked());
   RunCallbackUntilCallbackInvoked(true, &devices);
   EXPECT_EQ(Result::INITIALIZATION_ERROR, GetInitializationResult());
   EXPECT_EQ("UsbMidiDevice::GetDescriptors\n", logger_.TakeLog());
 }
 
 TEST_F(MidiManagerUsbTest, Send) {
   Initialize();
   std::unique_ptr<FakeUsbMidiDevice> device(new FakeUsbMidiDevice(&logger_));
@@ skipping 10 matching lines @@
       0x02, 0x02, 0x20, 0x00, 0x00, 0x00, 0x00, 0x06, 0x25, 0x01, 0x02, 0x02,
       0x03, 0x09, 0x05, 0x82, 0x02, 0x20, 0x00, 0x00, 0x00, 0x00, 0x05, 0x25,
       0x01, 0x01, 0x07,
   };
 
   device->SetDescriptors(ToVector(descriptors));
   uint8_t data[] = {
       0x90, 0x45, 0x7f, 0xf0, 0x00, 0x01, 0xf7,
   };
 
-  ScopedVector<UsbMidiDevice> devices;
+  UsbMidiDevice::Devices devices;
   devices.push_back(std::move(device));
   EXPECT_FALSE(IsInitializationCallbackInvoked());
   RunCallbackUntilCallbackInvoked(true, &devices);
   EXPECT_EQ(Result::OK, GetInitializationResult());
   ASSERT_EQ(2u, manager_->output_streams().size());
 
   manager_->DispatchSendMidiData(client_.get(), 1, ToVector(data), 0);
   // Since UsbMidiDevice::Send is posted as a task, RunLoop should run to
   // invoke the task.
   base::RunLoop run_loop;
@@ skipping 23 matching lines @@
       0x03, 0x09, 0x05, 0x82, 0x02, 0x20, 0x00, 0x00, 0x00, 0x00, 0x05, 0x25,
       0x01, 0x01, 0x07,
   };
 
   device->SetDescriptors(ToVector(descriptors));
   uint8_t data[] = {
       0x90, 0x45, 0x7f, 0xf0, 0x00, 0x01, 0xf7,
   };
 
   Initialize();
-  ScopedVector<UsbMidiDevice> devices;
+  UsbMidiDevice::Devices devices;
   devices.push_back(std::move(device));
   EXPECT_FALSE(IsInitializationCallbackInvoked());
   RunCallbackUntilCallbackInvoked(true, &devices);
   EXPECT_EQ(Result::OK, GetInitializationResult());
   ASSERT_EQ(2u, manager_->output_streams().size());
   EXPECT_EQ("UsbMidiDevice::GetDescriptors\n", logger_.TakeLog());
 
   // The specified port index is invalid. The manager must ignore the request.
   manager_->DispatchSendMidiData(client_.get(), 99, ToVector(data), 0);
   EXPECT_EQ("", logger_.TakeLog());
@@ skipping 21 matching lines @@
   };
 
   device->SetDescriptors(ToVector(descriptors));
   uint8_t data[] = {
       0x09, 0x90, 0x45, 0x7f, 0x04, 0xf0, 0x00,
       0x01, 0x49, 0x90, 0x88, 0x99,  // This data should be ignored (CN = 4).
       0x05, 0xf7, 0x00, 0x00,
   };
 
   Initialize();
-  ScopedVector<UsbMidiDevice> devices;
+  UsbMidiDevice::Devices devices;
   UsbMidiDevice* device_raw = device.get();
   devices.push_back(std::move(device));
   EXPECT_FALSE(IsInitializationCallbackInvoked());
   RunCallbackUntilCallbackInvoked(true, &devices);
   EXPECT_EQ(Result::OK, GetInitializationResult());
 
   manager_->ReceiveUsbMidiData(device_raw, 2, data, arraysize(data),
                                base::TimeTicks());
   Finalize();
 
@@ skipping 17 matching lines @@
       0x00, 0x06, 0x24, 0x02, 0x01, 0x02, 0x00, 0x06, 0x24, 0x02, 0x01, 0x03,
       0x00, 0x06, 0x24, 0x02, 0x02, 0x06, 0x00, 0x09, 0x24, 0x03, 0x01, 0x07,
       0x01, 0x06, 0x01, 0x00, 0x09, 0x24, 0x03, 0x02, 0x04, 0x01, 0x02, 0x01,
       0x00, 0x09, 0x24, 0x03, 0x02, 0x05, 0x01, 0x03, 0x01, 0x00, 0x09, 0x05,
       0x02, 0x02, 0x20, 0x00, 0x00, 0x00, 0x00, 0x06, 0x25, 0x01, 0x02, 0x02,
       0x03, 0x09, 0x05, 0x82, 0x02, 0x20, 0x00, 0x00, 0x00, 0x00, 0x05, 0x25,
       0x01, 0x01, 0x07,
   };
 
   Initialize();
-  ScopedVector<UsbMidiDevice> devices;
+  UsbMidiDevice::Devices devices;
   EXPECT_FALSE(IsInitializationCallbackInvoked());
   RunCallbackUntilCallbackInvoked(true, &devices);
   EXPECT_EQ(Result::OK, GetInitializationResult());
 
   ASSERT_EQ(0u, input_ports().size());
   ASSERT_EQ(0u, output_ports().size());
   ASSERT_TRUE(manager_->input_stream());
   std::vector<UsbMidiJack> jacks = manager_->input_stream()->jacks();
   ASSERT_EQ(0u, manager_->output_streams().size());
   ASSERT_EQ(0u, jacks.size());
@@ skipping 12 matching lines @@
   EXPECT_EQ(2u, manager_->output_streams()[0]->jack().jack_id);
   EXPECT_EQ(3u, manager_->output_streams()[1]->jack().jack_id);
   ASSERT_EQ(1u, jacks.size());
   EXPECT_EQ(2, jacks[0].endpoint_number());
   EXPECT_EQ("UsbMidiDevice::GetDescriptors\n", logger_.TakeLog());
 }
 
 }  // namespace
 
 }  // namespace midi