Reland of Remove ScopedVector from all other codes in media/

media/midi/midi_manager_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.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
-#include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/system_monitor/system_monitor.h"
 #include "build/build_config.h"
 #include "media/midi/midi_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace midi {
 
 namespace {
@@ skipping 187 matching lines @@
   EndSession(client1.get(), 3U, 2U);
   EndSession(client2.get(), 2U, 1U);
   EndSession(client3.get(), 1U, 0U);
 }
 
 // TODO(toyoshim): Add a test for a MidiManagerClient that has multiple
 // sessions with multiple client_id.
 
 TEST_F(MidiManagerTest, TooManyPendingSessions) {
   // Push as many client requests for starting session as possible.
-  ScopedVector<FakeMidiManagerClient> many_existing_clients;
+  std::vector<std::unique_ptr<FakeMidiManagerClient>> many_existing_clients;
   many_existing_clients.resize(MidiManager::kMaxPendingClientCount);
   for (size_t i = 0; i < MidiManager::kMaxPendingClientCount; ++i) {
-    many_existing_clients[i] = new FakeMidiManagerClient;
-    StartTheNthSession(many_existing_clients[i], i + 1);
+    many_existing_clients[i] = base::MakeUnique<FakeMidiManagerClient>();
+    StartTheNthSession(many_existing_clients[i].get(), i + 1);
   }
   EXPECT_TRUE(manager_->start_initialization_is_called_);
 
   // Push the last client that should be rejected for too many pending requests.
   std::unique_ptr<FakeMidiManagerClient> additional_client(
       new FakeMidiManagerClient);
   manager_->start_initialization_is_called_ = false;
   manager_->StartSession(additional_client.get());
   EXPECT_FALSE(manager_->start_initialization_is_called_);
   manager_->start_initialization_is_called_ = true;
   EXPECT_EQ(Result::INITIALIZATION_ERROR, additional_client->result());
 
   // Other clients still should not receive a result.
   RunLoopUntilIdle();
   for (size_t i = 0; i < many_existing_clients.size(); ++i)
     EXPECT_EQ(Result::NOT_SUPPORTED, many_existing_clients[i]->result());
 
   // The Result::OK should be distributed to other clients.
   CompleteInitialization(Result::OK);
   for (size_t i = 0; i < many_existing_clients.size(); ++i)
     EXPECT_EQ(Result::OK, many_existing_clients[i]->WaitForResult());
 
   // Close all successful sessions in FIFO order.
   size_t sessions = many_existing_clients.size();
   for (size_t i = 0; i < many_existing_clients.size(); ++i, --sessions)
-    EndSession(many_existing_clients[i], sessions, sessions - 1);
+    EndSession(many_existing_clients[i].get(), sessions, sessions - 1);
 }
 
 TEST_F(MidiManagerTest, AbortSession) {
   // A client starting a session can be destructed while an asynchronous
   // initialization is performed.
   std::unique_ptr<FakeMidiManagerClient> client;
   client.reset(new FakeMidiManagerClient);
 
   StartTheFirstSession(client.get());
   EndSession(client.get(), 0, 0);
@@ skipping 32 matching lines @@
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 }
 
 // TODO(toyoshim): Add multi-threaded unit tests to check races around
 // StartInitialization(), CompleteInitialization(), and Finalize().
 
 }  // namespace
 
 }  // namespace midi